diff --git a/build/release/teamcity-mark-build.sh b/build/release/teamcity-mark-build.sh
index f34209ceeda7..e3582a019879 100755
--- a/build/release/teamcity-mark-build.sh
+++ b/build/release/teamcity-mark-build.sh
@@ -34,11 +34,11 @@ mark_build() {
 
 # Publish potential release metadata to a stable location.
 publish_qualify_metadata() {
-  gcs_bucket="release-automation-dev"
-  google_credentials=$GOOGLE_RELEASE_AUTOMATION_CREDENTIALS_DEV
+  gcs_bucket="cockroach-release-qualification-test"
+  google_credentials=$GCS_CREDENTIALS_DEV
   if [[ -z "${DRY_RUN}" ]] ; then
-    gcs_bucket="release-automation-prod"
-    google_credentials=$GOOGLE_RELEASE_AUTOMATION_CREDENTIALS_PROD
+    gcs_bucket="cockroach-release-qualification-prod"
+    google_credentials=$GCS_CREDENTIALS_PROD
   fi
 
   tc_start_block "Metadata"
diff --git a/build/teamcity/internal/cockroach/release/process/pick_sha_impl.sh b/build/teamcity/internal/cockroach/release/process/pick_sha_impl.sh
index a2effff9e165..33b2be774fea 100755
--- a/build/teamcity/internal/cockroach/release/process/pick_sha_impl.sh
+++ b/build/teamcity/internal/cockroach/release/process/pick_sha_impl.sh
@@ -5,18 +5,18 @@ set -xeuo pipefail
 dir="$(dirname $(dirname $(dirname $(dirname $(dirname $(dirname "${0}"))))))"
 source "$dir/teamcity-support.sh"  # For log_into_gcloud
 
-google_credentials="$METADATA_PUBLISHER_GOOGLE_CREDENTIALS_DEV"
+google_credentials="$GCS_CREDENTIALS_DEV"
 to=dev-inf+release-dev@cockroachlabs.com
-qualify_bucket=release-automation-dev
-release_bucket=release-automation-dev
+qualify_bucket=cockroach-release-qualification-test
+release_bucket=cockroach-release-qualification-test
 
 # override dev defaults with production values
 if [[ -z "${DRY_RUN}" ]] ; then
   echo "Setting production values"
-  google_credentials="$METADATA_PUBLISHER_GOOGLE_CREDENTIALS_PROD"
+  google_credentials="$GCS_CREDENTIALS_PROD"
   to=releases@cockroachlabs.com
-  qualify_bucket=release-automation-prod
-  release_bucket=release-automation-prod
+  qualify_bucket=cockroach-release-qualification-prod
+  release_bucket=cockroach-release-qualification-prod
 fi
 
 log_into_gcloud