diff --git a/.github/workflows/build-pocketbase.yml b/.github/workflows/build-pocketbase.yml
index 2ea7780..c3d6f55 100644
--- a/.github/workflows/build-pocketbase.yml
+++ b/.github/workflows/build-pocketbase.yml
@@ -1,4 +1,4 @@
-name: Build Pocketbase AMD64
+name: Build Pocketbase MultiArch
 on:
   pull_request:
     branches:
@@ -11,6 +11,21 @@ jobs:
     name: Build Pocketbase AMD64 and Push
     runs-on: ubuntu-latest
     steps:
+      # STEP 1: Checkout the code                                                                                                                                                               
+      - name: Checkout Code                                                                                                                                                                     
+        uses: actions/checkout@v4                                                                                                                                                               
+        with:                                                                                                                                                                                   
+          ref: ${{ github.ref_name }}                                                                                                                                                           
+          fetch-depth: 1   
+
+      # STEP 2: Extract PB_VERSION from Dockerfile
+      - name: Get PB version
+        id: pb_version
+        run: |
+          VERSION=$(grep -oP 'PB_VERSION=\K[^\s]+' Dockerfile)
+          if [ -z "$VERSION" ]; then echo "PB_VERSION not found" && exit 1; fi
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          
       -
         name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -27,7 +42,7 @@ jobs:
         with:
           images: docker.io/${{ vars.DOCKERHUB_USERNAME }}/pocketbase
           tags: |
-            type=raw,value=${{ vars.PB_VERSION }}
+            type=raw,value=${{ steps.pb_version.outputs.version }}
             type=raw,value=latest
       -
         name: Set up Docker Buildx
diff --git a/Dockerfile b/Dockerfile
index 6900d4b..1461c9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:latest
 
-ARG PB_VERSION=0.36.5
+ARG PB_VERSION=0.36.6
 ARG TARGETARCH
 
 ENV PB_VERSION=${PB_VERSION}