diff --git a/.github/workflows/docker-build-push.yaml b/.github/workflows/docker-build-push.yaml
index 6a1b722..6024bc5 100644
--- a/.github/workflows/docker-build-push.yaml
+++ b/.github/workflows/docker-build-push.yaml
@@ -68,8 +68,7 @@ jobs:
         with:
           push: true
           tags: |
-            ghcr.io/deislabs/containerd-wasm-shims/${{ matrix.image.imageName }}:${{ env.RELEASE_VERSION }}
-            ghcr.io/deislabs/containerd-wasm-shims/${{ matrix.image.imageName }}:latest
+            ghcr.io/${{ github.repository }}/${{ matrix.image.imageName }}:${{ env.RELEASE_VERSION }}
+            ghcr.io/${{ github.repository }}/${{ matrix.image.imageName }}:latest
           context: ${{ matrix.image.context }}
           platforms: wasi/wasm
-      
\ No newline at end of file
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 3124ba7..b3468ee 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -59,7 +59,7 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      
+
       # Build and push k3d shim image
       - name: untar musl artifacts into ./deployments/k3d/.tmp/linux/(amd64|arm64) dir
         run: |
@@ -72,8 +72,8 @@ jobs:
         with:
           push: true
           tags: |
-            ghcr.io/deislabs/containerd-wasm-shims/examples/k3d:${{ env.RELEASE_VERSION }}
-            ghcr.io/deislabs/containerd-wasm-shims/examples/k3d:latest
+            ghcr.io/${{ github.repository }}/examples/k3d:${{ env.RELEASE_VERSION }}
+            ghcr.io/${{ github.repository }}/examples/k3d:latest
           context: deployments/k3d
           platforms: linux/amd64,linux/arm64
           build-args: |