diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7be2e37..02559cb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,9 +23,6 @@ env:
   HELM_KEY_PASSPHRASE: ${{ secrets.HELM_KEY_PASSPHRASE }}
   HELM_REPO_PASSWORD: ${{ secrets.HELM_REPO_PASSWORD }}
 
-  CI_REGISTRY: ghcr.io
-  CI_REGISTRY_IMAGE: ghcr.io/${{ github.repository }}
-
   CI_COMMIT_SHORT_SHA: ${{ github.sha }}
 
   ECCR_USER: ${{ secrets.ECCR_USER }}
@@ -112,6 +109,9 @@ jobs:
           username: ${{ env.ECCR_USER }}
           password: ${{ env.ECCR_PASSWORD }}
 
+      - name: Add Registry to Env
+        run: echo "CI_REGISTRY_IMAGE=ghcr.io/${GITHUB_REPOSITORY,,}" >> "$GITHUB_ENV"
+  
       - name: Set Kaniko Build Variables
         if: (matrix.build_type == 'tag' && startsWith(github.ref, 'refs/tags/')) || (matrix.build_type == 'stable' && github.ref_name == 'master')
         run: |