diff --git a/.github/actions/build-and-push-to-ecr/action.yml b/.github/actions/build-and-push-to-ecr/action.yml
index 6ccac87..1cf0a61 100644
--- a/.github/actions/build-and-push-to-ecr/action.yml
+++ b/.github/actions/build-and-push-to-ecr/action.yml
@@ -67,9 +67,29 @@ runs:
       uses: docker/setup-qemu-action@v3
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
-    - name: Build and push image
-      id: build-and-push
-      uses: docker/build-push-action@v5
+    - name: Build image
+      id: build
+      uses: docker/build-push-action@v6
+      with:
+        context: ${{ inputs.docker-build-context }}
+        file: ${{ inputs.dockerfile-path }}
+        platforms: ${{ inputs.docker-build-platforms }}
+        push: false
+        tags: ${{ steps.login-ecr.outputs.registry }}/${{ inputs.ecr-repository-name }}:${{ inputs.docker-image-tag }}
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        build-args: ${{ inputs.docker-build-args }}
+        no-cache: ${{ inputs.docker-no-cache }}
+    - name: Run Container Scan
+      id: container-scan
+      uses: experian-marketing-services/gha-container-scanner@v1
+      with:
+        container: ${{ steps.login-ecr.outputs.registry }}/${{ inputs.ecr-repository-name }}:${{ inputs.docker-image-tag }}
+        wiz_key_id: ${{ secrets.WIZ_KEY_ID }}
+        wiz_key_secret: ${{ secrets.WIZ_KEY_SECRET }}
+    - name: Push image
+      id: push
+      uses: docker/build-push-action@v6
       with:
         context: ${{ inputs.docker-build-context }}
         file: ${{ inputs.dockerfile-path }}