diff --git a/.tekton/scanner-build.yaml b/.tekton/scanner-build.yaml
index b32e818e9..493426bf8 100644
--- a/.tekton/scanner-build.yaml
+++ b/.tekton/scanner-build.yaml
@@ -58,11 +58,12 @@ spec:
       secretName: '{{ git_auth_secret }}'
 
   taskRunSpecs:
-  # For all build-container-* tasks:
-  # Provision more CPU to speed up build compared to the defaults.
-  # https://github.com/redhat-appstudio/build-definitions/blob/main/task/buildah/0.1/buildah.yaml#L126
   - pipelineTaskName: build-container-amd64
     stepSpecs:
+    # Provision more CPU to speed up build compared to the defaults.
+    # https://github.com/redhat-appstudio/build-definitions/blob/main/task/buildah/0.1/buildah.yaml#L126
+    #
+    # This is not required for multi-arch builds, because they are performed off cluster
     - name: build
       computeResources:
         requests:
diff --git a/.tekton/scanner-component-pipeline.yaml b/.tekton/scanner-component-pipeline.yaml
index 5cf0ddf5f..be8061c22 100644
--- a/.tekton/scanner-component-pipeline.yaml
+++ b/.tekton/scanner-component-pipeline.yaml
@@ -9,7 +9,7 @@ spec:
   - name: show-sbom
     params:
     - name: IMAGE_URL
-      value: $(tasks.build-image-manifest.results.IMAGE_URL)
+      value: $(tasks.build-container-amd64.results.IMAGE_URL)
     taskRef:
       params:
       - name: name
@@ -243,7 +243,7 @@ spec:
       - name: name
         value: buildah-oci-ta
       - name: bundle
-        value: quay.io/redhat-appstudio-tekton-catalog/task-buildah-oci-ta:0.2
+        value: quay.io/redhat-appstudio-tekton-catalog/task-buildah-oci-ta:0.2@sha256:1911dc8ec67b3f8ae365b4cbe8d61a56ed69e4b46658b01caee486cfdfd38e89
       - name: kind
         value: task
       resolver: bundles
@@ -300,7 +300,7 @@ spec:
       - name: name
         value: buildah-oci-ta
       - name: bundle
-        value: quay.io/redhat-appstudio-tekton-catalog/task-buildah-oci-ta:0.2
+        value: quay.io/redhat-appstudio-tekton-catalog/task-buildah-remote-oci-ta:0.2@sha256:b62eadffad6737b237cbfa3e78114daba18da17e5028fe71707388cf8a102f31
       - name: kind
         value: task
       resolver: bundles
diff --git a/.tekton/scanner-slim-build.yaml b/.tekton/scanner-slim-build.yaml
index dca10aeec..b4644f675 100644
--- a/.tekton/scanner-slim-build.yaml
+++ b/.tekton/scanner-slim-build.yaml
@@ -58,11 +58,12 @@ spec:
       secretName: '{{ git_auth_secret }}'
 
   taskRunSpecs:
-  # For all build-container-* tasks:
-  # Provision more CPU to speed up build compared to the defaults.
-  # https://github.com/redhat-appstudio/build-definitions/blob/main/task/buildah/0.1/buildah.yaml#L126
   - pipelineTaskName: build-container-amd64
     stepSpecs:
+    # Provision more CPU to speed up build compared to the defaults.
+    # https://github.com/redhat-appstudio/build-definitions/blob/main/task/buildah/0.1/buildah.yaml#L126
+    #
+    # This is not required for multi-arch builds, because they are performed off cluster
     - name: build
       computeResources:
         requests: