diff --git a/.github/actions/build-image/action.yaml b/.github/actions/build-image/action.yaml
index 55d008c1..99bbd037 100644
--- a/.github/actions/build-image/action.yaml
+++ b/.github/actions/build-image/action.yaml
@@ -49,8 +49,7 @@ runs:
           type=semver,pattern={{major}}.{{minor}}.{{patch}}
           type=semver,pattern={{major}}.{{minor}}
           type=semver,pattern={{major}}
-          type=ref,suffix=-dev,event=branch
-          type=ref,suffix=-pr,event=pr
+          type=ref,enable={{is_default_branch}},suffix=-dev,event=branch
           type=ref,event=tag
           type=sha
         labels: |
@@ -75,4 +74,4 @@ runs:
         cache-from: type=gha,scope=${{ inputs.imageName }}
         cache-to: type=gha,mode=max,scope=${{ inputs.imageName }}
         # Maintenance note: keep the expression for push in sync with the expression used in "platforms".
-        push: true
+        push: ${{ github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags/') }}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index baa56b7c..d2105023 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -191,6 +191,9 @@ jobs:
   build-and-push-images:
     name: Build Images
     runs-on: ubuntu-latest
+    needs:
+      - verify
+      - injector_binary_and_instrumentation_image_tests
     timeout-minutes: 60
 
     steps: