diff --git a/.github/workflows/build-fd-image.yaml b/.github/workflows/build-fd-image.yaml
index 15baf5c0e..642beb6fe 100644
--- a/.github/workflows/build-fd-image.yaml
+++ b/.github/workflows/build-fd-image.yaml
@@ -384,7 +384,7 @@ jobs:
       - build-arm64-base-image-metadata
       - build-arm64-base
     with:
-      source_image: "${{ needs.build-arm64-base-image-metadata.outputs.IMG_NAME }}"
+      source_image: "${{ needs.build-arm64-base-image-metadata.outputs.IMG_NAME }}:${{ needs.build-arm64-base-image-metadata.outputs.version }}"
       source_registry: ghcr.io
       target_image: "${{ needs.build-arm64-base-image-metadata.outputs.DOCKER_IMG_NAME }}"
       target_registry: docker.io
@@ -403,7 +403,7 @@ jobs:
       - prod-image-manifest
       - scan-image
     with:
-      source_image: "${{ needs.prod-image-manifest.outputs.IMG_NAME }}"
+      source_image: "${{ needs.prod-image-manifest.outputs.IMG_NAME }}:${{ needs.prod-image-manifest.outputs.version }}"
       source_registry: ghcr.io
       target_image: "${{ needs.prod-image-manifest.outputs.DOCKER_IMG_NAME }}"
       target_registry: docker.io
diff --git a/.github/workflows/build-op-image.yaml b/.github/workflows/build-op-image.yaml
index 0b2e7d31d..b5ffb35e6 100644
--- a/.github/workflows/build-op-image.yaml
+++ b/.github/workflows/build-op-image.yaml
@@ -152,7 +152,6 @@ jobs:
       source_registry: ghcr.io
       target_image: "${{ needs.build-image-metadata.outputs.DOCKER_IMG_NAME }}"
       target_registry: docker.io
-      platforms: "['linux/arm64', 'linux/amd64']"
       tags: ${{ needs.build-image-metadata.outputs.release_tags }}
     secrets:
       source_registry_username:  ${{ github.actor }}