diff --git a/.kokoro/nightly/java11-integration.cfg b/.kokoro/nightly/java11-integration.cfg
index 58049cc3..b152afec 100644
--- a/.kokoro/nightly/java11-integration.cfg
+++ b/.kokoro/nightly/java11-integration.cfg
@@ -13,12 +13,12 @@ env_vars: {
 # TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
-  value: "gcloud-devel"
+  value: "java-docs-samples-testing"
 }
 
 env_vars: {
   key: "GOOGLE_CLOUD_PROJECT"
-  value: "gcloud-devel"
+  value: "java-docs-samples-testing"
 }
 
 env_vars: {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d8464f9..1e076e16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+### [2.3.6](https://github.com/googleapis/java-container/compare/v2.3.5...v2.3.6) (2022-03-29)
+
+
+### Bug Fixes
+
+* change the default node image to cos_containerd ([#706](https://github.com/googleapis/java-container/issues/706)) ([9ffa70d](https://github.com/googleapis/java-container/commit/9ffa70d62acafd7c875b87e22cb212bd1d6e9a42))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.9.0 ([#709](https://github.com/googleapis/java-container/issues/709)) ([bb64318](https://github.com/googleapis/java-container/commit/bb64318396ca41ce95c428f918a6443f41580f2a))
+
 ### [2.3.5](https://github.com/googleapis/java-container/compare/v2.3.4...v2.3.5) (2022-03-04)
 
 
diff --git a/README.md b/README.md
index b3a17460..469e57f6 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>24.4.0</version>
+      <version>25.0.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-container</artifactId>
-  <version>2.3.4</version>
+  <version>2.3.5</version>
 </dependency>
 
 ```
@@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:24.4.0')
+implementation platform('com.google.cloud:libraries-bom:25.0.0')
 
 implementation 'com.google.cloud:google-cloud-container'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-container:2.3.4'
+implementation 'com.google.cloud:google-cloud-container:2.3.5'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-container" % "2.3.4"
+libraryDependencies += "com.google.cloud" % "google-cloud-container" % "2.3.5"
 ```
 
 ## Authentication
diff --git a/google-cloud-container-bom/pom.xml b/google-cloud-container-bom/pom.xml
index 55e2d1f0..e4625c3d 100644
--- a/google-cloud-container-bom/pom.xml
+++ b/google-cloud-container-bom/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-container-bom</artifactId>
-  <version>2.3.5</version><!-- {x-version-update:google-cloud-container:current} -->
+  <version>2.3.6</version><!-- {x-version-update:google-cloud-container:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.2.7</version>
+    <version>1.3.2</version>
   </parent>
 
   <name>Google Cloud container BOM</name>
@@ -52,27 +52,27 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-container</artifactId>
-        <version>2.3.5</version><!-- {x-version-update:google-cloud-container:current} -->
+        <version>2.3.6</version><!-- {x-version-update:google-cloud-container:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-container-v1</artifactId>
-        <version>2.3.5</version><!-- {x-version-update:grpc-google-cloud-container-v1:current} -->
+        <version>2.3.6</version><!-- {x-version-update:grpc-google-cloud-container-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-container-v1beta1</artifactId>
-        <version>2.3.5</version><!-- {x-version-update:grpc-google-cloud-container-v1beta1:current} -->
+        <version>2.3.6</version><!-- {x-version-update:grpc-google-cloud-container-v1beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-container-v1</artifactId>
-        <version>2.3.5</version><!-- {x-version-update:proto-google-cloud-container-v1:current} -->
+        <version>2.3.6</version><!-- {x-version-update:proto-google-cloud-container-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-container-v1beta1</artifactId>
-        <version>2.3.5</version><!-- {x-version-update:proto-google-cloud-container-v1beta1:current} -->
+        <version>2.3.6</version><!-- {x-version-update:proto-google-cloud-container-v1beta1:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-cloud-container/pom.xml b/google-cloud-container/pom.xml
index 802c9b33..d94f7ecd 100644
--- a/google-cloud-container/pom.xml
+++ b/google-cloud-container/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-container</artifactId>
-  <version>2.3.5</version><!-- {x-version-update:google-cloud-container:current} -->
+  <version>2.3.6</version><!-- {x-version-update:google-cloud-container:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Container</name>
   <url>https://github.com/googleapis/java-container</url>
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-container-parent</artifactId>
-    <version>2.3.5</version><!-- {x-version-update:google-cloud-container:current} -->
+    <version>2.3.6</version><!-- {x-version-update:google-cloud-container:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-container</site.installationModule>
diff --git a/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/ITSystemTest.java b/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/ITSystemTest.java
index ec3a71cb..83dbc482 100644
--- a/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/ITSystemTest.java
+++ b/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/ITSystemTest.java
@@ -148,7 +148,7 @@ public void listOperationsTest() {
   public void getServerConfigTest() {
     ServerConfig config = client.getServerConfig(PROJECT_ID, ZONE);
     assertNotNull(config);
-    assertEquals("COS", config.getDefaultImageType());
+    assertEquals("COS_CONTAINERD", config.getDefaultImageType());
   }
 
   @Test
diff --git a/grpc-google-cloud-container-v1/pom.xml b/grpc-google-cloud-container-v1/pom.xml
index 2809fd16..06bc11ff 100644
--- a/grpc-google-cloud-container-v1/pom.xml
+++ b/grpc-google-cloud-container-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-container-v1</artifactId>
-  <version>2.3.5</version><!-- {x-version-update:grpc-google-cloud-container-v1:current} -->
+  <version>2.3.6</version><!-- {x-version-update:grpc-google-cloud-container-v1:current} -->
   <name>grpc-google-cloud-container-v1</name>
   <description>GRPC library for grpc-google-cloud-container-v1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-container-parent</artifactId>
-    <version>2.3.5</version><!-- {x-version-update:google-cloud-container:current} -->
+    <version>2.3.6</version><!-- {x-version-update:google-cloud-container:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/grpc-google-cloud-container-v1beta1/pom.xml b/grpc-google-cloud-container-v1beta1/pom.xml
index 53504ba2..d7bc7b24 100644
--- a/grpc-google-cloud-container-v1beta1/pom.xml
+++ b/grpc-google-cloud-container-v1beta1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-container-v1beta1</artifactId>
-  <version>2.3.5</version><!-- {x-version-update:grpc-google-cloud-container-v1beta1:current} -->
+  <version>2.3.6</version><!-- {x-version-update:grpc-google-cloud-container-v1beta1:current} -->
   <name>grpc-google-cloud-container-v1beta1</name>
   <description>GRPC library for google-cloud-container</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-container-parent</artifactId>
-    <version>2.3.5</version><!-- {x-version-update:google-cloud-container:current} -->
+    <version>2.3.6</version><!-- {x-version-update:google-cloud-container:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/owlbot.py b/owlbot.py
index 924a9053..06e88d6f 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -25,4 +25,5 @@
     '.kokoro/presubmit/graalvm-native.cfg',
     '.kokoro/presubmit/integration.cfg',
     '.kokoro/nightly/integration.cfg',
+    '.kokoro/nightly/java11-integration.cfg'
 ])
diff --git a/pom.xml b/pom.xml
index aaf861df..2b432cb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-container-parent</artifactId>
   <packaging>pom</packaging>
-  <version>2.3.5</version><!-- {x-version-update:google-cloud-container:current} -->
+  <version>2.3.6</version><!-- {x-version-update:google-cloud-container:current} -->
   <name>Google Cloud Container Parent</name>
   <url>https://github.com/googleapis/java-container</url>
   <description>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.2.7</version>
+    <version>1.3.2</version>
   </parent>
 
   <developers>
@@ -61,33 +61,33 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-container-v1</artifactId>
-        <version>2.3.5</version><!-- {x-version-update:proto-google-cloud-container-v1:current} -->
+        <version>2.3.6</version><!-- {x-version-update:proto-google-cloud-container-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-container-v1beta1</artifactId>
-        <version>2.3.5</version><!-- {x-version-update:proto-google-cloud-container-v1beta1:current} -->
+        <version>2.3.6</version><!-- {x-version-update:proto-google-cloud-container-v1beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-container-v1beta1</artifactId>
-        <version>2.3.5</version><!-- {x-version-update:grpc-google-cloud-container-v1beta1:current} -->
+        <version>2.3.6</version><!-- {x-version-update:grpc-google-cloud-container-v1beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-container-v1</artifactId>
-        <version>2.3.5</version><!-- {x-version-update:grpc-google-cloud-container-v1:current} -->
+        <version>2.3.6</version><!-- {x-version-update:grpc-google-cloud-container-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-container</artifactId>
-        <version>2.3.5</version><!-- {x-version-update:google-cloud-container:current} -->
+        <version>2.3.6</version><!-- {x-version-update:google-cloud-container:current} -->
       </dependency>
 
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>2.8.0</version>
+        <version>2.9.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/proto-google-cloud-container-v1/pom.xml b/proto-google-cloud-container-v1/pom.xml
index ff04fb4c..7ccf46f2 100644
--- a/proto-google-cloud-container-v1/pom.xml
+++ b/proto-google-cloud-container-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-container-v1</artifactId>
-  <version>2.3.5</version><!-- {x-version-update:proto-google-cloud-container-v1:current} -->
+  <version>2.3.6</version><!-- {x-version-update:proto-google-cloud-container-v1:current} -->
   <name>proto-google-cloud-container-v1</name>
   <description>PROTO library for proto-google-cloud-container-v1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-container-parent</artifactId>
-    <version>2.3.5</version><!-- {x-version-update:google-cloud-container:current} -->
+    <version>2.3.6</version><!-- {x-version-update:google-cloud-container:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/proto-google-cloud-container-v1beta1/pom.xml b/proto-google-cloud-container-v1beta1/pom.xml
index e06c34bd..2573be25 100644
--- a/proto-google-cloud-container-v1beta1/pom.xml
+++ b/proto-google-cloud-container-v1beta1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-container-v1beta1</artifactId>
-  <version>2.3.5</version><!-- {x-version-update:proto-google-cloud-container-v1beta1:current} -->
+  <version>2.3.6</version><!-- {x-version-update:proto-google-cloud-container-v1beta1:current} -->
   <name>proto-google-cloud-container-v1beta1</name>
   <description>Proto library for google-cloud-container</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-container-parent</artifactId>
-    <version>2.3.5</version><!-- {x-version-update:google-cloud-container:current} -->
+    <version>2.3.6</version><!-- {x-version-update:google-cloud-container:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 48e3ae2d..d5c35cea 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-container</artifactId>
-      <version>2.3.4</version>
+      <version>2.3.5</version>
     </dependency>
     <!-- [END container_install_without_bom] -->
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 7d7cef28..b877363f 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-container</artifactId>
-      <version>2.3.4</version>
+      <version>2.3.5</version>
     </dependency>
 
     <dependency>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 10a583e4..a32fe23c 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>24.4.0</version>
+        <version>25.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/versions.txt b/versions.txt
index bc28f242..3949b691 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-container:2.3.5:2.3.5
-grpc-google-cloud-container-v1:2.3.5:2.3.5
-grpc-google-cloud-container-v1beta1:2.3.5:2.3.5
-proto-google-cloud-container-v1:2.3.5:2.3.5
-proto-google-cloud-container-v1beta1:2.3.5:2.3.5
+google-cloud-container:2.3.6:2.3.6
+grpc-google-cloud-container-v1:2.3.6:2.3.6
+grpc-google-cloud-container-v1beta1:2.3.6:2.3.6
+proto-google-cloud-container-v1:2.3.6:2.3.6
+proto-google-cloud-container-v1beta1:2.3.6:2.3.6