diff --git a/charts/all/medical-diagnosis/grafana/templates/eso-grafana-sa-token.yaml b/charts/all/medical-diagnosis/grafana/templates/eso-grafana-sa-token.yaml
new file mode 100644
index 00000000..209b2384
--- /dev/null
+++ b/charts/all/medical-diagnosis/grafana/templates/eso-grafana-sa-token.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Values.rbac.serviceAccountName }}-token
+  namespace: xraylab-1
+  annotations:
+    kubernetes.io/service-account.name: {{ .Values.rbac.serviceAccountName }}
+    argocd.argoproj.io/sync-wave: "1"
+type: kubernetes.io/service-account-token
diff --git a/charts/all/medical-diagnosis/grafana/templates/job-create-prometheus-datasource.yaml b/charts/all/medical-diagnosis/grafana/templates/job-create-prometheus-datasource.yaml
index d660cbe4..07e7da02 100644
--- a/charts/all/medical-diagnosis/grafana/templates/job-create-prometheus-datasource.yaml
+++ b/charts/all/medical-diagnosis/grafana/templates/job-create-prometheus-datasource.yaml
@@ -2,7 +2,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: create-prometheus-datasource-object
-  namespace: {{ .Values.global.xraylab.namespace }}
+  namespace: xraylab-1
   annotations:
     argocd.argoproj.io/hook: PostSync
 spec:
@@ -14,9 +14,9 @@ spec:
         - /bin/bash
         - -c
         - |
-          #!/usr/bin/env bash
-          SECRET=$(oc get secret | grep xraylab-grafana-sa-token | head -n1 | awk '{print $1}')
-          TOKEN=$(oc extract secret/$SECRET --keys=token --to=-)
+          #TOKEN=$(oc create token {{ .Values.rbac.serviceAccountName }}-token --duration=$((365*24))h)
+          #SECRET=$(oc get secret | grep xraylab-grafana-sa-token | head -n1 | awk '{print $1}')
+          TOKEN=$(oc extract secret/{{ .Values.rbac.serviceAccountName }}-token --keys=token --to=-)
           cat <<EOF | oc create -f -
            apiVersion: grafana.integreatly.org/v1beta1
            kind: GrafanaDatasource
@@ -46,5 +46,5 @@ spec:
         name: get-grafana-token
       dnsPolicy: ClusterFirst
       restartPolicy: Never
-      serviceAccount: xraylab-grafana-sa
+      serviceAccount: {{ .Values.rbac.serviceAccountName }}
       terminationGracePeriodSeconds: 60
diff --git a/charts/all/medical-diagnosis/grafana/templates/job-wait-for-database.yaml b/charts/all/medical-diagnosis/grafana/templates/job-wait-for-database.yaml
index 35bb853f..f5e1bc24 100644
--- a/charts/all/medical-diagnosis/grafana/templates/job-wait-for-database.yaml
+++ b/charts/all/medical-diagnosis/grafana/templates/job-wait-for-database.yaml
@@ -18,6 +18,6 @@ spec:
         name: wait-for-xraylab-database
       dnsPolicy: ClusterFirst
       restartPolicy: Never
-      serviceAccount: {{ .Values.global.xraylab.namespace }}-sa
-      serviceAccountName: {{ .Values.global.xraylab.namespace }}-sa
+      serviceAccount: {{ .Values.rbac.serviceAccountName }}
+      serviceAccountName: {{ .Values.rbac.serviceAccountName }}
       terminationGracePeriodSeconds: 60
diff --git a/charts/all/medical-diagnosis/grafana/templates/rbac/rolebinding.yaml b/charts/all/medical-diagnosis/grafana/templates/rbac/rolebinding.yaml
index 6d12bd5a..d3506a4f 100644
--- a/charts/all/medical-diagnosis/grafana/templates/rbac/rolebinding.yaml
+++ b/charts/all/medical-diagnosis/grafana/templates/rbac/rolebinding.yaml
@@ -15,7 +15,7 @@ metadata:
     argocd.argoproj.io/sync-wave: "-15"
 subjects:
 - kind: {{ $value.subjects.kind | default "ServiceAccount" }}
