diff --git a/ceph-client/templates/pod-helm-tests.yaml b/ceph-client/templates/pod-helm-tests.yaml
index 85c2c17f5..ffad06fd3 100644
--- a/ceph-client/templates/pod-helm-tests.yaml
+++ b/ceph-client/templates/pod-helm-tests.yaml
@@ -25,6 +25,7 @@ metadata:
 {{ tuple $envAll "ceph-client" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     "helm.sh/hook": test-success
+{{ dict "envAll" $envAll "podName" "ceph-client-test" "containerNames" (list "init" "ceph-cluster-helm-test") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
 spec:
 {{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }}
   restartPolicy: Never
diff --git a/ceph-client/values_overrides/apparmor.yaml b/ceph-client/values_overrides/apparmor.yaml
index a249dbc44..6ed18adbb 100644
--- a/ceph-client/values_overrides/apparmor.yaml
+++ b/ceph-client/values_overrides/apparmor.yaml
@@ -16,6 +16,9 @@ pod:
     ceph-client-bootstrap:
       ceph-client-bootstrap: runtime/default
       init: runtime/default
+    ceph-client-test:
+      init: runtime/default
+      ceph-cluster-helm-test: runtime/default
 bootstrap:
   enabled: true
 manifests:
diff --git a/ceph-osd/templates/pod-helm-tests.yaml b/ceph-osd/templates/pod-helm-tests.yaml
index 7a4fe038a..9ee685bcb 100644
--- a/ceph-osd/templates/pod-helm-tests.yaml
+++ b/ceph-osd/templates/pod-helm-tests.yaml
@@ -26,6 +26,7 @@ metadata:
 {{ tuple $envAll "ceph-osd" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     "helm.sh/hook": test-success
+{{ dict "envAll" $envAll "podName" "ceph-osd-test" "containerNames" (list "init" "ceph-cluster-helm-test") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
 spec:
 {{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }}
   restartPolicy: Never
diff --git a/ceph-osd/values_overrides/apparmor.yaml b/ceph-osd/values_overrides/apparmor.yaml
index fe69ae85c..62b2de491 100644
--- a/ceph-osd/values_overrides/apparmor.yaml
+++ b/ceph-osd/values_overrides/apparmor.yaml
@@ -7,3 +7,6 @@ pod:
       ceph-log-ownership: runtime/default
       osd-init: runtime/default
       init: runtime/default
+    ceph-osd-test:
+      init: runtime/default
+      ceph-cluster-helm-test: runtime/default
\ No newline at end of file
diff --git a/ceph-provisioners/templates/pod-helm-tests.yaml b/ceph-provisioners/templates/pod-helm-tests.yaml
index 0d84ff757..72e85ffff 100644
--- a/ceph-provisioners/templates/pod-helm-tests.yaml
+++ b/ceph-provisioners/templates/pod-helm-tests.yaml
@@ -67,6 +67,7 @@ metadata:
 {{ tuple $envAll "ceph" "provisioner-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     "helm.sh/hook": test-success
+{{ dict "envAll" $envAll "podName" "ceph-provisioner-test" "containerNames" (list "init" "ceph-provisioner-helm-test") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
 spec:
 {{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }}
   restartPolicy: Never
diff --git a/ceph-provisioners/values_overrides/apparmor.yaml b/ceph-provisioners/values_overrides/apparmor.yaml
index 055724ebb..9eb74b901 100644
--- a/ceph-provisioners/values_overrides/apparmor.yaml
+++ b/ceph-provisioners/values_overrides/apparmor.yaml
@@ -9,3 +9,6 @@ pod:
     ceph-rbd-provisioner:
       ceph-rbd-provisioner: runtime/default
       init: runtime/default
+    ceph-provisioner-test:
+      init: runtime/default
+      ceph-provisioner-helm-test: runtime/default
\ No newline at end of file
diff --git a/elasticsearch/templates/pod-helm-tests.yaml b/elasticsearch/templates/pod-helm-tests.yaml
index 09588db56..d2e8e62f5 100644
--- a/elasticsearch/templates/pod-helm-tests.yaml
+++ b/elasticsearch/templates/pod-helm-tests.yaml
@@ -28,6 +28,7 @@ metadata:
   annotations:
     "helm.sh/hook": test-success
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
+{{ dict "envAll" $envAll "podName" "elasticsearch-test" "containerNames" (list "init" "elasticsearch-helm-tests") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
 spec:
 {{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }}
   serviceAccountName: {{ $serviceAccountName }}
@@ -37,7 +38,7 @@ spec:
   initContainers:
 {{ tuple $envAll "tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
   containers:
-    - name: {{.Release.Name}}-helm-tests
+    - name: elasticsearch-helm-tests
 {{ tuple $envAll "helm_tests" | include "helm-toolkit.snippets.image" | indent 6 }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
 {{ dict "envAll" $envAll "application" "test" "container" "helm_tests" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 6 }}
diff --git a/elasticsearch/values_overrides/apparmor.yaml b/elasticsearch/values_overrides/apparmor.yaml
index 668261d58..c3adbe280 100644
--- a/elasticsearch/values_overrides/apparmor.yaml
+++ b/elasticsearch/values_overrides/apparmor.yaml
@@ -20,3 +20,6 @@ pod:
     prometheus-elasticsearch-exporter:
       elasticsearch-exporter: runtime/default
       init: runtime/default
+    elasticsearch-test:
+      init: runtime/default
+      elasticsearch-helm-tests: runtime/default
diff --git a/grafana/templates/pod-helm-tests.yaml b/grafana/templates/pod-helm-tests.yaml
index 05b9f4a73..b5e0a9e4b 100644
--- a/grafana/templates/pod-helm-tests.yaml
+++ b/grafana/templates/pod-helm-tests.yaml
@@ -28,6 +28,7 @@ metadata:
   annotations:
     "helm.sh/hook": test-success
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
+{{ dict "envAll" $envAll "podName" "grafana-test" "containerNames" (list "init" "grafana-selenium-tests") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
 spec:
 {{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }}
   serviceAccountName: {{ $serviceAccountName }}
@@ -37,7 +38,7 @@ spec:
   initContainers:
 {{ tuple $envAll "tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
   containers:
-    - name: {{.Release.Name}}-selenium-tests
+    - name: grafana-selenium-tests
 {{ tuple $envAll "selenium_tests" | include "helm-toolkit.snippets.image" | indent 6 }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
 {{ dict "envAll" $envAll "application" "test" "container" "helm_tests" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 6 }}
diff --git a/grafana/values_overrides/apparmor.yaml b/grafana/values_overrides/apparmor.yaml
index 5de90355d..22633644f 100644
--- a/grafana/values_overrides/apparmor.yaml
+++ b/grafana/values_overrides/apparmor.yaml
@@ -18,4 +18,7 @@ pod:
       init: runtime/default
     grafana-set-admin-user:
       grafana-set-admin-password: runtime/default
-      init: runtime/default
\ No newline at end of file
+      init: runtime/default
+    grafana-test:
+      init: runtime/default
+      grafana-selenium-tests: runtime/default
\ No newline at end of file
diff --git a/nagios/templates/pod-helm-tests.yaml b/nagios/templates/pod-helm-tests.yaml
index a22b8d4f5..e22784d8c 100644
--- a/nagios/templates/pod-helm-tests.yaml
+++ b/nagios/templates/pod-helm-tests.yaml
@@ -29,6 +29,7 @@ metadata:
   annotations:
     "helm.sh/hook": test-success
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
+{{ dict "envAll" $envAll "podName" "nagios-test" "containerNames" (list "init" "nagios-helm-tests") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
 spec:
 {{ dict "envAll" $envAll "application" "monitoring" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }}
   serviceAccountName: {{ $serviceAccountName }}
@@ -38,7 +39,7 @@ spec:
   initContainers:
 {{ tuple $envAll "tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
   containers:
-    - name: {{.Release.Name}}-helm-tests
+    - name: nagios-helm-tests
 {{ tuple $envAll "selenium_tests" | include "helm-toolkit.snippets.image" | indent 6 }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
 {{ dict "envAll" $envAll "application" "monitoring" "container" "helm_tests" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 6 }}
diff --git a/nagios/values_overrides/apparmor.yaml b/nagios/values_overrides/apparmor.yaml
index 0a4f483f8..582be5bf2 100644
--- a/nagios/values_overrides/apparmor.yaml
+++ b/nagios/values_overrides/apparmor.yaml
@@ -6,3 +6,6 @@ pod:
       init: runtime/default
       define-nagios-hosts: runtime/default
       apache-proxy: runtime/default
+    nagios-test:
+      init: runtime/default
+      nagios-helm-tests: runtime/default
\ No newline at end of file
diff --git a/prometheus/templates/pod-helm-tests.yaml b/prometheus/templates/pod-helm-tests.yaml
index bc7401b7c..3dfbfb796 100644
--- a/prometheus/templates/pod-helm-tests.yaml
+++ b/prometheus/templates/pod-helm-tests.yaml
@@ -26,6 +26,7 @@ metadata:
 {{ tuple $envAll "prometheus" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
+{{ dict "envAll" $envAll "podName" "prometheus-test" "containerNames" (list "init" "prometheus-helm-tests") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
     "helm.sh/hook": test-success
 spec:
   serviceAccountName: {{ $serviceAccountName }}
@@ -35,7 +36,7 @@ spec:
   initContainers:
 {{ tuple $envAll "tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
   containers:
-    - name: {{.Release.Name}}-helm-tests
+    - name: prometheus-helm-tests
 {{ tuple $envAll "helm_tests" | include "helm-toolkit.snippets.image" | indent 6 }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       command:
diff --git a/prometheus/values_overrides/apparmor.yaml b/prometheus/values_overrides/apparmor.yaml
index b7a913872..cdf81e884 100644
--- a/prometheus/values_overrides/apparmor.yaml
+++ b/prometheus/values_overrides/apparmor.yaml
@@ -5,4 +5,7 @@ pod:
       prometheus: runtime/default
       prometheus-perms: runtime/default
       apache-proxy: runtime/default
+      init: runtime/default
+    prometheus-test:
+      prometheus-helm-tests: runtime/default
       init: runtime/default
\ No newline at end of file