diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 3d2f8282..8807efca 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,16 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:a4d7b2cfc6a9d6b378a6b2458740eae15fcab28854bd23dad3a15102d2e47c87
+  digest: sha256:7c853edc4136ae8f19f9d46d4569d38de2e446db2eea057f32e412bdba255846
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index af6322b0..5f9903d5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,9 +4,9 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/cicd is the default owner for changes in this repo
-*                       @googleapis/yoshi-java @googleapis/cicd
-**/*.java               @googleapis/cicd
+# The @googleapis/aap-dpes is the default owner for changes in this repo
+*                       @googleapis/yoshi-java @googleapis/aap-dpes
+**/*.java               @googleapis/aap-dpes
 
 # The java-samples-reviewers team is the default owner for samples changes
 samples/**/*.java       @googleapis/java-samples-reviewers
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 61edb854..a16c9ad9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -21,7 +21,7 @@ If you are still having issues, please include as much information as possible:
    General, Core, and Other are also allowed as types
 2. OS type and version:
 3. Java version:
-4. shell version(s):
+4.  version(s):
 
 #### Steps to reproduce
 
diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml
index 7513acae..c5132427 100644
--- a/.github/workflows/approve-readme.yaml
+++ b/.github/workflows/approve-readme.yaml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
     steps:
-      - uses: actions/github-script@v3
+      - uses: actions/github-script@v5
         with:
           github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
           script: |
diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
index 9b4fd4d8..59c7cadd 100644
--- a/.github/workflows/auto-release.yaml
+++ b/.github/workflows/auto-release.yaml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     if: contains(github.head_ref, 'release-please')
     steps:
-    - uses: actions/github-script@v3
+    - uses: actions/github-script@v5
       with:
         github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
         debug: true
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 76d71870..e3231ae2 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -47,15 +47,15 @@ set +e
 
 case ${JOB_TYPE} in
 test)
-    mvn test -B -Dclirr.skip=true -Denforcer.skip=true
+    mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true
     RETURN_CODE=$?
     ;;
 lint)
-    mvn com.coveo:fmt-maven-plugin:check
+    mvn com.coveo:fmt-maven-plugin:check -B -ntp
     RETURN_CODE=$?
     ;;
 javadoc)
-    mvn javadoc:javadoc javadoc:test-javadoc
+    mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
     RETURN_CODE=$?
     ;;
 integration)
@@ -71,7 +71,7 @@ integration)
     ;;
 graalvm)
     # Run Unit and Integration Tests with Native Image
-    mvn -ntp -Pnative -Penable-integration-tests test
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
     RETURN_CODE=$?
     ;;
 samples)
@@ -104,7 +104,7 @@ samples)
     fi
     ;;
 clirr)
-    mvn -B -Denforcer.skip=true clirr:check
+    mvn -B -ntp -Denforcer.skip=true clirr:check
     RETURN_CODE=$?
     ;;
 *)
