diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index aea2bbee7..367cd7361 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -58,6 +58,19 @@ jobs:
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
 
+      - name: 🌐 Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: arn:aws:iam::067435167850:role/GitHubAction-AssumeRoleWithAction
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: 🌐 Login to Amazon ECR
+        id: ecr-login
+        uses: aws-actions/amazon-ecr-login@v1
+
+      - name: 🌐 Print ECR Output
+        run: echo ${{ steps.ecr-login.outputs.registry }}
+
       - name: 🐳 Set up QEMU
         uses: docker/setup-qemu-action@v2
 
@@ -66,9 +79,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            ${{ github.repository }}
             ghcr.io/${{ github.repository }}
-            067435167850.dkr.ecr.us-east-1.amazonaws.com/${{ github.event.repository.name }}
+            ${{ steps.ecr-login.outputs.registry }}/${{ github.event.repository.name }}
           tags: |
             type=ref,event=branch
             type=ref,event=pr
@@ -78,12 +90,6 @@ jobs:
       - name: 🐳 Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: 🐳 Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: 🐙 Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
@@ -91,15 +97,6 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: 🌐 Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
-        with:
-          role-to-assume: arn:aws:iam::067435167850:role/GitHubAction-AssumeRoleWithAction
-          aws-region: ${{ env.AWS_REGION }}
-
-      - name: 🌐 Login to Amazon ECR
-        uses: aws-actions/amazon-ecr-login@v1
-
       - name: 🐳 Build and push
         uses: docker/build-push-action@v4
         with:
@@ -111,3 +108,4 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=registry,ref=${{ github.repository }}:main
           cache-to: type=registry,ref=${{ github.repository }}:main,mode=max
+          provenance: false