diff --git a/.github/workflows/publish-gradle-8.yml b/.github/workflows/publish-gradle-8.yml
index 3f70af3..7c679ff 100644
--- a/.github/workflows/publish-gradle-8.yml
+++ b/.github/workflows/publish-gradle-8.yml
@@ -40,11 +40,18 @@ jobs:
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: |
-            ${{ secrets.DOCKER_USERNAME }}/gradle-8
-            ghcr.io/${{ github.actor }}/gradle-8
+            ${{ secrets.DOCKER_USERNAME }}/gradle
+            ghcr.io/${{ github.actor }}/gradle
           tags: |
             type=raw,value=latest
+            type=raw,value=8
             type=raw,value=8.13
+          labels: |
+            org.opencontainers.image.title=Gradle 8
+            org.opencontainers.image.description=Gradle 8.13 on Oracle JDK 8 base
+            org.opencontainers.image.version=8.13
+            org.opencontainers.image.source=https://github.com/gradle/docker-gradle
+            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 }}/gradle-8
+          subject-name: ghcr.io/${{ github.actor }}/gradle
           subject-digest: ${{ steps.push.outputs.digest }}
           push-to-registry: true
diff --git a/README.md b/README.md
index cd61241..d6f148d 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Custom Docker images of legacy/discontinued software — built and published to
 | Image | Tag | GHCR package | Notes |
 |-------|-----|-------------|-------|
 | Couchbase 2.5 | `2.5.2` | [couchbase](https://github.com/tiennm99/docker-images/pkgs/container/couchbase) | Legacy NoSQL; no official image exists |
-| Gradle 8 | latest | — | JDK 8 + Corretto base |
+| Gradle 8 | `8.13` | [gradle](https://github.com/tiennm99/docker-images/pkgs/container/gradle) | JDK 8 + Corretto base |
 | Oracle JDK 8 | `8u201` | [oraclejdk](https://github.com/tiennm99/docker-images/pkgs/container/oraclejdk) | Archived Oracle JDK build |
 | Scribe 2.2 | `2.2` | [scribe](https://github.com/tiennm99/docker-images/pkgs/container/scribe) | Facebook's legacy log aggregation daemon |
 
diff --git a/gradle-8/Dockerfile b/gradle-8/Dockerfile
index e3274ba..9f87db7 100644
--- a/gradle-8/Dockerfile
+++ b/gradle-8/Dockerfile
@@ -1,4 +1,11 @@
-FROM ghcr.io/tiennm99/oraclejdk-8:8u201
+FROM ghcr.io/tiennm99/oraclejdk:8u201
+
+LABEL maintainer="miti99 <tiennm99@outlook.com>"
+LABEL org.opencontainers.image.title="Gradle 8"
+LABEL org.opencontainers.image.description="Gradle 8.13 on Oracle JDK 8 base"
+LABEL org.opencontainers.image.version="8.13"
+LABEL org.opencontainers.image.source="https://github.com/gradle/docker-gradle"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
 
 CMD ["gradle"]