diff --git a/bitnami/grafana/9/debian-11/Dockerfile b/bitnami/grafana/9/debian-11/Dockerfile
index 50433fe2a1c1..ee79169facd6 100644
--- a/bitnami/grafana/9/debian-11/Dockerfile
+++ b/bitnami/grafana/9/debian-11/Dockerfile
@@ -3,13 +3,13 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-05-09T14:06:53Z" \
+      org.opencontainers.image.created="2023-05-11T02:40:01Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="9.5.1-debian-11-r5" \
+      org.opencontainers.image.ref.name="9.5.2-debian-11-r0" \
       org.opencontainers.image.title="grafana" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="9.5.1"
+      org.opencontainers.image.version="9.5.2"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -22,7 +22,7 @@ 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.5.1-0-linux-${OS_ARCH}-debian-11" \
+      "grafana-9.5.2-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -39,7 +39,7 @@ RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/grafana/postunpack.sh
-ENV APP_VERSION="9.5.1" \
+ENV APP_VERSION="9.5.2" \
     BITNAMI_APP_NAME="grafana" \
     PATH="/opt/bitnami/grafana/bin:$PATH"
 
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 4e49c9281e5c..183f55993256 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
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "9.5.1-0"
+        "version": "9.5.2-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
index 02c989d693ae..6d9ca8546eef 100644
--- a/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -421,7 +421,7 @@ generate_random_string() {
     alphanumeric+special|special+alphanumeric)
         # Limit variety of special characters, so there is a higher chance of containing more alphanumeric characters
         # Special characters are harder to write, and it could impact the overall UX if most passwords are too complex
-        filter='a-zA-Z0-9!@#$%^'
+        filter='a-zA-Z0-9:@.,/+!='
         ;;
     *)
         echo "Invalid type ${type}" >&2
diff --git a/bitnami/grafana/9/debian-11/tags-info.yaml b/bitnami/grafana/9/debian-11/tags-info.yaml
index d923e69b824b..b23ad2082495 100644
--- a/bitnami/grafana/9/debian-11/tags-info.yaml
+++ b/bitnami/grafana/9/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "9"
 - 9-debian-11
-- 9.5.1
+- 9.5.2
 - latest
diff --git a/bitnami/grafana/README.md b/bitnami/grafana/README.md
index c871403c1674..3f3cf71d036d 100644
--- a/bitnami/grafana/README.md
+++ b/bitnami/grafana/README.md
@@ -22,6 +22,8 @@ docker run --name grafana bitnami/grafana:latest
 * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images.
 * Bitnami container images are released on a regular basis with the latest distribution packages available.
 
+Looking to use Grafana in production? Try [VMware Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog.
+
 ## How to deploy Grafana in Kubernetes?
 
 Deploying Bitnami applications as Helm Charts is the easiest way to get started with our applications on Kubernetes. Read more about the installation in the [Bitnami Grafana Chart GitHub repository](https://github.com/bitnami/charts/tree/master/bitnami/grafana).