diff --git a/.github/workflows/build-next.yml b/.github/workflows/build-next.yml
index c21aefab..f59358bd 100644
--- a/.github/workflows/build-next.yml
+++ b/.github/workflows/build-next.yml
@@ -57,6 +57,12 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v4
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Set Short Git Commit SHA
         id: vars
         run: echo "sha_short=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f43a626c..fb3e6ec6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -52,6 +52,12 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v4
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v7
         with:
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 67ec369e..26f533d0 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -81,6 +81,7 @@ dockers_v2:
       - pocket-id
     dockerfile: docker/Dockerfile-prebuilt
     images:
+      - "pocketid/pocket-id"
       - "ghcr.io/{{ .Env.GITHUB_REPOSITORY_OWNER }}/pocket-id"
     tags:
       - "{{ .Tag }}"
@@ -110,6 +111,7 @@ dockers_v2:
       - pocket-id
     dockerfile: docker/Dockerfile-distroless
     images:
+      - "pocketid/pocket-id"
       - "ghcr.io/{{ .Env.GITHUB_REPOSITORY_OWNER }}/pocket-id"
     tags:
       - "{{ .Tag }}-distroless"
@@ -137,6 +139,7 @@ dockers_v2:
       - pocket-id
     dockerfile: docker/Dockerfile-prebuilt
     images:
+      - "pocketid/pocket-id"
       - "ghcr.io/{{ .Env.GITHUB_REPOSITORY_OWNER }}/pocket-id"
     tags:
       - "next"
@@ -164,6 +167,7 @@ dockers_v2:
       - pocket-id
     dockerfile: docker/Dockerfile-distroless
     images:
+      - "pocketid/pocket-id"
       - "ghcr.io/{{ .Env.GITHUB_REPOSITORY_OWNER }}/pocket-id"
     tags:
       - "next-distroless"
diff --git a/docker-compose.yml b/docker-compose.yml
index e4ec61bc..93ae8f90 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   pocket-id:
-    image: ghcr.io/pocket-id/pocket-id:v2
+    image: pocketid/pocket-id:v2 # or ghcr.io/pocket-id/pocket-id:v2
     restart: unless-stopped
     env_file: .env
     ports:
diff --git a/scripts/development/deploy-development-image.sh b/scripts/development/deploy-development-image.sh
index 64168653..e930bd5d 100755
--- a/scripts/development/deploy-development-image.sh
+++ b/scripts/development/deploy-development-image.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker buildx build --push --file docker/Dockerfile --tag ghcr.io/pocket-id/pocket-id:development --platform linux/amd64,linux/arm64 .
\ No newline at end of file
+docker buildx build --push --file docker/Dockerfile --tag pocketid/pocket-id:development --tag ghcr.io/pocket-id/pocket-id:development --platform linux/amd64,linux/arm64 .