diff --git a/bitnami/golang/1.18/debian-11/Dockerfile b/bitnami/golang/1.18/debian-11/Dockerfile
index 4504011f1905..416e13f99ace 100644
--- a/bitnami/golang/1.18/debian-11/Dockerfile
+++ b/bitnami/golang/1.18/debian-11/Dockerfile
@@ -3,6 +3,14 @@ ENV OS_ARCH="amd64" \
     OS_FLAVOUR="debian-11" \
     OS_NAME="linux"
 
+LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
+      org.opencontainers.image.description="Application packaged by Bitnami" \
+      org.opencontainers.image.ref.name="1.18.5-debian-11-r4" \
+      org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/golang" \
+      org.opencontainers.image.title="golang" \
+      org.opencontainers.image.vendor="VMware, Inc." \
+      org.opencontainers.image.version="1.18.5"
+
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
diff --git a/bitnami/golang/README.md b/bitnami/golang/README.md
index c58d1e9c3741..0f13108a3bae 100644
--- a/bitnami/golang/README.md
+++ b/bitnami/golang/README.md
@@ -36,7 +36,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`1.19`, `1.19-debian-11`, `1.19.0`, `1.19.0-debian-11-r3`, `latest` (1.19/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/golang/1.19/debian-11/Dockerfile)
-* [`1.18`, `1.18-debian-11`, `1.18.5`, `1.18.5-debian-11-r3` (1.18/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/golang/1.18/debian-11/Dockerfile)
+* [`1.18`, `1.18-debian-11`, `1.18.5`, `1.18.5-debian-11-r4` (1.18/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/golang/1.18/debian-11/Dockerfile)
 * [`1.17`, `1.17-debian-11`, `1.17.13`, `1.17.13-debian-11-r3` (1.17/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/golang/1.17/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).