diff --git a/bitnami/keycloak/18/debian-11/Dockerfile b/bitnami/keycloak/18/debian-11/Dockerfile
index a3bab7f6c5f6..380547bf1b51 100644
--- a/bitnami/keycloak/18/debian-11/Dockerfile
+++ b/bitnami/keycloak/18/debian-11/Dockerfile
@@ -5,6 +5,13 @@ ENV HOME="/" \
     OS_NAME="linux"
 
 ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
+LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
+      org.opencontainers.image.description="Application packaged by Bitnami" \
+      org.opencontainers.image.ref.name="18.0.2-debian-11-r20" \
+      org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/keycloak" \
+      org.opencontainers.image.title="keycloak" \
+      org.opencontainers.image.vendor="VMware, Inc." \
+      org.opencontainers.image.version="18.0.2"
 
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/bitnami/keycloak/README.md b/bitnami/keycloak/README.md
index 91b3ab357f7a..359d6e27fea0 100644
--- a/bitnami/keycloak/README.md
+++ b/bitnami/keycloak/README.md
@@ -44,7 +44,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`18`, `18-debian-11`, `18.0.2`, `18.0.2-debian-11-r19`, `latest` (18/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/keycloak/18/debian-11/Dockerfile)
+* [`18`, `18-debian-11`, `18.0.2`, `18.0.2-debian-11-r20`, `latest` (18/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/keycloak/18/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).