diff --git a/charts/coredns/templates/pod-test.yaml b/charts/coredns/templates/pod-test.yaml
index 6d7b5235..10dbbe13 100644
--- a/charts/coredns/templates/pod-test.yaml
+++ b/charts/coredns/templates/pod-test.yaml
@@ -24,6 +24,7 @@ metadata:
   annotations:
     "helm.sh/hook": test-success
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
+{{ dict "envAll" $envAll "podName" "coredns" "containerNames" (list "coredns-test") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
   labels:
 {{ tuple $envAll "coredns" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
@@ -31,7 +32,7 @@ spec:
   nodeSelector:
     {{ .Values.labels.coredns.node_selector_key }}: {{ .Values.labels.coredns.node_selector_value }}
   containers:
-    - name: {{ .Release.Name }}-test
+    - name: coredns-test
       image: {{ .Values.images.tags.test }}
       imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple . .Values.pod.resources.pod_test | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
diff --git a/charts/coredns/values.yaml b/charts/coredns/values.yaml
index 9de819bd..06c49d79 100644
--- a/charts/coredns/values.yaml
+++ b/charts/coredns/values.yaml
@@ -43,6 +43,7 @@ pod:
     coredns:
       coredns: runtime/default
       coredns-health: runtime/default
+      coredns-test: runtime/default
   security_context:
     coredns:
       pod:
diff --git a/charts/etcd/templates/tests/test-etcd-health.yaml b/charts/etcd/templates/tests/test-etcd-health.yaml
index 36915f5e..f65f6be8 100644
--- a/charts/etcd/templates/tests/test-etcd-health.yaml
+++ b/charts/etcd/templates/tests/test-etcd-health.yaml
@@ -27,6 +27,7 @@ metadata:
     "helm.sh/hook": "test-success"
     scheduler.alpha.kubernetes.io/critical-pod: ''
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
+{{ dict "envAll" $envAll "podName" "kubernetes-etcd" "containerNames" (list "kubernetes-etcd-etcd-test") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
   labels:
 {{ tuple $envAll $applicationName "etcd-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
@@ -56,7 +57,7 @@ spec:
       operator: Exists
       effect: NoSchedule
   containers:
-    - name: "{{ .Release.Name }}-etcd-test"
+    - name: kubernetes-etcd-etcd-test
       env:
         - name: ETCDCTL_API
           value: "{{ .Values.etcd.etcdctl_api }}"
diff --git a/charts/etcd/values.yaml b/charts/etcd/values.yaml
index b6e901a6..1cb11fa2 100644
--- a/charts/etcd/values.yaml
+++ b/charts/etcd/values.yaml
@@ -190,6 +190,8 @@ pod:
       etcd: localhost/docker-default
     etcd-anchor:
       etcdctl: runtime/default
+    kubernetes-etcd:
+      kubernetes-etcd-etcd-test: runtime/default
   env:
     etcd:
       # can be used for tuning, e.g. https://etcd.io/docs/v3.4.0/tuning/
diff --git a/charts/haproxy/templates/tests/test-haproxy-health.yaml b/charts/haproxy/templates/tests/test-haproxy-health.yaml
index 6e3e26c2..43d8b88d 100644
--- a/charts/haproxy/templates/tests/test-haproxy-health.yaml
+++ b/charts/haproxy/templates/tests/test-haproxy-health.yaml
@@ -25,6 +25,7 @@ metadata:
   annotations:
     "helm.sh/hook": "test-success"
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
+{{ dict "envAll" $envAll "podName" "kubernetes" "containerNames" (list "haproxy-haproxy-test") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
   labels:
 {{ tuple $envAll "kubernetes" "haproxy-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
@@ -32,7 +33,7 @@ spec:
   nodeSelector:
     {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }}
   containers:
-    - name: "{{ .Release.Name }}-haproxy-test"
+    - name: haproxy-haproxy-test
       env:
         - name: HOST_IP
           valueFrom:
diff --git a/charts/haproxy/values.yaml b/charts/haproxy/values.yaml
index 6c6d4383..6130435c 100644
--- a/charts/haproxy/values.yaml
+++ b/charts/haproxy/values.yaml
@@ -82,6 +82,8 @@ pod:
     haproxy-anchor:
       haproxy-perms: runtime/default
       anchor: runtime/default
+    kubernetes:
+      haproxy-haproxy-test: runtime/default
   security_context:
     haproxy_anchor:
       pod:
diff --git a/charts/promenade/templates/tests/test-promenade-api.yaml b/charts/promenade/templates/tests/test-promenade-api.yaml
index b13caf7c..40cb9dd2 100644
--- a/charts/promenade/templates/tests/test-promenade-api.yaml
+++ b/charts/promenade/templates/tests/test-promenade-api.yaml
@@ -26,6 +26,7 @@ metadata:
   annotations:
     "helm.sh/hook": "test-success"
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
+{{ dict "envAll" $envAll "podName" "promenade" "containerNames" (list "init" "promenade-api-test") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
   labels:
 {{ tuple $envAll "promenade" "api-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
@@ -35,7 +36,7 @@ spec:
   initContainers:
 {{ tuple $envAll "test" $mounts_promenade_api_test | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
   containers:
-    - name: "{{ .Release.Name }}-api-test"
+    - name: promenade-api-test
       env:
         - name: 'PROM_URL'
           value: {{ tuple "kubernetesprovisioner" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | quote }}
diff --git a/charts/promenade/values.yaml b/charts/promenade/values.yaml
index b6eb6e34..d06096ad 100644
--- a/charts/promenade/values.yaml
+++ b/charts/promenade/values.yaml
@@ -187,6 +187,9 @@ pod:
     promenade-api:
       promenade-util: runtime/default
       promenade-api: runtime/default
+    promenade:
+      init: runtime/default
+      promenade-api-test: runtime/default
   affinity:
     anti:
       type: