diff --git a/.github/workflows/serverless-model-tests.yml b/.github/workflows/serverless-model-tests.yml
index cb18ddd..4b3f8a3 100644
--- a/.github/workflows/serverless-model-tests.yml
+++ b/.github/workflows/serverless-model-tests.yml
@@ -90,7 +90,7 @@ jobs:
     if: github.event_name == 'push'
     runs-on: [blacksmith-8vcpu-ubuntu-2204, linux]
     outputs:
-      image: ${{ steps.build.outputs.image }}
+      release_version: ${{ steps.build.outputs.release_version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -116,11 +116,11 @@ jobs:
           HUGGINGFACE_ACCESS_TOKEN: ${{ secrets.HUGGINGFACE_ACCESS_TOKEN }}
         run: |
           docker buildx bake --push
-          echo "image=${DOCKERHUB_REPO}/${DOCKERHUB_IMG}:${RELEASE_VERSION}" >> "$GITHUB_OUTPUT"
+          echo "release_version=${RELEASE_VERSION}" >> "$GITHUB_OUTPUT"
 
   test-main:
     needs: [discover, build]
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' && needs.discover.result == 'success' && needs.build.result == 'success'
     runs-on: [blacksmith-8vcpu-ubuntu-2204, linux]
     timeout-minutes: 60
     strategy:
@@ -141,10 +141,13 @@ jobs:
 
       - name: Run serverless e2e test
         id: e2e_test
-        run: python scripts/serverless_e2e_test.py --config "${{ matrix.config }}" --image "${{ needs.build.outputs.image }}"
+        run: python scripts/serverless_e2e_test.py --config "${{ matrix.config }}" --image "${DOCKERHUB_REPO}/${DOCKERHUB_IMG}:${RELEASE_VERSION}"
         env:
           RUNPOD_API_KEY: ${{ secrets.RUNPOD_API_KEY_2 }}
           HUGGINGFACE_ACCESS_TOKEN: ${{ secrets.HUGGINGFACE_ACCESS_TOKEN_2 }}
+          DOCKERHUB_REPO: ${{ vars.DOCKERHUB_REPO || 'runpod' }}
+          DOCKERHUB_IMG: ${{ vars.DOCKERHUB_IMG || 'worker-v1-vllm' }}
+          RELEASE_VERSION: ${{ needs.build.outputs.release_version }}
 
       - name: Cleanup safety net
         if: always()