diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
index f9dbde0e3..3512f94d9 100644
--- a/.github/workflows/docker-build-and-push.yml
+++ b/.github/workflows/docker-build-and-push.yml
@@ -35,7 +35,7 @@ jobs:
         if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' }}
         uses: azure/docker-login@v2
         with:
-          login-server: ${{ secrets.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io' }}
+          login-server: ${{ secrets.ACR_LOGIN_SERVER }}
           username: ${{ secrets.ACR_USERNAME }}
           password: ${{ secrets.ACR_PASSWORD }}
 
@@ -58,6 +58,11 @@ jobs:
             echo "TAG=pullrequest-ignore" >> $GITHUB_ENV
           fi
 
+      - name: Get registry
+        id: registry
+        run: |
+          echo "ext_registry=${{ secrets.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io'}}" >> $GITHUB_OUTPUT
+
       - name: Set Historical Tag
         run: |
           DATE_TAG=$(date +'%Y-%m-%d')
@@ -72,8 +77,8 @@ jobs:
           file: ./src/backend/Dockerfile
           push: ${{ env.TAG != 'pullrequest-ignore' }}
           tags: |
-            ${{ secrets.ACR_LOGIN_SERVER }}/macaebackend:${{ env.TAG }}
-            ${{ secrets.ACR_LOGIN_SERVER }}/macaebackend:${{ env.HISTORICAL_TAG }}
+            ${{ steps.registry.outputs.ext_registry }}/macaebackend:${{ env.TAG }}
+            ${{ steps.registry.outputs.ext_registry }}/macaebackend:${{ env.HISTORICAL_TAG }}
   
       - name: Build and optionally push Frontend Docker image
         uses: docker/build-push-action@v6
@@ -82,5 +87,5 @@ jobs:
           file: ./src/frontend/Dockerfile
           push: ${{ env.TAG != 'pullrequest-ignore' }}
           tags: |
-            ${{ secrets.ACR_LOGIN_SERVER }}/macaefrontend:${{ env.TAG }}
-            ${{ secrets.ACR_LOGIN_SERVER }}/macaefrontend:${{ env.HISTORICAL_TAG }}
\ No newline at end of file
+            ${{ steps.registry.outputs.ext_registry }}/macaefrontend:${{ env.TAG }}
+            ${{ steps.registry.outputs.ext_registry }}/macaefrontend:${{ env.HISTORICAL_TAG }}
\ No newline at end of file