diff --git a/.github/workflows/BuildGQL.yml b/.github/workflows/BuildGQL.yml
index c8ad629..82e9ecb 100644
--- a/.github/workflows/BuildGQL.yml
+++ b/.github/workflows/BuildGQL.yml
@@ -533,6 +533,9 @@ jobs:
         with: 
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: latest=true
+        env: 
+          REGISTRY: ghcr.io
+          IMAGE_NAME: ${{ github.repository }}
       - name: Build and push Docker image (from main)
         if: ${{github.ref_name == 'main' || github.ref_name == 'master' || github.ref_name == 'latest'}}
         uses: docker/build-push-action@master
diff --git a/Build/GitHub/Steps/BuildAndPublishContainer.psd1 b/Build/GitHub/Steps/BuildAndPublishContainer.psd1
index 4145af3..a0c935f 100644
--- a/Build/GitHub/Steps/BuildAndPublishContainer.psd1
+++ b/Build/GitHub/Steps/BuildAndPublishContainer.psd1
@@ -32,6 +32,10 @@
         'images'='${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}'
         'flavor'='latest=true'
     }
+    env = @{
+        REGISTRY = 'ghcr.io'
+        IMAGE_NAME = '${{ github.repository }}'
+    }
 }
 @{
     name = 'Build and push Docker image (from main)'