diff --git a/.github/workflows/ci-on-push.yaml b/.github/workflows/ci-on-push.yaml
index da870d7d2a..f2cd7e0554 100644
--- a/.github/workflows/ci-on-push.yaml
+++ b/.github/workflows/ci-on-push.yaml
@@ -23,7 +23,6 @@ jobs:
       registry: ghcr.io
       repo: ${{ github.repository_owner }}/kata-deploy-ci
       tag: ${{ github.event.workflow_run.head_sha }}-amd64
-      quay-io-login-continue-on-error: true
     secrets: inherit
 
   run-k8s-tests-on-aks:
diff --git a/.github/workflows/publish-kata-deploy-payload-amd64.yaml b/.github/workflows/publish-kata-deploy-payload-amd64.yaml
index bcee25eea8..697fdb433c 100644
--- a/.github/workflows/publish-kata-deploy-payload-amd64.yaml
+++ b/.github/workflows/publish-kata-deploy-payload-amd64.yaml
@@ -18,10 +18,6 @@ on:
       tag:
         required: true
         type: string
-      quay-io-login-continue-on-error:
-        required: false
-        type: boolean
-        default: false
 
 jobs:
   kata-payload:
@@ -37,14 +33,15 @@ jobs:
           name: kata-static-tarball-amd64${{ inputs.tarball-suffix }}
 
       - name: Login to Kata Containers quay.io
+        if: ${{ inputs.registry == 'quay.io' }}
         uses: docker/login-action@v2
         with:
           registry: quay.io
           username: ${{ secrets.QUAY_DEPLOYER_USERNAME }}
           password: ${{ secrets.QUAY_DEPLOYER_PASSWORD }}
-        continue-on-error: ${{ inputs.quay-io-login-continue-on-error }}
 
       - name: Login to Kata Containers ghcr.io
+        if: ${{ inputs.registry == 'ghcr.io' }}
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
diff --git a/.github/workflows/publish-kata-deploy-payload-arm64.yaml b/.github/workflows/publish-kata-deploy-payload-arm64.yaml
index 285ac97e48..f1de4abacf 100644
--- a/.github/workflows/publish-kata-deploy-payload-arm64.yaml
+++ b/.github/workflows/publish-kata-deploy-payload-arm64.yaml
@@ -18,10 +18,6 @@ on:
       tag:
         required: true
         type: string
-      quay-io-login-continue-on-error:
-        required: false
-        type: boolean
-        default: false
 
 jobs:
   kata-payload:
@@ -41,14 +37,15 @@ jobs:
           name: kata-static-tarball-arm64${{ inputs.tarball-suffix }}
 
       - name: Login to Kata Containers quay.io
+        if: ${{ inputs.registry == 'quay.io' }}
         uses: docker/login-action@v2
         with:
           registry: quay.io
           username: ${{ secrets.QUAY_DEPLOYER_USERNAME }}
           password: ${{ secrets.QUAY_DEPLOYER_PASSWORD }}
-        continue-on-error: ${{ inputs.quay-io-login-continue-on-error }}
 
       - name: Login to Kata Containers ghcr.io
+        if: ${{ inputs.registry == 'ghcr.io' }}
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
diff --git a/.github/workflows/publish-kata-deploy-payload-s390x.yaml b/.github/workflows/publish-kata-deploy-payload-s390x.yaml
index 4341e4397c..498b8cd98c 100644
--- a/.github/workflows/publish-kata-deploy-payload-s390x.yaml
+++ b/.github/workflows/publish-kata-deploy-payload-s390x.yaml
@@ -18,10 +18,6 @@ on:
       tag:
         required: true
         type: string
-      quay-io-login-continue-on-error:
-        required: false
-        type: boolean
-        default: false
 
 jobs:
   kata-payload:
@@ -41,14 +37,15 @@ jobs:
           name: kata-static-tarball-s390x${{ inputs.tarball-suffix }}
 
       - name: Login to Kata Containers quay.io
+        if: ${{ inputs.registry == 'quay.io' }}
         uses: docker/login-action@v2
         with:
           registry: quay.io
           username: ${{ secrets.QUAY_DEPLOYER_USERNAME }}
           password: ${{ secrets.QUAY_DEPLOYER_PASSWORD }}
-        continue-on-error: ${{ inputs.quay-io-login-continue-on-error }}
 
       - name: Login to Kata Containers ghcr.io
+        if: ${{ inputs.registry == 'ghcr.io' }}
         uses: docker/login-action@v2
         with:
           registry: ghcr.io