diff --git a/.github/actions/smoke-tests/action.yaml b/.github/actions/smoke-tests/action.yaml
index 5934a53e69..fb85a75735 100644
--- a/.github/actions/smoke-tests/action.yaml
+++ b/.github/actions/smoke-tests/action.yaml
@@ -77,7 +77,6 @@ runs:
         file: tests/docker/Dockerfile
         context: '.'
         cache-from: type=gha,scope=test-runner
-        cache-to: type=gha,scope=test-runner,mode=max
         tags: test-runner:${{ github.sha }}
         pull: true
         load: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 874b364bb9..3ba4cf61bd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -274,6 +274,7 @@ jobs:
     name: Setup Matrix for Smoke Tests
     runs-on: ubuntu-22.04
     needs: [checks, build-docker-nap]
+    if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -299,6 +300,21 @@ jobs:
                                              \"images\": [{\"image\": \"debian\"}, {\"image\": \"debian-plus\"}]}" >> $GITHUB_OUTPUT
           fi
 
+      - name: Checkout Repository
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+      - name: Docker Buildx
+        uses: docker/setup-buildx-action@15c905b16b06416d2086efa066dd8e3a35cc7f98 # v2.4.0
+      - name: Build Test-Runner Container
+        uses: docker/build-push-action@37abcedcc1da61a57767b7588cb9d03eb57e28b3 # v3.3.0
+        with:
+          file: tests/docker/Dockerfile
+          context: '.'
+          cache-from: type=gha,scope=test-runner
+          cache-to: type=gha,scope=test-runner,mode=max
+          tags: test-runner:${{ github.sha }}
+          pull: true
+          load: true
+
   smoke-tests:
     name: Smoke Tests
     runs-on: ubuntu-22.04