diff --git a/.github/workflows/upload-and-deploy.yaml b/.github/workflows/upload-and-deploy.yaml
index ea8b877..f51acb0 100755
--- a/.github/workflows/upload-and-deploy.yaml
+++ b/.github/workflows/upload-and-deploy.yaml
@@ -192,15 +192,16 @@ jobs:
 
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
+        with:
+          mask-password: 'false'
 
-      - name: Get ECR secret names
-        id: ecr
+      - name: Output keys of ecr-login step
+        id: login-ecr-keys
         run: |
-          usernameKey=docker_username_$(echo ${{ steps.login-ecr.outputs.registry }} | tr '.-' _)
-          echo "username-key=$usernameKey" >> $GITHUB_OUTPUT
-          passwordKey=docker_password_$(echo ${{ steps.login-ecr.outputs.registry }} | tr '.-' _)
-          echo "password-key=$passwordKey" >> $GITHUB_OUTPUT
+          echo "docker_username_key=docker_username_${{ steps.login-ecr.outputs.registry }}" >> $GITHUB_OUTPUT
+          echo "docker_password_key=docker_password_${{ steps.login-ecr.outputs.registry }}" >> $GITHUB_OUTPUT
+
       - uses: actions/checkout@v3
 
       - name: Set up Docker Buildx
@@ -215,10 +216,11 @@ jobs:
           file: ${{ matrix.dockerfile }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
+
     outputs:
       ecr-registry: ${{ steps.login-ecr.outputs.registry }}
-      ecr-username: ${{ steps.login-ecr.outputs[steps.ecr.outputs.username-key] }}
-      ecr-password: ${{ steps.login-ecr.outputs[steps.ecr.outputs.password-key] }}
+      ecr-username: ${{ steps.login-ecr.outputs.docker_username_914833433684.dkr.ecr.us-east-1.amazonaws.com }}
+      ecr-password: ${{ steps.login-ecr.outputs.docker_password_914833433684.dkr.ecr.us-east-1.amazonaws.com }}
 
   glue-unit-tests:
     name: Run Pytest unit tests for AWS glue