diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6924682510..a36203b3c6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,8 +30,8 @@ on:
   # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_dispatch
   workflow_dispatch:
 
-env:
-  IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
+# env:
+#   IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
 
 jobs:
   push-ghcr:
@@ -63,6 +63,7 @@ jobs:
           echo "IMAGE_DESCRIPTION=$(yq '.description' ./${{ matrix.recipe }})" >> $GITHUB_ENV
           echo "FEDORA_MAJOR_VERSION=$(yq '.fedora-version' ./${{ matrix.recipe }})" >> $GITHUB_ENV
           echo "BASE_IMAGE_URL=$(yq '.base-image' ./${{ matrix.recipe }})" >> $GITHUB_ENV
+          echo "IMAGE_REGISTRY=ghcr.io/${{ github.repository_owner }}" >> $GITHUB_ENV
 
       - name: Generate tags
         id: generate-tags
diff --git a/Containerfile b/Containerfile
index d347b9b9ab..e5fa9b3f22 100644
--- a/Containerfile
+++ b/Containerfile
@@ -30,8 +30,6 @@ COPY ${RECIPE} /usr/share/ublue-os/recipe.yml
 COPY ./cosign.pub /usr/etc/pki/containers/cosign.pub
 COPY ./usr/etc/containers /usr/etc/
 
-RUN cat /usr/etc/containers/policy.json
-
 # Copy nix install script and Universal Blue wallpapers RPM from Bling image
 #COPY --from=ghcr.io/ublue-os/bling:latest /rpms/ublue-os-wallpapers-0.1-1.fc38.noarch.rpm /tmp/ublue-os-wallpapers-0.1-1.fc38.noarch.rpm
 
diff --git a/scripts/build.sh b/scripts/build.sh
index 6795ae65b3..d632e19855 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -24,6 +24,7 @@ echo "Building custom Fedora ${FEDORA_VERSION} from image: \"${BASE_IMAGE}\"."
 
 # Setup container signing
 echo "Setup container signing in policy.json and cosign.yaml"
+echo "IMAGE_REGISTRY: $IMAGE_REGISTRY"
 sed -i "s ghcr.io/ublue-os $IMAGE_REGISTRY g" /usr/etc/containers/policy.json
 sed -i "s ghcr.io/ublue-os $IMAGE_REGISTRY g" /usr/etc/containers/registries.d/cosign.yaml