diff --git a/.github/workflows/on-pr-docker-cleanup.yml b/.github/workflows/on-pr-docker-cleanup.yml
index cf1ace099..3398bcab7 100644
--- a/.github/workflows/on-pr-docker-cleanup.yml
+++ b/.github/workflows/on-pr-docker-cleanup.yml
@@ -11,7 +11,7 @@ permissions:
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_TAG: homarr-test-pr-${{ github.event.number }}
+  IMAGE_TAG: pr-${{ github.event.number }}
 
 jobs:
   delete-image:
@@ -23,7 +23,7 @@ jobs:
         uses: actions/github-script@v8
         with:
           script: |
-            const packageName = 'homarr';
+            const packageName = 'homarr-test';
             const org = context.repo.owner;
             const tag = process.env.IMAGE_TAG;
 
diff --git a/.github/workflows/on-pr-docker-publish.yml b/.github/workflows/on-pr-docker-publish.yml
index e0ce8e553..8a911416c 100644
--- a/.github/workflows/on-pr-docker-publish.yml
+++ b/.github/workflows/on-pr-docker-publish.yml
@@ -13,7 +13,7 @@ permissions:
 env:
   SKIP_ENV_VALIDATION: true
   REGISTRY: ghcr.io
-  GHCR_REPO: ghcr.io/${{ github.repository }}
+  GHCR_REPO: ghcr.io/homarr-labs/homarr-test
   TURBO_TELEMETRY_DISABLED: 1
 
 concurrency:
@@ -36,7 +36,7 @@ jobs:
         with:
           images: "${{ env.GHCR_REPO }}"
           tags: |
-            type=raw,value=homarr-test-pr-${{ github.event.number }}
+            type=raw,value=pr-${{ github.event.number }}
 
       - name: Log in to the Container registry
         uses: docker/login-action@v4