diff --git a/.vib/grafana/goss/grafana.yaml b/.vib/grafana/goss/grafana.yaml
index 96ea8f7c4702..62795d16bbe2 100644
--- a/.vib/grafana/goss/grafana.yaml
+++ b/.vib/grafana/goss/grafana.yaml
@@ -4,7 +4,7 @@
 command:
   check-grafana-plugins:
     exit-status: 0
-    exec: grafana-cli --pluginsDir /opt/bitnami/grafana/default-plugins/ plugins ls
+    exec: grafana cli --pluginsDir /opt/bitnami/grafana/default-plugins/ plugins ls
     stdout:
     {{ range $plugin := .Vars.plugins }}
       - "{{ $plugin }}"
diff --git a/.vib/grafana/goss/vars.yaml b/.vib/grafana/goss/vars.yaml
index 74a49ed84fcb..c2c33d3261be 100644
--- a/.vib/grafana/goss/vars.yaml
+++ b/.vib/grafana/goss/vars.yaml
@@ -1,6 +1,5 @@
 binaries:
   - grafana
-  - grafana-cli
 root_dir: /opt/bitnami
 version:
   bin_name: grafana
diff --git a/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/postunpack.sh b/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/postunpack.sh
index 781a839b66e0..c79ad4aafa5e 100755
--- a/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/postunpack.sh
+++ b/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/postunpack.sh
@@ -63,7 +63,7 @@ grafana_plugin_list=(
 )
 for plugin in "${grafana_plugin_list[@]}"; do
     info "Installing ${plugin} plugin"
-    grafana-cli --pluginsDir "$(grafana_env_var_value PATHS_PLUGINS)" plugins install "$plugin"
+    grafana cli --pluginsDir "$(grafana_env_var_value PATHS_PLUGINS)" plugins install "$plugin"
 done
 
 # The Grafana Helm chart mounts the data directory at "/opt/bitnami/grafana/data"
diff --git a/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/run.sh b/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/run.sh
index d36a33bd658a..683b9bac24cd 100755
--- a/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/run.sh
+++ b/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/grafana/run.sh
@@ -16,8 +16,9 @@ set -o pipefail
 . /opt/bitnami/scripts/libos.sh
 . /opt/bitnami/scripts/liblog.sh
 
-declare cmd="grafana-server"
+declare cmd="grafana"
 declare -a args=(
+    "server"
     # Based on https://github.com/grafana/grafana/blob/v8.2.5/packaging/docker/run.sh
     "--homepath=${GF_PATHS_HOME}"
     "--config=${GF_PATHS_CONFIG}"
diff --git a/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/libgrafana.sh b/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/libgrafana.sh
index 8fbbb3e70649..b66e471e5f60 100644
--- a/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/libgrafana.sh
+++ b/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/libgrafana.sh
@@ -223,8 +223,9 @@ EOF
 #   None
 #########################
 grafana_start_bg() {
-    local cmd="grafana-server"
+    local cmd="grafana"
     local -a args=(
+        "server"
         # Based on https://github.com/grafana/grafana/blob/v8.2.5/packaging/docker/run.sh
         "--homepath=${GF_PATHS_HOME}"
         "--config=${GF_PATHS_CONFIG}"
@@ -339,7 +340,7 @@ grafana_install_plugins() {
         if [[ -n "$plugin_version" ]]; then
             grafana_plugin_install_args+=("$plugin_version")
         fi
-        grafana-cli "${grafana_plugin_install_args[@]}"
+        grafana cli "${grafana_plugin_install_args[@]}"
     done
 }