diff --git a/bitnami/grafana/9/debian-11/Dockerfile b/bitnami/grafana/9/debian-11/Dockerfile
index 433c6435a374..fc860fd50720 100644
--- a/bitnami/grafana/9/debian-11/Dockerfile
+++ b/bitnami/grafana/9/debian-11/Dockerfile
@@ -2,11 +2,11 @@ FROM docker.io/bitnami/minideb:bullseye
 
 ARG TARGETARCH
 
-LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
-      org.opencontainers.image.description="Application packaged by Bitnami" \
+LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
+      org.opencontainers.image.created="2023-02-17T15:16:41Z" \
+      org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="9.3.6-debian-11-r6" \
-      org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/grafana" \
+      org.opencontainers.image.ref.name="9.3.6-debian-11-r7" \
       org.opencontainers.image.title="grafana" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="9.3.6"
@@ -22,8 +22,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libfontconfig procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "grafana-9.3.6-0-linux-${OS_ARCH}-debian-11" \
-      "gosu-1.16.0-1-linux-${OS_ARCH}-debian-11" \
+      "grafana-9.3.6-1-linux-${OS_ARCH}-debian-11" \
+      "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 6f212846ca69..52a68457f180 100644
--- a/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,16 +1,16 @@
 {
     "gosu": {
         "arch": "amd64",
-        "digest": "9ab9654690d90d3c49ff66fb1eb286487e318adc899d036bc45922f6b176865b",
+        "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.16.0-1"
+        "version": "1.16.0-2"
     },
     "grafana": {
         "arch": "amd64",
-        "digest": "f40d06a9f9b9c4f99409592acf247d67bb0ec96a0d53373a1421505e2460b5ea",
+        "digest": "7f22ac159632201c0394bc158457af29a20917c2d68031928fd00688b01d0b53",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "9.3.6-0"
+        "version": "9.3.6-1"
     }
 }
\ No newline at end of file
diff --git a/bitnami/grafana/README.md b/bitnami/grafana/README.md
index f44ab0b94781..1624dd374608 100644
--- a/bitnami/grafana/README.md
+++ b/bitnami/grafana/README.md
@@ -95,7 +95,7 @@ We can launch another containers using the same flag (`--network NETWORK`) in th
 
 Update the `grafana.ini` configuration file in the `/opt/bitnami/grafana/conf` directory to override default configuration options. You only need to add the options you want to override. Config files are applied in the order of:
 
-```config
+```text
 grafana.ini
 default.ini
 ```
@@ -247,7 +247,7 @@ The number of plugins included in the image by default has been decreased. This
 * Reducing the image size.
 * Security concerns: by reducing the number of plugins, we also reduce the chances to include libraries affected by known vulnerabilities.
 
-You can still build your custom image adding your custom plugins or install them during the installization as explained in the [Grafana Plugins section](#grafana-plugins).
+You can still build your custom image adding your custom plugins or install them during the installization as explained in the Grafana Plugins section.
 
 ### 6.7.3-debian-10-r28