diff --git a/.github/workflows/setup/action.yaml b/.github/workflows/setup/action.yaml
index e791e51ac2..2eeefd9f3e 100644
--- a/.github/workflows/setup/action.yaml
+++ b/.github/workflows/setup/action.yaml
@@ -32,6 +32,9 @@ runs:
         restore-keys: |
           scons-${{ env.CACHE_COMMIT_DATE }}-
           scons-
+    # build our docker image
+    - shell: bash
+      run: eval ${{ env.BUILD }}
     - id: setup-scons-cache-docker
       name: Sets up a docker image with scons cache that can by mounted as a buildkit cache mount
       shell: bash
@@ -39,7 +42,4 @@ runs:
       run: |
         cp selfdrive/test/Dockerfile.scons_cache ~
         cd ~
-        DOCKER_BUILDKIT=1 docker build -t scons-cache -f Dockerfile.scons_cache .
-    # build our docker image
-    - shell: bash
-      run: eval ${{ env.BUILD }}
+        DOCKER_BUILDKIT=1 docker build -t scons-cache -f Dockerfile.scons_cache .
\ No newline at end of file
diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml
index 04f73d21af..5fd7555473 100644
--- a/.github/workflows/tools_tests.yaml
+++ b/.github/workflows/tools_tests.yaml
@@ -75,10 +75,6 @@ jobs:
     name: build docs
     runs-on: ubuntu-20.04
     timeout-minutes: 45
-    env:
-      BUILD: |
-        docker pull $DOCKER_REGISTRY/openpilot-docs:latest
-        DOCKER_BUILDKIT=1 docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $DOCKER_REGISTRY/openpilot-docs:latest -t $DOCKER_REGISTRY/openpilot-docs:latest -f docs/docker/Dockerfile .
     steps:
     - uses: actions/checkout@v3
       with:
@@ -87,6 +83,9 @@ jobs:
       with:
         setup_docker_scons_cache: true
         git_lfs: false
+    - name: Build docs image
+      run: |
+        DOCKER_BUILDKIT=1 docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $DOCKER_REGISTRY/openpilot-docs:latest -t $DOCKER_REGISTRY/openpilot-docs:latest -f docs/docker/Dockerfile .
     - name: Push docker container
       if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
       run: |