-  name: {{ $value.subjects.name }}
+  name: {{ $.Values.rbac.serviceAccountName }}
   namespace: {{ $value.subjects.namespace | default $.Values.global.xraylab.namespace }}
   apiGroup: ""
 roleRef:
@@ -23,4 +23,4 @@ roleRef:
   name: {{ $value.roleRef.name }}
   apiGroup: rbac.authorization.k8s.io
 ---
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/all/medical-diagnosis/grafana/templates/rbac/serviceAccount.yaml b/charts/all/medical-diagnosis/grafana/templates/rbac/serviceAccount.yaml
new file mode 100644
index 00000000..2297cc3e
--- /dev/null
+++ b/charts/all/medical-diagnosis/grafana/templates/rbac/serviceAccount.yaml
@@ -0,0 +1,11 @@
+{{- if .Values.rbac.createServiceAccount }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Values.rbac.serviceAccountName }}
+  namespace: xraylab-1
+  annotations:
+    argocd.argoproj.io/hook: PreSync
+    argocd.argoproj.io/sync-hook: "-15"
+{{- end }}
+
diff --git a/charts/all/medical-diagnosis/grafana/values.yaml b/charts/all/medical-diagnosis/grafana/values.yaml
index e2c2de78..50a577bf 100644
--- a/charts/all/medical-diagnosis/grafana/values.yaml
+++ b/charts/all/medical-diagnosis/grafana/values.yaml
@@ -22,6 +22,8 @@ job:
   image: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest
 
 rbac:
+  createServiceAccount: true
+  serviceAccountName: "grafana-sa"
   roles:
     - name: grafana-mgmt
       apiGroups:
@@ -37,6 +39,19 @@ rbac:
         - "patch"
         - "create"
         - "update"
+    - name: grafana-serviceAccount-token
+      apiGroups:
+        - '""'
+      scope:
+        cluster: false
+        namespace: xraylab-1
+      resources:
+        - "serviceaccounts/tokens"
+      verbs:
+        - "get"
+        - "list"
+        - "create"
+        - "update"
     - name: grafana-read-secrets
       apiGroups:
         - '""'
@@ -49,6 +64,18 @@ rbac:
         - "get"
         - "list"
         - "watch"
+    - name: grafana-view-deployments
+      apiGroups: 
+        - apps
+      scope:
+        cluster: false
+        namespace: xraylab-1
+      resources:
+        - deployments
+      verbs:
+        - "get"
+        - "list"
+        - "watch"
     - name: grafana-view-deploymentconfigs
       apiGroups: 
         - apps.openshift.io
@@ -68,7 +95,7 @@ rbac:
         namespace: xraylab-1
       subjects:
         kind: ServiceAccount
-        name: xraylab-grafana-sa
+        name: grafana-sa
         namespace: xraylab-1
         apiGroup: ""
       roleRef:
@@ -80,7 +107,7 @@ rbac:
         namespace: xraylab-1
       subjects:
         kind: ServiceAccount
-        name: xraylab-grafana-sa
+        name: grafana-sa
         namespace: xraylab-1
         apiGroup: ""
       roleRef:
@@ -92,19 +119,43 @@ rbac:
         namespace: ""
       subjects:
         kind: ServiceAccount
-        name: xraylab-grafana-sa
+        name: grafana-sa
         namespace: xraylab-1
         apiGroup: ""
       roleRef:
         kind: ClusterRole
         name: cluster-monitoring-view
+    - name: grafana-view-deployments
+      scope:
+        cluster: false
+        namespace: xraylab-1
+      subjects:
+        kind: ServiceAccount
+        name: grafana-sa
+        namespace: xraylab-1
+        apiGroup: ""
+      roleRef:
+        kind: Role
+        name: grafana-view-deployments
+    - name: grafana-image-puller
+      scope:
+        cluster: false
+        namespace: xraylab-1
+      subjects:
+        kind: ServiceAccount
+        name: grafana-sa
+        namespace: xraylab-1
+        apiGroup: "image.openshift.io"
+      roleRef:
+        kind: ClusterRole
+        name: "system:image-puller"
     - name: grafana-view-deploymentconfigs
       scope:
         cluster: false
         namespace: xraylab-1
       subjects:
         kind: ServiceAccount
-        name: xraylab-1-sa
+        name: grafana-sa
         namespace: xraylab-1
         apiGroup: ""
       roleRef: