diff --git a/bitnami/grafana/10/debian-12/Dockerfile b/bitnami/grafana/10/debian-12/Dockerfile
index 97dd0202a194..6cad77198ce2 100644
--- a/bitnami/grafana/10/debian-12/Dockerfile
+++ b/bitnami/grafana/10/debian-12/Dockerfile
@@ -7,13 +7,13 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-03-06T16:42:58Z" \
+      org.opencontainers.image.created="2024-03-19T11:54:13Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="10.3.3-debian-12-r5" \
+      org.opencontainers.image.ref.name="10.4.0-debian-12-r0" \
       org.opencontainers.image.title="grafana" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="10.3.3"
+      org.opencontainers.image.version="10.4.0"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -28,7 +28,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
       "mysql-client-10.11.7-1-linux-${OS_ARCH}-debian-12" \
       "ini-file-1.4.6-10-linux-${OS_ARCH}-debian-12" \
-      "grafana-10.3.3-2-linux-${OS_ARCH}-debian-12" \
+      "grafana-10.4.0-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -46,7 +46,7 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/grafana/postunpack.sh
-ENV APP_VERSION="10.3.3" \
+ENV APP_VERSION="10.4.0" \
     BITNAMI_APP_NAME="grafana" \
     PATH="/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/grafana/bin:$PATH"
 
diff --git a/bitnami/grafana/10/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/grafana/10/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index b6583a4b9b50..e235fb87f28c 100644
--- a/bitnami/grafana/10/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/grafana/10/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "10.3.3-2"
+        "version": "10.4.0-0"
     },
     "ini-file": {
         "arch": "amd64",
diff --git a/bitnami/grafana/10/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/grafana/10/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
index 3853c789b2ea..aa782fc6a4db 100644
--- a/bitnami/grafana/10/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
+++ b/bitnami/grafana/10/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
@@ -48,6 +48,7 @@ print_image_welcome_page() {
     info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}"
     info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}"
     info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}"
+    info "Upgrade to Tanzu Application Catalog for production environments to access custom-configured and pre-packaged software components. Gain enhanced features, including Software Bill of Materials (SBOM), CVE scan result reports, and VEX documents. To learn more, visit ${BOLD}https://bitnami.com/enterprise${RESET}"
     info ""
 }
 
diff --git a/bitnami/grafana/10/debian-12/tags-info.yaml b/bitnami/grafana/10/debian-12/tags-info.yaml
index 5437894cbe1c..c350a095a01b 100644
--- a/bitnami/grafana/10/debian-12/tags-info.yaml
+++ b/bitnami/grafana/10/debian-12/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "10"
 - 10-debian-12
-- 10.3.3
+- 10.4.0
 - latest
diff --git a/bitnami/grafana/README.md b/bitnami/grafana/README.md
index 179ba63902de..ef89a11d40e0 100644
--- a/bitnami/grafana/README.md
+++ b/bitnami/grafana/README.md
@@ -108,7 +108,9 @@ We can launch another containers using the same flag (`--network NETWORK`) in th
 | `GF_PATHS_LOGS`               | Grafana directory for log files.                                                     | `${GRAFANA_BASE_DIR}/logs`              |
 | `GF_PATHS_PLUGINS`            | Grafana directory for plugins.                                                       | `${GF_PATHS_DATA}/plugins`              |
 | `GF_PATHS_PROVISIONING`       | Grafana directory for provisioning configurations.                                   | `${GRAFANA_BASE_DIR}/conf/provisioning` |
+| `GF_INSTALL_PLUGINS`          | Grafana plugins to install                                                           | `nil`                                   |
 | `GF_INSTALL_PLUGINS_SKIP_TLS` | Whether to skip TLS certificate verification when installing plugins                 | `yes`                                   |
+| `GF_FEATURE_TOGGLES`          | Comma-separated list of Grafana feature toggles.                                     | `nil`                                   |
 | `GRAFANA_MIGRATION_LOCK`      | Enable the migration lock mechanism to avoid issues caused by concurrent migrations. | `false`                                 |
 | `GRAFANA_SLEEP_TIME`          | Sleep time between migration status check attempts.                                  | `10`                                    |
 | `GRAFANA_RETRY_ATTEMPTS`      | Number of retries to check migration status.                                         | `12`                                    |