diff --git a/.github/workflows/build-pocketbase-amd64.yml b/.github/workflows/build-pocketbase-amd64.yml
index 755c7a5..e862b8a 100644
--- a/.github/workflows/build-pocketbase-amd64.yml
+++ b/.github/workflows/build-pocketbase-amd64.yml
@@ -1,4 +1,4 @@
-name: Build Pocketbase
+name: Build Pocketbase AMD64
 on:
   pull_request:
     branches:
@@ -27,8 +27,7 @@ jobs:
         with:
           images: docker.io/${{ vars.DOCKERHUB_USERNAME }}/pocketbase
           tags: |
-            type=raw,value=latest
-            type=raw,value=${{ vars.PB_VERSION }}
+            type=raw,value=${{ vars.PB_VERSION }}-${{ vars.AMD64 }}
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
diff --git a/.github/workflows/build-pocketbase-arm64.yml b/.github/workflows/build-pocketbase-arm64.yml
index f39377e..c57bf93 100644
--- a/.github/workflows/build-pocketbase-arm64.yml
+++ b/.github/workflows/build-pocketbase-arm64.yml
@@ -27,8 +27,7 @@ jobs:
         with:
           images: docker.io/${{ vars.DOCKERHUB_USERNAME }}/pocketbase
           tags: |
-            type=raw,value=latest
-            type=raw,value=${{ vars.PB_VERSION }}
+            type=raw,value=${{ vars.PB_VERSION }}-${{ vars.ARM64 }}
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3