diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 5973df0..aad1ad4 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -32,6 +32,18 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Check if stable release
+        id: check-stable
+        run: |
+          TAG_NAME="${GITHUB_REF#refs/tags/}"
+          if [[ "$TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "is_stable=true" >> $GITHUB_OUTPUT
+            echo "This is a stable release: $TAG_NAME"
+          else
+            echo "is_stable=false" >> $GITHUB_OUTPUT
+            echo "This is a pre-release: $TAG_NAME"
+          fi
+
       - name: Extract metadata
         id: meta
         uses: docker/metadata-action@v5
@@ -43,9 +55,9 @@ jobs:
             # 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') }}
+            type=match,pattern=v(\d+\.\d+),group=1,enable=${{ steps.check-stable.outputs.is_stable == 'true' }}
+            # Tag as 'latest' only for stable releases
+            type=raw,value=latest,enable=${{ steps.check-stable.outputs.is_stable == 'true' }}
 
       - name: Set build timestamp
         id: timestamp
diff --git a/pyproject.toml b/pyproject.toml
index 27c3b60..749b385 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "couchbase-mcp-server"
-version = "0.5.2rc4"
+version = "0.5.2rc5"
 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 9e2416c..62d40a8 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.2rc4",
+  "version": "0.5.2rc5",
   "packages": [
     {
       "registryType": "pypi",
       "identifier": "couchbase-mcp-server",
-      "version": "0.5.2rc4",
+      "version": "0.5.2rc5",
       "transport": {
         "type": "stdio"
       },
@@ -172,7 +172,7 @@
     },
     {
       "registryType": "oci",
-      "identifier": "docker.io/couchbaseecosystem/mcp-server-couchbase:0.5.2rc4",
+      "identifier": "docker.io/couchbaseecosystem/mcp-server-couchbase:0.5.2rc5",
       "transport": {
         "type": "stdio"
       },
diff --git a/uv.lock b/uv.lock
index 8f3d4ee..bbdb7a8 100644
--- a/uv.lock
+++ b/uv.lock
@@ -168,7 +168,7 @@ wheels = [
 
 [[package]]
 name = "couchbase-mcp-server"
-version = "0.5.2rc4"
+version = "0.5.2rc5"
 source = { editable = "." }
 dependencies = [
     { name = "click" },