diff --git a/grafana/templates/deployment.yaml b/grafana/templates/deployment.yaml
index 9ee3fb0e0d..e5e604b7d1 100644
--- a/grafana/templates/deployment.yaml
+++ b/grafana/templates/deployment.yaml
@@ -41,9 +41,9 @@ spec:
       labels:
 {{ tuple $envAll "grafana" "dashboard" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
       annotations:
-{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+{{ dict "envAll" $envAll "podName" "grafana" "containerNames" (list "grafana") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
 {{ dict "envAll" $envAll "application" "dashboard" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $serviceAccountName }}
diff --git a/grafana/templates/job-db-init-session.yaml b/grafana/templates/job-db-init-session.yaml
index e22be23878..68064da19b 100644
--- a/grafana/templates/job-db-init-session.yaml
+++ b/grafana/templates/job-db-init-session.yaml
@@ -31,6 +31,10 @@ spec:
     metadata:
       labels:
 {{ tuple $envAll "grafana" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
+      annotations:
+        configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
+        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+{{ dict "envAll" $envAll "podName" "grafana-db-init-session" "containerNames" (list "grafana-db-init-session") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
 {{ dict "envAll" $envAll "application" "db_init" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $serviceAccountName }}
diff --git a/grafana/values_overrides/apparmor.yaml b/grafana/values_overrides/apparmor.yaml
new file mode 100644
index 0000000000..f73531d9fd
--- /dev/null
+++ b/grafana/values_overrides/apparmor.yaml
@@ -0,0 +1,7 @@
+pod:
+  mandatory_access_control:
+    type: apparmor
+    grafana:
+      grafana: runtime/default
+    grafana-db-init-session:
+      grafana-db-init-session: runtime/default
diff --git a/tools/deployment/apparmor/080-prometheus-process-exporter.sh b/tools/deployment/apparmor/075-prometheus-process-exporter.sh
similarity index 100%
rename from tools/deployment/apparmor/080-prometheus-process-exporter.sh
rename to tools/deployment/apparmor/075-prometheus-process-exporter.sh
diff --git a/tools/deployment/apparmor/080-grafana.sh b/tools/deployment/apparmor/080-grafana.sh
new file mode 120000
index 0000000000..60dc21427e
--- /dev/null
+++ b/tools/deployment/apparmor/080-grafana.sh
@@ -0,0 +1 @@
+../osh-infra-monitoring/110-grafana.sh
\ No newline at end of file
diff --git a/tools/deployment/osh-infra-monitoring/110-grafana.sh b/tools/deployment/osh-infra-monitoring/110-grafana.sh
index 4b6a98ba9d..9036ffb5bc 100755
--- a/tools/deployment/osh-infra-monitoring/110-grafana.sh
+++ b/tools/deployment/osh-infra-monitoring/110-grafana.sh
@@ -19,7 +19,7 @@ set -xe
 #NOTE: Lint and package chart
 make grafana
 
-FEATURE_GATES="calico,ceph,containers,coredns,elasticsearch,kubernetes,nginx,nodes,openstack,prometheus"
+FEATURE_GATES="calico,ceph,containers,coredns,elasticsearch,kubernetes,nginx,nodes,openstack,prometheus,apparmor"
 : ${OSH_INFRA_EXTRA_HELM_ARGS_GRAFANA:="$({ ./tools/deployment/common/get-values-overrides.sh grafana;} 2> /dev/null)"}
 
 #NOTE: Deploy command
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 998fd186ac..781a653928 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -280,7 +280,8 @@
         - ./tools/deployment/apparmor/055-prometheus.sh
         - ./tools/deployment/apparmor/060-prometheus-node-exporter.sh
         - ./tools/deployment/apparmor/070-prometheus-openstack-exporter.sh
-        - ./tools/deployment/apparmor/080-prometheus-process-exporter.sh
+        - ./tools/deployment/apparmor/075-prometheus-process-exporter.sh
+        - ./tools/deployment/apparmor/080-grafana.sh
         - ./tools/deployment/apparmor/085-rabbitmq.sh
         - ./tools/deployment/apparmor/090-elasticsearch.sh
         - ./tools/deployment/apparmor/100-fluentbit.sh