diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1230bb3..cdfc7a3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,6 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: pre-commit
     strategy:
+      fail-fast: ${{ github.ref_name == 'master' && false || true }}
       matrix:
         base_image:
           - flavor: centos
@@ -138,5 +139,4 @@ jobs:
           SRC_IMAGE: quay.io/${{ env.IMAGE_REGISTRY_NAMESPACE }}/${{ env.IMAGE_REPOSITORY }}:${{ steps.vars.outputs.image_tag }}
           DST_IMAGE: ${{ env.IMAGE_REGISTRY_NAMESPACE }}/${{ env.IMAGE_REPOSITORY }}:${{ steps.vars.outputs.image_tag }}
         run: |
-          docker tag ${{ env.SRC_IMAGE }} ${{ env.DST_IMAGE }}
-          docker push ${{ env.DST_IMAGE }}
+          docker buildx imagetools create ${{ env.SRC_IMAGE }} -t ${{ env.DST_IMAGE }}