diff --git a/.kokoro/nightly/java11-integration.cfg b/.kokoro/nightly/java11-integration.cfg
new file mode 100644
index 00000000..58049cc3
--- /dev/null
+++ b/.kokoro/nightly/java11-integration.cfg
@@ -0,0 +1,37 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-public-resources/java11014"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "integration"
+}
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "ENABLE_FLAKYBOT"
+  value: "true"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 1f490dc6..849752d3 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -1,10 +1,10 @@
 {
-  "name": "shell",
+  "api_shortname": "cloudshell",
   "name_pretty": "Cloud Shell",
   "product_documentation": "https://cloud.google.com/shell/docs",
   "api_description": "is an interactive shell environment for Google Cloud that makes it easy for you to learn and experiment with Google Cloud and manage your projects and resources from your web browser.",
   "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-shell/latest/history",
-  "release_level": "ga",
+  "release_level": "stable",
   "transport": "grpc",
   "language": "java",
   "repo": "googleapis/java-shell",
@@ -13,5 +13,5 @@
   "api_id": "cloudshell.googleapis.com",
   "requires_billing": true,
   "library_type": "GAPIC_AUTO",
-  "codeowner_team": "@googleapis/cicd"
+  "codeowner_team": "@googleapis/aap-dpes"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ab4d8c4..ac107fd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+### [2.1.8](https://github.com/googleapis/java-shell/compare/v2.1.7...v2.1.8) (2022-02-03)
+
+
+### Dependencies
+
+* **java:** update actions/github-script action to v5 ([#1339](https://github.com/googleapis/java-shell/issues/1339)) ([#156](https://github.com/googleapis/java-shell/issues/156)) ([34500c8](https://github.com/googleapis/java-shell/commit/34500c8e3da361918023e0db0c5a551aecb9fb10))
+* update actions/github-script action to v5 ([#154](https://github.com/googleapis/java-shell/issues/154)) ([0161482](https://github.com/googleapis/java-shell/commit/0161482526153b02e1b3208903d257258e81937a))
+* update actions/setup-java action to v2 ([#155](https://github.com/googleapis/java-shell/issues/155)) ([dfcb8e0](https://github.com/googleapis/java-shell/commit/dfcb8e0227dcead494dc0cfa19c7e57f7b46e241))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.7.0 ([#158](https://github.com/googleapis/java-shell/issues/158)) ([8809a60](https://github.com/googleapis/java-shell/commit/8809a602fe92d92fba62357b557278fe1e034e26))
+
 ### [2.1.7](https://www.github.com/googleapis/java-shell/compare/v2.1.6...v2.1.7) (2022-01-07)
 
 
diff --git a/README.md b/README.md
index bdfb9ddc..7155c425 100644
--- a/README.md
+++ b/README.md
@@ -19,21 +19,20 @@ If you are using Maven, add this to your pom.xml file:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-shell</artifactId>
-  <version>2.1.6</version>
+  <version>2.1.7</version>
 </dependency>
-
 ```
 
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-shell:2.1.6'
+implementation 'com.google.cloud:google-cloud-shell:2.1.7'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-shell" % "2.1.6"
+libraryDependencies += "com.google.cloud" % "google-cloud-shell" % "2.1.7"
 ```
 
 ## Authentication
@@ -170,7 +169,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-shell/java8-win.html
 [kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-shell/java11.svg
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-shell/java11.html
-[stability-image]: https://img.shields.io/badge/stability-ga-green
+[stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-shell.svg
 [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-shell&core=gav
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
diff --git a/google-cloud-shell-bom/pom.xml b/google-cloud-shell-bom/pom.xml
index ca8021b1..883552eb 100644
--- a/google-cloud-shell-bom/pom.xml
+++ b/google-cloud-shell-bom/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-shell-bom</artifactId>
-  <version>2.1.7</version><!-- {x-version-update:google-cloud-shell:current} -->
+  <version>2.1.8</version><!-- {x-version-update:google-cloud-shell:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.6</version>
   </parent>
 
   <name>Google Cloud Shell BOM</name>
@@ -56,17 +56,17 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shell</artifactId>
-        <version>2.1.7</version><!-- {x-version-update:google-cloud-shell:current} -->
+        <version>2.1.8</version><!-- {x-version-update:google-cloud-shell:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-shell-v1</artifactId>
-        <version>2.1.7</version><!-- {x-version-update:grpc-google-cloud-shell-v1:current} -->
+        <version>2.1.8</version><!-- {x-version-update:grpc-google-cloud-shell-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-shell-v1</artifactId>
-        <version>2.1.7</version><!-- {x-version-update:proto-google-cloud-shell-v1:current} -->
+        <version>2.1.8</version><!-- {x-version-update:proto-google-cloud-shell-v1:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-cloud-shell/pom.xml b/google-cloud-shell/pom.xml
index 01787590..cb896083 100644
--- a/google-cloud-shell/pom.xml
+++ b/google-cloud-shell/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-shell</artifactId>
-  <version>2.1.7</version><!-- {x-version-update:google-cloud-shell:current} -->
+  <version>2.1.8</version><!-- {x-version-update:google-cloud-shell:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Shell</name>
   <url>https://github.com/googleapis/java-shell</url>
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shell-parent</artifactId>
-    <version>2.1.7</version><!-- {x-version-update:google-cloud-shell:current} -->
+    <version>2.1.8</version><!-- {x-version-update:google-cloud-shell:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-shell</site.installationModule>
diff --git a/grpc-google-cloud-shell-v1/pom.xml b/grpc-google-cloud-shell-v1/pom.xml
index 724dc2ad..0d60f6d1 100644
--- a/grpc-google-cloud-shell-v1/pom.xml
+++ b/grpc-google-cloud-shell-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-shell-v1</artifactId>
-  <version>2.1.7</version><!-- {x-version-update:grpc-google-cloud-shell-v1:current} -->
+  <version>2.1.8</version><!-- {x-version-update:grpc-google-cloud-shell-v1:current} -->
   <name>grpc-google-cloud-shell-v1</name>
   <description>GRPC library for google-cloud-shell</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shell-parent</artifactId>
-    <version>2.1.7</version><!-- {x-version-update:google-cloud-shell:current} -->
+    <version>2.1.8</version><!-- {x-version-update:google-cloud-shell:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/pom.xml b/pom.xml
index e336615b..908075f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-shell-parent</artifactId>
   <packaging>pom</packaging>
-  <version>2.1.7</version><!-- {x-version-update:google-cloud-shell:current} -->
+  <version>2.1.8</version><!-- {x-version-update:google-cloud-shell:current} -->
   <name>Google Cloud Shell Parent</name>
   <url>https://github.com/googleapis/java-shell</url>
   <description>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.6</version>
   </parent>
 
   <developers>
@@ -60,23 +60,23 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shell</artifactId>
-        <version>2.1.7</version><!-- {x-version-update:google-cloud-shell:current} -->
+        <version>2.1.8</version><!-- {x-version-update:google-cloud-shell:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-shell-v1</artifactId>
-        <version>2.1.7</version><!-- {x-version-update:grpc-google-cloud-shell-v1:current} -->
+        <version>2.1.8</version><!-- {x-version-update:grpc-google-cloud-shell-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-shell-v1</artifactId>
-        <version>2.1.7</version><!-- {x-version-update:proto-google-cloud-shell-v1:current} -->
+        <version>2.1.8</version><!-- {x-version-update:proto-google-cloud-shell-v1:current} -->
       </dependency>
 
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>2.6.0</version>
+        <version>2.7.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/proto-google-cloud-shell-v1/pom.xml b/proto-google-cloud-shell-v1/pom.xml
index 75385e64..df4167e5 100644
--- a/proto-google-cloud-shell-v1/pom.xml
+++ b/proto-google-cloud-shell-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-shell-v1</artifactId>
-  <version>2.1.7</version><!-- {x-version-update:proto-google-cloud-shell-v1:current} -->
+  <version>2.1.8</version><!-- {x-version-update:proto-google-cloud-shell-v1:current} -->
   <name>proto-google-cloud-shell-v1</name>
   <description>Proto library for google-cloud-shell</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shell-parent</artifactId>
-    <version>2.1.7</version><!-- {x-version-update:google-cloud-shell:current} -->
+    <version>2.1.8</version><!-- {x-version-update:google-cloud-shell:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 1568d19d..8617cb36 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-shell</artifactId>
-      <version>2.1.6</version>
+      <version>2.1.7</version>
     </dependency>
     <!-- [END shell_install_without_bom] -->
 
@@ -53,7 +53,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <id>add-snippets-source</id>
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 82c7aebf..f8b33fe3 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-shell</artifactId>
-      <version>2.1.6</version>
+      <version>2.1.7</version>
     </dependency>
   <!-- {x-version-update-end} -->
 
@@ -52,7 +52,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <id>add-snippets-source</id>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 897cd336..e75cbefb 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-shell</artifactId>
-      <version>2.1.6</version>
+      <version>2.1.7</version>
     </dependency>
 
     <dependency>
diff --git a/versions.txt b/versions.txt
index 5fcf349d..f38c0f1b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,6 +1,6 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-shell:2.1.7:2.1.7
-grpc-google-cloud-shell-v1:2.1.7:2.1.7
-proto-google-cloud-shell-v1:2.1.7:2.1.7
+google-cloud-shell:2.1.8:2.1.8
+grpc-google-cloud-shell-v1:2.1.8:2.1.8
+proto-google-cloud-shell-v1:2.1.8:2.1.8