diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml
index 64c96280f8..0f68f425b6 100644
--- a/.github/workflows/selfdrive_tests.yaml
+++ b/.github/workflows/selfdrive_tests.yaml
@@ -187,18 +187,19 @@ jobs:
     name: docker push
     runs-on: ubuntu-20.04
     if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
-    env:
-      PUSH_IMAGE: true
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: true
+    - name: Setup to push to repo
+      run: |
+        export PUSH_IMAGE=true
+        $DOCKER_LOGIN
     - uses: ./.github/workflows/setup
       with:
         git-lfs: false
     - name: Build and push CL Docker image
       run: |
-        $DOCKER_LOGIN
         eval "$BUILD_CL"
 
   static_analysis:
diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml
index 470c7662a4..7a7acb1c87 100644
--- a/.github/workflows/tools_tests.yaml
+++ b/.github/workflows/tools_tests.yaml
@@ -60,7 +60,7 @@ jobs:
       run: eval "$BUILD_CL"
     - name: Setup to push to repo
       if: github.ref == 'refs/heads/master' && github.repository == 'commaai/openpilot'
-      run:
+      run: |
         export PUSH_IMAGE=true
         $DOCKER_LOGIN
     - name: Build and push sim image
@@ -81,7 +81,7 @@ jobs:
         git_lfs: false
     - name: Setup to push to repo
       if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
-      run:
+      run: |
         export PUSH_IMAGE=true
         $DOCKER_LOGIN
     - name: Build and push docs image