diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 8774a93e7..c2426fba7 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -79,6 +79,11 @@ samples)
 
     if [[ -f ${SAMPLES_DIR}/pom.xml ]]
     then
+        for FILE in ${KOKORO_GFILE_DIR}/secret_manager/*-samples-secrets; do
+          [[ -f "$FILE" ]] || continue
+          source "$FILE"
+        done
+
         pushd ${SAMPLES_DIR}
         mvn -B \
           -Penable-samples \
diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
index 832fcf7cb..0048c8ece 100644
--- a/.kokoro/nightly/integration.cfg
+++ b/.kokoro/nightly/integration.cfg
@@ -35,8 +35,3 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "java-it-service-account"
 }
-
-env_vars: {
-  key: "GCS_BUCKET"
-  value: "byoid-it-bucket"
-}
diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg
index dd9078cc0..dded67a9d 100644
--- a/.kokoro/presubmit/integration.cfg
+++ b/.kokoro/presubmit/integration.cfg
@@ -31,8 +31,3 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "java-it-service-account"
 }
-
-env_vars: {
-  key: "GCS_BUCKET"
-  value: "byoid-it-bucket"
-}
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
index b16006b35..fdfa344a2 100755
--- a/.kokoro/release/publish_javadoc.sh
+++ b/.kokoro/release/publish_javadoc.sh
@@ -24,11 +24,6 @@ if [[ -z "${STAGING_BUCKET}" ]]; then
   exit 1
 fi
 
-if [[ -z "${STAGING_BUCKET_V2}" ]]; then
-  echo "Need to set STAGING_BUCKET_V2 environment variable"
-  exit 1
-fi
-
 # work from the git root directory
 pushd $(dirname "$0")/../../
 
diff --git a/synth.metadata b/synth.metadata
index e6795ee02..274e4d3da 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/google-auth-library-java.git",
-        "sha": "a54ca74e33c9a05cf2b42b3d83ff613645f60ed0"
+        "sha": "9ee0fdea10f74d30166052b09dc70b6528ab9e66"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "0b064d767537e0675fc053e53fca473c5c701fb8"
+        "sha": "572ef8f70edd9041f5bcfa71511aed6aecfc2098"
       }
     }
   ],