diff --git a/.tekton/grafana-dashboard-loader-acm-211-pull-request.yaml b/.tekton/grafana-dashboard-loader-acm-211-pull-request.yaml
index f725757e9b..3fad7495c7 100644
--- a/.tekton/grafana-dashboard-loader-acm-211-pull-request.yaml
+++ b/.tekton/grafana-dashboard-loader-acm-211-pull-request.yaml
@@ -339,7 +339,7 @@ spec:
         - "false"
     - name: sast-snyk-check
       runAfter:
-      - clone-repository
+      - build-container
       taskRef:
         params:
         - name: name
@@ -357,6 +357,11 @@ spec:
       workspaces:
       - name: workspace
         workspace: workspace
+      params:
+      - name: image-digest
+        value: $(tasks.build-container.results.IMAGE_DIGEST)
+      - name: image-url
+        value: $(tasks.build-container.results.IMAGE_URL)
     - name: clamav-scan
       params:
       - name: image-digest
diff --git a/.tekton/grafana-dashboard-loader-acm-211-push.yaml b/.tekton/grafana-dashboard-loader-acm-211-push.yaml
index 09220a96d7..40f90cd623 100644
--- a/.tekton/grafana-dashboard-loader-acm-211-push.yaml
+++ b/.tekton/grafana-dashboard-loader-acm-211-push.yaml
@@ -336,7 +336,7 @@ spec:
         - "false"
     - name: sast-snyk-check
       runAfter:
-      - clone-repository
+      - build-container
       taskRef:
         params:
         - name: name
@@ -354,6 +354,11 @@ spec:
       workspaces:
       - name: workspace
         workspace: workspace
+      params:
+      - name: image-digest
+        value: $(tasks.build-container.results.IMAGE_DIGEST)
+      - name: image-url
+        value: $(tasks.build-container.results.IMAGE_URL)
     - name: clamav-scan
       params:
       - name: image-digest
diff --git a/.tekton/metrics-collector-acm-211-pull-request.yaml b/.tekton/metrics-collector-acm-211-pull-request.yaml
index 32872a1b04..c156f8551b 100644
--- a/.tekton/metrics-collector-acm-211-pull-request.yaml
+++ b/.tekton/metrics-collector-acm-211-pull-request.yaml
@@ -339,7 +339,7 @@ spec:
         - "false"
     - name: sast-snyk-check
       runAfter:
-      - clone-repository
+      - build-container
       taskRef:
         params:
         - name: name
@@ -357,6 +357,11 @@ spec:
       workspaces:
       - name: workspace
         workspace: workspace
+      params:
+      - name: image-digest
+        value: $(tasks.build-container.results.IMAGE_DIGEST)
+      - name: image-url
+        value: $(tasks.build-container.results.IMAGE_URL)
     - name: clamav-scan
       params:
       - name: image-digest
diff --git a/.tekton/metrics-collector-acm-211-push.yaml b/.tekton/metrics-collector-acm-211-push.yaml
index 6f49fb6426..ed53a21438 100644
--- a/.tekton/metrics-collector-acm-211-push.yaml
+++ b/.tekton/metrics-collector-acm-211-push.yaml
@@ -336,7 +336,7 @@ spec:
         - "false"
     - name: sast-snyk-check
       runAfter:
-      - clone-repository
+      - build-container
       taskRef:
         params:
         - name: name
@@ -354,6 +354,11 @@ spec:
       workspaces:
       - name: workspace
         workspace: workspace
+      params:
+      - name: image-digest
+        value: $(tasks.build-container.results.IMAGE_DIGEST)
+      - name: image-url
+        value: $(tasks.build-container.results.IMAGE_URL)
     - name: clamav-scan
       params:
       - name: image-digest
diff --git a/.tekton/multicluster-observability-operator-acm-211-pull-request.yaml b/.tekton/multicluster-observability-operator-acm-211-pull-request.yaml
index 42f1d9b97d..6a48788188 100644
--- a/.tekton/multicluster-observability-operator-acm-211-pull-request.yaml
+++ b/.tekton/multicluster-observability-operator-acm-211-pull-request.yaml
@@ -339,7 +339,7 @@ spec:
         - "false"
     - name: sast-snyk-check
       runAfter:
-      - clone-repository
+      - build-container
       taskRef:
         params:
         - name: name
@@ -357,6 +357,11 @@ spec:
       workspaces:
       - name: workspace
         workspace: workspace
+      params:
+      - name: image-digest
+        value: $(tasks.build-container.results.IMAGE_DIGEST)
+      - name: image-url
+        value: $(tasks.build-container.results.IMAGE_URL)
     - name: clamav-scan
       params:
       - name: image-digest
diff --git a/.tekton/multicluster-observability-operator-acm-211-push.yaml b/.tekton/multicluster-observability-operator-acm-211-push.yaml
index f6b8410c32..e510ce3409 100644
--- a/.tekton/multicluster-observability-operator-acm-211-push.yaml
+++ b/.tekton/multicluster-observability-operator-acm-211-push.yaml
@@ -336,7 +336,7 @@ spec:
         - "false"
     - name: sast-snyk-check
       runAfter:
-      - clone-repository
+      - build-container
       taskRef:
         params:
         - name: name
@@ -354,6 +354,11 @@ spec:
       workspaces:
       - name: workspace
         workspace: workspace
+      params:
+      - name: image-digest
+        value: $(tasks.build-container.results.IMAGE_DIGEST)
+      - name: image-url
+        value: $(tasks.build-container.results.IMAGE_URL)
     - name: clamav-scan
       params:
       - name: image-digest
diff --git a/.tekton/rbac-query-proxy-acm-211-pull-request.yaml b/.tekton/rbac-query-proxy-acm-211-pull-request.yaml
index 64bf553d6d..46ef7a2727 100644
--- a/.tekton/rbac-query-proxy-acm-211-pull-request.yaml
+++ b/.tekton/rbac-query-proxy-acm-211-pull-request.yaml
@@ -339,7 +339,7 @@ spec:
         - "false"
     - name: sast-snyk-check
       runAfter:
-      - clone-repository
+      - build-container
       taskRef:
         params:
         - name: name
@@ -357,6 +357,11 @@ spec:
       workspaces:
       - name: workspace
         workspace: workspace
+      params:
+      - name: image-digest
+        value: $(tasks.build-container.results.IMAGE_DIGEST)
+      - name: image-url
+        value: $(tasks.build-container.results.IMAGE_URL)
     - name: clamav-scan
       params:
       - name: image-digest
diff --git a/.tekton/rbac-query-proxy-acm-211-push.yaml b/.tekton/rbac-query-proxy-acm-211-push.yaml
index 224c4237e2..30eb5d1649 100644
--- a/.tekton/rbac-query-proxy-acm-211-push.yaml
+++ b/.tekton/rbac-query-proxy-acm-211-push.yaml
@@ -336,7 +336,7 @@ spec:
         - "false"
     - name: sast-snyk-check
       runAfter:
-      - clone-repository
+      - build-container
       taskRef:
         params:
         - name: name
@@ -354,6 +354,11 @@ spec:
       workspaces:
       - name: workspace
         workspace: workspace
+      params:
+      - name: image-digest
+        value: $(tasks.build-container.results.IMAGE_DIGEST)
+      - name: image-url
+        value: $(tasks.build-container.results.IMAGE_URL)
     - name: clamav-scan
       params:
       - name: image-digest