diff --git a/bitnami/envoy/1.21/debian-11/Dockerfile b/bitnami/envoy/1.21/debian-11/Dockerfile
index 03a42f175855..99ec4a7743d9 100644
--- a/bitnami/envoy/1.21/debian-11/Dockerfile
+++ b/bitnami/envoy/1.21/debian-11/Dockerfile
@@ -4,6 +4,14 @@ ENV HOME="/" \
     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.21.5-debian-11-r6" \
+      org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/envoy" \
+      org.opencontainers.image.title="envoy" \
+      org.opencontainers.image.vendor="VMware, Inc." \
+      org.opencontainers.image.version="1.21.5"
+
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
diff --git a/bitnami/envoy/README.md b/bitnami/envoy/README.md
index 47d1fb984d1a..7de951870da1 100644
--- a/bitnami/envoy/README.md
+++ b/bitnami/envoy/README.md
@@ -30,7 +30,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`1.23`, `1.23-debian-11`, `1.23.0`, `1.23.0-debian-11-r9`, `latest` (1.23/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/envoy/1.23/debian-11/Dockerfile)
 * [`1.22`, `1.22-debian-11`, `1.22.4`, `1.22.4-debian-11-r3` (1.22/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/envoy/1.22/debian-11/Dockerfile)
-* [`1.21`, `1.21-debian-11`, `1.21.5`, `1.21.5-debian-11-r5` (1.21/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/envoy/1.21/debian-11/Dockerfile)
+* [`1.21`, `1.21-debian-11`, `1.21.5`, `1.21.5-debian-11-r6` (1.21/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/envoy/1.21/debian-11/Dockerfile)
 * [`1.20`, `1.20-debian-11`, `1.20.7`, `1.20.7-debian-11-r7` (1.20/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/envoy/1.20/debian-11/Dockerfile)
 * [`1.19`, `1.19-debian-11`, `1.19.5`, `1.19.5-debian-11-r21` (1.19/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/envoy/1.19/debian-11/Dockerfile)