diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index eb1adcdd2..27e357877 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,18 +15,25 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.19.4
       - name: Log in to GHCR
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GH_PAT }}
-      - name: Set up Go
-        uses: actions/setup-go@v3
+          password: ${{ secrets.GH_TOKEN }}
+      - name: Login to docker.io
+        uses: docker/login-action@v1
         with:
-          go-version: 1.19.4
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name : Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
@@ -34,5 +41,5 @@ jobs:
           version: latest
           args: release --rm-dist
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
index b3a69fdea..c2e65fba0 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -54,6 +54,16 @@ docker_manifests:
       - "ghcr.io/permify/permify:v{{ .Version }}-amd64"
       - "ghcr.io/permify/permify:v{{ .Version }}-arm64"
     name_template: "ghcr.io/permify/permify:latest"
+  -
+    image_templates:
+      - "permify/permify:v{{ .Version }}-amd64"
+      - "permify/permify:v{{ .Version }}-arm64"
+    name_template: "permify/permify:v{{ .Version }}"
+  -
+    image_templates:
+      - "permify/permify:v{{ .Version }}-amd64"
+      - "permify/permify:v{{ .Version }}-arm64"
+    name_template: "permify/permify:latest"
 dockers:
   -
     build_flag_templates:
@@ -62,6 +72,7 @@ dockers:
     goarch: arm64
     image_templates:
       - "ghcr.io/permify/permify:v{{ .Version }}-arm64"
+      - "permify/permify:v{{ .Version }}-arm64"
     use: buildx
   -
     build_flag_templates:
@@ -70,6 +81,7 @@ dockers:
     goarch: amd64
     image_templates:
       - "ghcr.io/permify/permify:v{{ .Version }}-amd64"
+      - "permify/permify:v{{ .Version }}-amd64"
     use: buildx
 nfpms:
   -