diff --git a/.buildkite/vagrant-run.sh b/.buildkite/vagrant-run.sh
index 06355a43..a54aeb97 100755
--- a/.buildkite/vagrant-run.sh
+++ b/.buildkite/vagrant-run.sh
@@ -26,6 +26,8 @@ if [ ! -f ${KEY_PATH} ]; then
   gcloud secrets versions access latest --secret=e2e-builder-sa-key --quiet --project=sourcegraph-ci > "${KEY_PATH}"
 fi
 export GOOGLE_JSON_KEY_LOCATION="${KEY_PATH}"
+export DOCKER_USERNAME=sourcegraph
+export DOCKER_PASSWORD="$(gcloud secrets versions access latest --secret=DOCKER_PASSWORD_BUILDKITE_AGENT --quiet --project=sourcegraph-ci)"
 
 echo --- ":vagrant: starting box $box"
 vagrant up "$box" --provider=google || exit_code=$?
diff --git a/batch-change/release.yaml b/batch-change/release.yaml
index b67e8e3a..61deea27 100644
--- a/batch-change/release.yaml
+++ b/batch-change/release.yaml
@@ -32,34 +32,34 @@ internal:
         - name: docker(compose):tags
           cmd: |
             set -eu
-            registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
+            registry=us-docker.pkg.dev/sourcegraph-images/internal
             sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../docker-compose/
         - name: docker(shell):tags
           cmd: |
             set -eu
-            registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
+            registry=us-docker.pkg.dev/sourcegraph-images/internal
             sg ops update-images --registry ${registry} --kind pure-docker --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../pure-docker/
       minor:
         - name: docker(compose):tags
           cmd: |
             set -eu
-            registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
+            registry=us-docker.pkg.dev/sourcegraph-images/internal
             sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../docker-compose/
         - name: docker(shell):tags
           cmd: |
             set -eu
-            registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
+            registry=us-docker.pkg.dev/sourcegraph-images/internal
             sg ops update-images --registry ${registry} --kind pure-docker --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../pure-docker/
       major:
         - name: docker(compose):tags
           cmd: |
             set -eu
-            registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
+            registry=us-docker.pkg.dev/sourcegraph-images/internal
             sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../docker-compose/
         - name: docker(shell):tags
           cmd: |
             set -eu
-            registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
+            registry=us-docker.pkg.dev/sourcegraph-images/internal
             sg ops update-images --registry ${registry} --kind pure-docker --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../pure-docker/
   finalize:
     steps:
diff --git a/release.yaml b/release.yaml
index 2393e9fb..ac3a782a 100644
--- a/release.yaml
+++ b/release.yaml
@@ -31,12 +31,12 @@ internal:
           - name: docker(compose):tags
             cmd: |
               set -eu
-              registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
+              registry=us-docker.pkg.dev/sourcegraph-images/internal
               sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD   docker-compose/
           - name: docker(shell):tags
             cmd: |
               set -eu
-              registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
+              registry=us-docker.pkg.dev/sourcegraph-images/internal
               sg ops update-images --registry ${registry} --kind shell --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD  pure-docker/
           - name: "git:branch"
             cmd: |
@@ -57,12 +57,12 @@ internal:
           - name: docker(compose):tags
             cmd: |
               set -eu
-              registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
+              registry=us-docker.pkg.dev/sourcegraph-images/internal
               sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD docker-compose/
           - name: docker(shell):tags
             cmd: |
               set -eu
-              registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
+              registry=us-docker.pkg.dev/sourcegraph-images/internal
               sg ops update-images --registry ${registry} --kind shell --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD pure-docker/
           - name: "git:branch"
             cmd: |
@@ -83,12 +83,12 @@ internal:
           - name: docker(compose):tags
             cmd: |
               set -eu
-              registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
+              registry=us-docker.pkg.dev/sourcegraph-images/internal
               sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD docker-compose/
           - name: docker(shell):tags
             cmd: |
               set -eu
-              registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
+              registry=us-docker.pkg.dev/sourcegraph-images/internal
               sg ops update-images --registry ${registry} --kind shell --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD pure-docker/
           - name: "git:branch"
             cmd: |
diff --git a/test/smoke-test.sh b/test/smoke-test.sh
index 6526aa8e..a78cde2a 100755
--- a/test/smoke-test.sh
+++ b/test/smoke-test.sh
@@ -2,11 +2,13 @@
 set -euxfo pipefail
 
 configure_docker() {
+  set +x
   if [ -n "${DOCKER_USERNAME}" ] && [ -n "${DOCKER_PASSWORD}" ]; then
     docker login -u "${DOCKER_USERNAME}" --password-stdin <<<"$DOCKER_PASSWORD"
   fi
+  set -x
   gcloud auth configure-docker
-  gcloud auth configure-docker us-central1-docker.pkg.dev
+  gcloud auth configure-docker us-central1-docker.pkg.dev,us-docker.pkg.dev
 }
 
 deploy_sourcegraph() {