diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 47d0fd2892..ccf3a3bb0a 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -26,6 +26,13 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
+      - name: Login to registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Docker meta
         id: meta-slim
         if: github.event_name == 'pull_request'
@@ -67,14 +74,6 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
 
 
-      - name: Login to registry
-        uses: docker/login-action@v2
-        if: github.event_name != 'pull_request'
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Build and push publicly
         if: github.event_name != 'pull_request'
         uses: docker/build-push-action@v3
@@ -217,7 +216,14 @@ jobs:
           registry: ${{ env.ECR_REGISTRY }}
           username: ${{ secrets.AWS_ACCESS_KEY_ID }}
           password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          
+
+      - name: Login to registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build and push privately
         uses: docker/build-push-action@v3
         if: github.event_name != 'pull_request'
@@ -243,6 +249,13 @@ jobs:
         uses: docker/setup-buildx-action@v2
  
 
+      - name: Login to registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Login to ECR
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v2