diff --git a/.github/actions/docker/action.yaml b/.github/actions/docker/action.yaml
index 2220513c3824..d2adc95c4d4b 100644
--- a/.github/actions/docker/action.yaml
+++ b/.github/actions/docker/action.yaml
@@ -51,8 +51,11 @@ runs:
       run: echo "DOCKER_TAG=ghcr.io/${REPO}/${{inputs.docker_image}}:${GITHUB_BASE_REF%.1+}" >> $GITHUB_ENV
       shell: bash
     - name: Set up Cloud SDK
-      if: ${{ (steps.changed-files.outputs.any_changed == 'true') && (github.event_name == 'pull_request') && (github.event.pull_request.head.repo.fork) }}
       uses: isarkis/setup-gcloud@40dce7857b354839efac498d3632050f568090b6 # v1.1.1
+    - name: Configure Docker auth for GCloud
+      shell: bash
+      run: |
+        gcloud auth configure-docker
     - name: Set Docker Tag
       id: set-docker-tag-presubmit-fork
       env:
@@ -66,7 +69,6 @@ runs:
         ACCESS_TOKEN=$(curl -H 'Metadata-Flavor: Google' ${SVC_ACCT}/token | cut -d'"' -f 4)
         printf ${ACCESS_TOKEN} | docker login -u oauth2accesstoken --password-stdin https://gcr.io
         echo "DOCKER_TAG=gcr.io/${PROJECT_NAME}/${{inputs.docker_image}}:pr-${GITHUB_EVENT_NUMBER}" >> $GITHUB_ENV
-        gcloud auth configure-docker
       shell: bash
     - name: Process Docker metadata
       id: process-docker-metadata
diff --git a/cobalt/site/docker/Dockerfile b/cobalt/site/docker/Dockerfile
index 90bd6358e18d..748609a1d997 100644
--- a/cobalt/site/docker/Dockerfile
+++ b/cobalt/site/docker/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ARG FROM_IMAGE
-FROM ${FROM_IMAGE:-marketplace.gcr.io/google/debian11:latest}
+FROM ${FROM_IMAGE:-marketplace.gcr.io/google/debian11}
 
 RUN apt update -qqy \
     && apt install -qqy --no-install-recommends \