diff --git a/.github/workflows/publish-couchbase-2.5.yml b/.github/workflows/publish-couchbase-2.5.yml
index 6f3e93e..827cfe8 100644
--- a/.github/workflows/publish-couchbase-2.5.yml
+++ b/.github/workflows/publish-couchbase-2.5.yml
@@ -40,11 +40,18 @@ jobs:
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: |
-            ghcr.io/${{ github.actor }}/couchbase-2.5
-            ${{ secrets.DOCKER_USERNAME }}/couchbase-2.5
+            ghcr.io/${{ github.actor }}/couchbase
+            ${{ secrets.DOCKER_USERNAME }}/couchbase
           tags: |
             type=raw,value=latest
+            type=raw,value=2.5
             type=raw,value=2.5.2
+          labels: |
+            org.opencontainers.image.title=Couchbase Server 2.5
+            org.opencontainers.image.description=Legacy Couchbase Server (no official upstream image)
+            org.opencontainers.image.version=2.5.2
+            org.opencontainers.image.source=https://github.com/couchbase/docker
+            org.opencontainers.image.licenses=Apache-2.0
 
       - name: Build and push Docker images
         id: push
@@ -58,6 +65,6 @@ jobs:
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v3
         with:
-          subject-name: ghcr.io/${{ github.actor }}/couchbase-2.5
+          subject-name: ghcr.io/${{ github.actor }}/couchbase
           subject-digest: ${{ steps.push.outputs.digest }}
           push-to-registry: true
diff --git a/couchbase-2.5/docker-compose.example.yml b/couchbase-2.5/docker-compose.example.yml
index 5d5dc96..a1ae262 100644
--- a/couchbase-2.5/docker-compose.example.yml
+++ b/couchbase-2.5/docker-compose.example.yml
@@ -1,6 +1,6 @@
 services:
   couchbase:
-    image: ghcr.io/tiennm99/couchbase-2.5:2.5.2
+    image: ghcr.io/tiennm99/couchbase:2.5.2
     ports:
       - "8091:8091"
       - "8092:8092"