diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 6a84e36..f1f8d70 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -86,7 +86,10 @@ jobs:
         id: version
         run: |
           pg_major=$(echo ${{ matrix.cnpg }} | cut -d'.' -f1)
+          # Remove -bookworm suffix from cnpg tag for cleaner image tags
+          pg_full=$(echo ${{ matrix.cnpg }} | cut -d'-' -f1)
           echo "pg_major=$pg_major" >> "$GITHUB_OUTPUT"
+          echo "pg_full=$pg_full" >> "$GITHUB_OUTPUT"
 
       - name: Generate docker image tags
         id: metadata
@@ -98,10 +101,9 @@ jobs:
           images: |
             name=ghcr.io/${{ github.repository_owner }}/cloudnative-vectorchord-pgvecto.rs
           tags: |
-            type=raw,value=${{ matrix.cnpg }}-${{ matrix.pgvectors }},enable=${{ steps.should-release.outputs.result }}
-            type=raw,value=${{ steps.version.outputs.pg_major }}-${{ matrix.pgvectors }},enable=${{ steps.should-release.outputs.result }}
-            type=raw,value=${{ matrix.cnpg }},enable=${{ steps.should-release.outputs.result }}
-            type=raw,value=${{ steps.version.outputs.pg_major }},enable=${{ steps.should-release.outputs.result }}
+            # Three-component tags: pg-pgvectors-vectorchord
+            type=raw,value=${{ steps.version.outputs.pg_major }}-${{ matrix.pgvectors }}-${{ matrix.vectorchord }},enable=${{ steps.should-release.outputs.result }}
+            type=raw,value=${{ steps.version.outputs.pg_full }}-${{ matrix.pgvectors }}-${{ matrix.vectorchord }},enable=${{ steps.should-release.outputs.result }}
 
       - name: Build and push image
         uses: docker/build-push-action@v6.18.0
diff --git a/Dockerfile b/Dockerfile
index 7f385de..ad29da9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,10 +17,10 @@ RUN PG_MAJOR=$(echo $CNPG_TAG | cut -d'-' -f1 | cut -d'.' -f1) && \
     VERSION_NUM=${PGVECTORS_TAG#"v"} && \
     if [ "$PG_MAJOR" = "17" ] && [ "$VERSION_NUM" = "0.3.0" ]; then \
         # Special case for PG17 with v0.3.0 - use vectors variant
-        curl -L -o ./pgvectors.deb "https://github.com/tensorchord/pgvecto.rs/releases/download/$PGVECTORS_TAG/vectors-pg${PG_MAJOR}_${VERSION_NUM}_${TARGETARCH}_vectors.deb"; \
+        curl -L -o ./pgvectors.deb "https://github.com/tensorchord/pgvecto.rs/releases/download/v$PGVECTORS_TAG/vectors-pg${PG_MAJOR}_${VERSION_NUM}_${TARGETARCH}_vectors.deb"; \
     else \
         # Standard naming for other versions
-        curl -L -o ./pgvectors.deb "https://github.com/tensorchord/pgvecto.rs/releases/download/$PGVECTORS_TAG/vectors-pg${PG_MAJOR}_${VERSION_NUM}_$TARGETARCH.deb"; \
+        curl -L -o ./pgvectors.deb "https://github.com/tensorchord/pgvecto.rs/releases/download/v$PGVECTORS_TAG/vectors-pg${PG_MAJOR}_${VERSION_NUM}_$TARGETARCH.deb"; \
     fi && \
     apt install -y ./pgvectors.deb && \
     rm -f ./pgvectors.deb
diff --git a/versions.yaml b/versions.yaml
index 2438f73..95d0064 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -9,7 +9,9 @@ cnpg:
   - "17.5-bookworm"
 pgvectors:
   # renovate: datasource=github-releases depName=tensorchord/pgvecto.rs
-  - "v0.3.0"
+  - "0.3.0"
+  # renovate: datasource=github-releases depName=tensorchord/pgvecto.rs
+  - "0.4.0"
 vectorchord:
   # renovate: datasource=github-releases depName=tensorchord/VectorChord
   - "0.4.3"
\ No newline at end of file