diff --git a/grafana/Chart.yaml b/grafana/Chart.yaml
index f20017057..b700ba947 100644
--- a/grafana/Chart.yaml
+++ b/grafana/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v8.5.10
 description: OpenStack-Helm Grafana
 name: grafana
-version: 0.1.16
+version: 0.1.17
 home: https://grafana.com/
 sources:
   - https://github.com/grafana/grafana
diff --git a/grafana/templates/bin/_set-admin-password.sh.tpl b/grafana/templates/bin/_set-admin-password.sh.tpl
index a7f7c02e8..0feecfd8f 100644
--- a/grafana/templates/bin/_set-admin-password.sh.tpl
+++ b/grafana/templates/bin/_set-admin-password.sh.tpl
@@ -14,7 +14,7 @@ limitations under the License.
 */}}
 
 echo "Attempting to update Grafana admin user password"
-grafana-cli admin reset-admin-password --homepath "/usr/share/grafana" --config /etc/grafana/grafana.ini ${GF_SECURITY_ADMIN_PASSWORD}
+grafana-cli --homepath "/usr/share/grafana" --config /etc/grafana/grafana.ini admin reset-admin-password ${GF_SECURITY_ADMIN_PASSWORD}
 
 if [ "$?" == 1 ]; then
   echo "The Grafana admin user does not exist yet, so no need to update password"
diff --git a/grafana/values.yaml b/grafana/values.yaml
index 7bf5bfd21..0c99ac67a 100644
--- a/grafana/values.yaml
+++ b/grafana/values.yaml
@@ -49,14 +49,16 @@ pod:
   security_context:
     dashboard:
       pod:
-        runAsUser: 104
+        # The correct grafana uid = 472
+        runAsUser: 472
       container:
         grafana:
           allowPrivilegeEscalation: false
           readOnlyRootFilesystem: true
     db_init:
       pod:
-        runAsUser: 104
+        # The correct grafana uid = 472
+        runAsUser: 472
       container:
         grafana_db_init_session:
           allowPrivilegeEscalation: false
@@ -66,28 +68,32 @@ pod:
           readOnlyRootFilesystem: true
     db_session_sync:
       pod:
-        runAsUser: 104
+        # The correct grafana uid = 472
+        runAsUser: 472
       container:
         grafana_db_session_sync:
           allowPrivilegeEscalation: false
           readOnlyRootFilesystem: true
     set_admin_user:
       pod:
-        runAsUser: 104
+        # The correct grafana uid = 472
+        runAsUser: 472
       container:
         grafana_set_admin_password:
           allowPrivilegeEscalation: false
           readOnlyRootFilesystem: true
     run_migrator:
       pod:
-        runAsUser: 104
+        # The correct grafana uid = 472
+        runAsUser: 472
       container:
         grafana_set_admin_password:
           allowPrivilegeEscalation: false
           readOnlyRootFilesystem: true
     test:
       pod:
-        runAsUser: 104
+        # The correct grafana uid = 472
+        runAsUser: 472
       container:
         helm_tests:
           allowPrivilegeEscalation: false
diff --git a/releasenotes/notes/grafana.yaml b/releasenotes/notes/grafana.yaml
index 6899580c2..f70621410 100644
--- a/releasenotes/notes/grafana.yaml
+++ b/releasenotes/notes/grafana.yaml
@@ -17,4 +17,5 @@ grafana:
   - 0.1.14 Add run migrator job
   - 0.1.15 Added OCI registry authentication
   - 0.1.16 Grafana 8.5.10 with unified alerting
+  - 0.1.17 Fix uid for the user grafana
 ...