diff --git a/bitnami/grafana/11/debian-12/Dockerfile b/bitnami/grafana/11/debian-12/Dockerfile
index a6527cddda5e..4465eccc0f27 100644
--- a/bitnami/grafana/11/debian-12/Dockerfile
+++ b/bitnami/grafana/11/debian-12/Dockerfile
@@ -8,10 +8,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-04-15T01:22:19Z" \
+      org.opencontainers.image.created="2025-04-16T16:56:27Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/grafana/README.md" \
-      org.opencontainers.image.ref.name="11.6.0-debian-12-r4" \
+      org.opencontainers.image.ref.name="11.6.0-debian-12-r5" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/grafana" \
       org.opencontainers.image.title="grafana" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
diff --git a/bitnami/grafana/11/debian-12/rootfs/opt/bitnami/scripts/grafana/postunpack.sh b/bitnami/grafana/11/debian-12/rootfs/opt/bitnami/scripts/grafana/postunpack.sh
index eae0c1e6590f..2db6346a5a84 100755
--- a/bitnami/grafana/11/debian-12/rootfs/opt/bitnami/scripts/grafana/postunpack.sh
+++ b/bitnami/grafana/11/debian-12/rootfs/opt/bitnami/scripts/grafana/postunpack.sh
@@ -43,24 +43,33 @@ done
 # Install well-known plugins
 grafana_plugin_list=(
     "grafana-clock-panel"
-    "grafana-piechart-panel"
-    "michaeldmoore-annunciator-panel"
     "briangann-gauge-panel"
-    "briangann-datatable-panel"
     "jdbranham-diagram-panel"
-    "natel-discrete-panel"
-    "digiapulssi-organisations-panel"
     "vonage-status-panel"
-    "neocat-cal-heatmap-panel"
-    "agenty-flowcharting-panel"
     "larona-epict-panel"
     "pierosavi-imageit-panel"
-    "michaeldmoore-multistat-panel"
     "grafana-polystat-panel"
     "scadavis-synoptic-panel"
+)
+
+# Plugins deprecated in version 11 but still valid in version 10
+grafana_10_plugin_list=(
+    "grafana-piechart-panel"
+    "michaeldmoore-annunciator-panel"
+    "briangann-datatable-panel"
+    "natel-discrete-panel"
+    "digiapulssi-organisations-panel"
+    "neocat-cal-heatmap-panel"
+    "agenty-flowcharting-panel"
+    "michaeldmoore-multistat-panel"
     "marcuscalidus-svg-panel"
     "snuids-trafficlights-panel"
 )
+
+if [[ "$(get_grafana_major_version)" -le 10 ]]; then
+    grafana_plugin_list+=( "${grafana_10_plugin_list[@]}" )
+fi
+
 cd ${GRAFANA_BASE_DIR} || exit 1
 for plugin in "${grafana_plugin_list[@]}"; do
     info "Installing ${plugin} plugin"
diff --git a/bitnami/grafana/11/debian-12/rootfs/opt/bitnami/scripts/libgrafana.sh b/bitnami/grafana/11/debian-12/rootfs/opt/bitnami/scripts/libgrafana.sh
index 4ca82f5988be..9be3c00fdfe8 100644
--- a/bitnami/grafana/11/debian-12/rootfs/opt/bitnami/scripts/libgrafana.sh
+++ b/bitnami/grafana/11/debian-12/rootfs/opt/bitnami/scripts/libgrafana.sh
@@ -10,6 +10,7 @@
 . /opt/bitnami/scripts/liblog.sh
 . /opt/bitnami/scripts/libos.sh
 . /opt/bitnami/scripts/libvalidations.sh
+. /opt/bitnami/scripts/libversion.sh
 
 # Load database library
 if [[ -f /opt/bitnami/scripts/libmysqlclient.sh ]]; then
@@ -385,3 +386,19 @@ grafana_stop() {
     info "Stopping Grafana"
     stop_service_using_pid "$GRAFANA_PID_FILE"
 }
+
+########################
+# Returns grafana major version
+# Globals:
+#   GRAFANA_BIN_DIR
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+get_grafana_major_version() {
+    grafana_version="$("${GRAFANA_BIN_DIR}/grafana" -v)"
+    grafana_version="${grafana_version#"grafana version "}"
+    major_version="$(get_sematic_version "$grafana_version" 1)"
+    echo "${major_version:-0}"
+}