diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml
index 9636862..1bbcec7 100644
--- a/.github/workflows/default.yaml
+++ b/.github/workflows/default.yaml
@@ -13,15 +13,9 @@ env:
   GITHUB_USER: ${{ github.repository_owner }}
   QUAY_USER: ${{ github.repository_owner }}
   
-  DH_IMAGE_BASE_NAME: ${{ vars.DOCKERHUB_USER }}/alpine-android-base
-  DH_IMAGE_NAME: ${{ vars.DOCKERHUB_USER }}/alpine-android
-
-  GHCR_IMAGE_BASE_NAME: ${{ vars.GITHUB_USER }}/alpine-android-base
-  GHCR_IMAGE_NAME: ${{ vars.GITHUB_USER }}/alpine-android
-
-  QUAY_IMAGE_BASE_NAME: ${{ vars.QUAY_USER }}/alpine-android-base
-  QUAY_IMAGE_NAME: ${{ vars.QUAY_USER }}/alpine-android
-
+  IMAGE_BASE_NAME: alpine-android-base
+  IMAGE_NAME: alpine-android
+  
   DEFAULT_JDK_VERSION: 11
   LATEST_STABLE_API: 33
 
@@ -59,9 +53,9 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            ${{ env.DH_IMAGE_BASE_NAME }}
-            ghcr.io/${{ env.GHCR_IMAGE_BASE_NAME }}
-            quay.io/${{ env.QUAY_IMAGE_BASE_NAME }}
+            ${{ env.DOCKERHUB_USER }}/${{ env.IMAGE_BASE_NAME }}
+            ghcr.io/${{ env.GITHUB_USER }}/${{ env.IMAGE_BASE_NAME }}
+            quay.io/${{ env.QUAY_USER }}/${{ env.IMAGE_BASE_NAME }}
           tags: |
             type=raw,value=jdk${{ matrix.jdk }}
             type=raw,value=latest-jdk${{ matrix.jdk }}
@@ -138,9 +132,9 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            ${{ env.DH_IMAGE_NAME }}
-            ghcr.io/${{ env.GHCR_IMAGE_NAME }}
-            quay.io/${{ env.QUAY_IMAGE_NAME }}
+            ${{ env.DOCKERHUB_USER }}/${{ env.IMAGE_NAME }}
+            ghcr.io/${{ env.GITHUB_USER }}/${{ env.IMAGE_NAME }}
+            quay.io/${{ env.QUAY_USER }}/${{ env.IMAGE_NAME }}
           tags: |
             type=raw,value=android-${{ matrix.android-api }}-jdk${{ matrix.jdk }}
             type=raw,value=android-${{ matrix.android-api }}-jdk${{ matrix.jdk }}-${{ github.ref_name }},enable=${{ startsWith(github.ref, 'refs/tags/v') }}
@@ -154,14 +148,14 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USER }}
+          username: ${{ env.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_PASS }}
 
 #       - name: Login to GitHub Container Registry
 #         uses: docker/login-action@v2
 #         with:
 #           registry: ghcr.io
-#           username: ${{ github.repository_owner }}
+#           username: ${{ env.GITHUB_USER }}
 #           password: ${{ secrets.GHCR_PASS }}
 
 #       - name: Login to Quay