diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7d35c7ff..a954282d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -115,5 +115,5 @@ jobs:
           push: false
           tags: snapotter:ci
           build-args: SKIP_MODEL_DOWNLOADS=true
-          cache-from: type=registry,ref=ghcr.io/${{ github.repository }}:cache-linux-amd64
-          cache-to: type=registry,ref=ghcr.io/${{ github.repository }}:cache-ci,mode=max
+          cache-from: type=registry,ref=ghcr.io/snapotter-hq/snapotter:cache-linux-amd64
+          cache-to: type=registry,ref=ghcr.io/snapotter-hq/snapotter:cache-ci,mode=max
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 28d01ec2..467996bc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -110,7 +110,7 @@ jobs:
         with:
           images: |
             snapotterhq/snapotter
-            ghcr.io/${{ github.repository }}
+            ghcr.io/snapotter-hq/snapotter
 
       - name: Build and push by digest
         id: build
@@ -120,9 +120,9 @@ jobs:
           file: docker/Dockerfile
           platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,"name=snapotterhq/snapotter,ghcr.io/${{ github.repository }}",push-by-digest=true,name-canonical=true,push=true
-          cache-from: type=registry,ref=ghcr.io/${{ github.repository }}:cache-${{ env.PLATFORM_PAIR }}
-          cache-to: type=registry,ref=ghcr.io/${{ github.repository }}:cache-${{ env.PLATFORM_PAIR }},mode=max
+          outputs: type=image,"name=snapotterhq/snapotter,ghcr.io/snapotter-hq/snapotter",push-by-digest=true,name-canonical=true,push=true
+          cache-from: type=registry,ref=ghcr.io/snapotter-hq/snapotter:cache-${{ env.PLATFORM_PAIR }}
+          cache-to: type=registry,ref=ghcr.io/snapotter-hq/snapotter:cache-${{ env.PLATFORM_PAIR }},mode=max
 
       - name: Export digest
         run: |
@@ -169,7 +169,7 @@ jobs:
         with:
           images: |
             snapotterhq/snapotter
-            ghcr.io/${{ github.repository }}
+            ghcr.io/snapotter-hq/snapotter
           tags: |
             type=semver,pattern={{version}},value=v${{ needs.release.outputs.new_version }}
             type=semver,pattern={{major}}.{{minor}},value=v${{ needs.release.outputs.new_version }}
@@ -188,4 +188,4 @@ jobs:
         run: |
           docker buildx imagetools create \
             $(jq -cr '.tags | map(select(startswith("ghcr.io/")) | "-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf 'ghcr.io/${{ github.repository }}@sha256:%s ' *)
+            $(printf 'ghcr.io/snapotter-hq/snapotter@sha256:%s ' *)