diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a602c0a..5973df0 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -38,10 +38,14 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
+            # For PRs: tag as pr-<number>
             type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=raw,value=latest
+            # For tags: extract full version without 'v' prefix (e.g., 0.5.2 or 0.5.2rc3)
+            type=match,pattern=v(.*),group=1,enable=${{ startsWith(github.ref, 'refs/tags/v') }}
+            # For stable releases only: extract major.minor (e.g., 0.5 from v0.5.2)
+            type=match,pattern=v(\d+\.\d+),group=1,enable=${{ startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, 'rc') && !contains(github.ref, 'alpha') && !contains(github.ref, 'beta') }}
+            # Tag as 'latest' only for non-prerelease version tags
+            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, 'rc') && !contains(github.ref, 'alpha') && !contains(github.ref, 'beta') }}
 
       - name: Set build timestamp
         id: timestamp
diff --git a/pyproject.toml b/pyproject.toml
index c43de5f..27c3b60 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "couchbase-mcp-server"
-version = "0.5.2rc3"
+version = "0.5.2rc4"
 description = "Couchbase MCP Server - The Developer Data Platform for Critical Applications in Our AI World"
 readme = "README.md"
 requires-python = ">=3.10,<3.14"
diff --git a/server.json b/server.json
index b600ec5..9e2416c 100644
--- a/server.json
+++ b/server.json
@@ -6,12 +6,12 @@
     "url": "https://github.com/Couchbase-Ecosystem/mcp-server-couchbase",
     "source": "github"
   },
-  "version": "0.5.2rc3",
+  "version": "0.5.2rc4",
   "packages": [
     {
       "registryType": "pypi",
       "identifier": "couchbase-mcp-server",
-      "version": "0.5.2rc3",
+      "version": "0.5.2rc4",
       "transport": {
         "type": "stdio"
       },
@@ -172,7 +172,7 @@
     },
     {
       "registryType": "oci",
-      "identifier": "docker.io/couchbaseecosystem/mcp-server-couchbase:0.5.2rc3",
+      "identifier": "docker.io/couchbaseecosystem/mcp-server-couchbase:0.5.2rc4",
       "transport": {
         "type": "stdio"
       },
diff --git a/uv.lock b/uv.lock
index 976eba9..8f3d4ee 100644
--- a/uv.lock
+++ b/uv.lock
@@ -168,7 +168,7 @@ wheels = [
 
 [[package]]
 name = "couchbase-mcp-server"
-version = "0.5.2rc3"
+version = "0.5.2rc4"
 source = { editable = "." }
 dependencies = [
     { name = "click" },