diff --git a/elasticsearch/templates/cron-job-curator.yaml b/elasticsearch/templates/cron-job-curator.yaml
index 515f93afa..77dc6caa1 100644
--- a/elasticsearch/templates/cron-job-curator.yaml
+++ b/elasticsearch/templates/cron-job-curator.yaml
@@ -42,9 +42,9 @@ spec:
           containers:
             - name: curator
 {{ tuple $envAll "curator" | include "helm-toolkit.snippets.image" | indent 14 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.curator | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }}
               command:
                 - /tmp/curator.sh
-{{ tuple $envAll $envAll.Values.pod.resources.jobs.curator | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }}
               env:
                 - name: ELASTICSEARCH_HOST
                   valueFrom:
diff --git a/elasticsearch/templates/deployment-client.yaml b/elasticsearch/templates/deployment-client.yaml
index 4cf607505..3ec074708 100644
--- a/elasticsearch/templates/deployment-client.yaml
+++ b/elasticsearch/templates/deployment-client.yaml
@@ -83,10 +83,11 @@ spec:
       initContainers:
 {{ tuple $envAll "elasticsearch_client" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container"  | indent 8 }}
         - name: memory-map-increase
+{{ tuple $envAll "memory_init" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.client | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             privileged: true
             runAsUser: 0
-{{ tuple $envAll "memory_init" | include "helm-toolkit.snippets.image" | indent 10 }}
           command:
           - sysctl
           - -w
@@ -94,9 +95,9 @@ spec:
 {{ if .Values.storage.filesystem_repository.enabled }}
         - name: elasticsearch-repository-perms
 {{ tuple $envAll "elasticsearch" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.client | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: 0
-{{ tuple $envAll $envAll.Values.pod.resources.client | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }}
           command:
             - chown
             - -R
@@ -157,14 +158,14 @@ spec:
               subPath: elasticsearch-host.conf
               readOnly: true
         - name: elasticsearch-client
+{{ tuple $envAll "elasticsearch" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.client | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             privileged: true
             capabilities:
               add:
                 - IPC_LOCK
                 - SYS_RESOURCE
-{{ tuple $envAll "elasticsearch" | include "helm-toolkit.snippets.image" | indent 10 }}
-{{ tuple $envAll $envAll.Values.pod.resources.client | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }}
           command:
             - /tmp/elasticsearch.sh
             - start
diff --git a/elasticsearch/templates/deployment-master.yaml b/elasticsearch/templates/deployment-master.yaml
index 9d08c3a2e..5c13ecf06 100644
--- a/elasticsearch/templates/deployment-master.yaml
+++ b/elasticsearch/templates/deployment-master.yaml
@@ -81,10 +81,11 @@ spec:
       initContainers:
 {{ tuple $envAll "elasticsearch_master" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container"  | indent 8 }}
         - name: memory-map-increase
+{{ tuple $envAll "memory_init" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.master | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             privileged: true
             runAsUser: 0
-{{ tuple $envAll "memory_init" | include "helm-toolkit.snippets.image" | indent 10 }}
           command:
           - sysctl
           - -w
@@ -92,9 +93,9 @@ spec:
 {{ if .Values.storage.filesystem_repository.enabled }}
         - name: elasticsearch-repository-perms
 {{ tuple $envAll "elasticsearch" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.master | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: 0
-{{ tuple $envAll $envAll.Values.pod.resources.client | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }}
           command:
             - chown
             - -R
diff --git a/elasticsearch/templates/monitoring/prometheus/exporter-deployment.yaml b/elasticsearch/templates/monitoring/prometheus/exporter-deployment.yaml
index 347729e66..c0468b40f 100644
--- a/elasticsearch/templates/monitoring/prometheus/exporter-deployment.yaml
+++ b/elasticsearch/templates/monitoring/prometheus/exporter-deployment.yaml
@@ -43,6 +43,7 @@ spec:
       containers:
         - name: elasticsearch-exporter
 {{ tuple $envAll "prometheus_elasticsearch_exporter" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/elasticsearch-exporter.sh
             - start
@@ -52,7 +53,6 @@ spec:
                 command:
                   - /tmp/elasticsearch-exporter.sh
                   - stop
-{{ tuple $envAll $envAll.Values.pod.resources.exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ELASTICSEARCH_URI
               valueFrom:
diff --git a/elasticsearch/templates/statefulset-data.yaml b/elasticsearch/templates/statefulset-data.yaml
index 901cda5d7..0030ca7a0 100644
--- a/elasticsearch/templates/statefulset-data.yaml
+++ b/elasticsearch/templates/statefulset-data.yaml
@@ -78,10 +78,11 @@ spec:
       initContainers:
 {{ tuple $envAll "elasticsearch_data" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container"  | indent 8 }}
         - name: memory-map-increase
+{{ tuple $envAll "memory_init" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.data | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             privileged: true
             runAsUser: 0
-{{ tuple $envAll "memory_init" | include "helm-toolkit.snippets.image" | indent 10 }}
           command:
             - sysctl
             - -w
@@ -89,9 +90,9 @@ spec:
 {{ if .Values.storage.filesystem_repository.enabled }}
         - name: elasticsearch-repository-perms
 {{ tuple $envAll "elasticsearch" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.data | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: 0
-{{ tuple $envAll $envAll.Values.pod.resources.client | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }}
           command:
             - chown
             - -R
@@ -103,14 +104,14 @@ spec:
 {{ end }}
       containers:
         - name: elasticsearch-data
+{{ tuple $envAll "elasticsearch" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.data | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             privileged: true
             capabilities:
               add:
                 - IPC_LOCK
                 - SYS_RESOURCE
-{{ tuple $envAll "elasticsearch" | include "helm-toolkit.snippets.image" | indent 10 }}
-{{ tuple $envAll $envAll.Values.pod.resources.data | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }}
           command:
             - /tmp/elasticsearch.sh
             - start
diff --git a/flannel/templates/daemonset-kube-flannel-ds.yaml b/flannel/templates/daemonset-kube-flannel-ds.yaml
index 8de4ea0b5..2fb51bfc2 100644
--- a/flannel/templates/daemonset-kube-flannel-ds.yaml
+++ b/flannel/templates/daemonset-kube-flannel-ds.yaml
@@ -87,9 +87,9 @@ spec:
       containers:
         - name: kube-flannel
 {{ tuple $envAll "flannel" | include "helm-toolkit.snippets.image" | indent 10 }}
-          command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
           securityContext:
             privileged: true
+          command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr" ]
           env:
             - name: POD_NAME
               valueFrom:
diff --git a/fluent-logging/templates/daemonset-fluent-bit.yaml b/fluent-logging/templates/daemonset-fluent-bit.yaml
index 439044de6..c090be92a 100644
--- a/fluent-logging/templates/daemonset-fluent-bit.yaml
+++ b/fluent-logging/templates/daemonset-fluent-bit.yaml
@@ -95,8 +95,7 @@ spec:
 {{ tuple $envAll "fluentbit" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: fluentbit
-          image: {{ .Values.images.tags.fluentbit }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
+{{ tuple $envAll "fluentbit" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.fluentbit | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/fluent-bit.sh
@@ -123,7 +122,7 @@ spec:
               mountPath: /fluent-bit/etc/parsers.conf
               subPath: parsers.conf
               readOnly: true
-{{ if $mounts_fluentbit.volumeMounts }}{{ toYaml $mounts_fluentbit.volumeMounts | indent 8 }}{{ end }}
+{{ if $mounts_fluentbit.volumeMounts }}{{ toYaml $mounts_fluentbit.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: varlog
           hostPath:
diff --git a/fluent-logging/templates/deployment-fluentd.yaml b/fluent-logging/templates/deployment-fluentd.yaml
index c0b705908..1ebd13bde 100644
--- a/fluent-logging/templates/deployment-fluentd.yaml
+++ b/fluent-logging/templates/deployment-fluentd.yaml
@@ -97,8 +97,7 @@ spec:
 {{ tuple $envAll "fluentd" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: fluentd
-          image: {{ .Values.images.tags.fluentd }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
+{{ tuple $envAll "fluentd" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.fluentd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/fluentd.sh
diff --git a/fluent-logging/templates/job-elasticsearch-template.yaml b/fluent-logging/templates/job-elasticsearch-template.yaml
index 1dbf86a7e..0f9d58b98 100644
--- a/fluent-logging/templates/job-elasticsearch-template.yaml
+++ b/fluent-logging/templates/job-elasticsearch-template.yaml
@@ -41,8 +41,7 @@ spec:
 {{ tuple $envAll "elasticsearch_template" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: elasticsearch-template
-          image: {{ .Values.images.tags.elasticsearch_template }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
+{{ tuple $envAll "elasticsearch_template" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.elasticsearch_template | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ELASTICSEARCH_HOST
@@ -70,7 +69,7 @@ spec:
               mountPath: /tmp/template.xml.raw
               subPath: template.xml.raw
               readOnly: true
-{{ if $mounts_elasticsearch_template.volumeMounts }}{{ toYaml $mounts_elasticsearch_template.volumeMounts | indent 10 }}{{ end }}
+{{ if $mounts_elasticsearch_template.volumeMounts }}{{ toYaml $mounts_elasticsearch_template.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: fluent-logging-bin
           configMap:
@@ -80,5 +79,5 @@ spec:
           configMap:
             name: fluent-logging-etc
             defaultMode: 0666
-{{ if $mounts_elasticsearch_template.volumes }}{{ toYaml $mounts_elasticsearch_template.volumes | indent 6 }}{{ end }}
+{{ if $mounts_elasticsearch_template.volumes }}{{ toYaml $mounts_elasticsearch_template.volumes | indent 8 }}{{ end }}
 {{- end }}
diff --git a/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml b/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml
index a4a85a3f2..f77367d34 100644
--- a/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml
+++ b/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml
@@ -44,8 +44,7 @@ spec:
 {{ tuple $envAll "prometheus_fluentd_exporter" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container"  | indent 8 }}
       containers:
         - name: fluentd-exporter
-          image: {{ .Values.images.tags.prometheus_fluentd_exporter }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
+{{ tuple $envAll "prometheus_fluentd_exporter" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.prometheus_fluentd_exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/fluentd-exporter.sh
diff --git a/fluent-logging/templates/pod-helm-tests.yaml b/fluent-logging/templates/pod-helm-tests.yaml
index 75bf8762f..077ee2868 100644
--- a/fluent-logging/templates/pod-helm-tests.yaml
+++ b/fluent-logging/templates/pod-helm-tests.yaml
@@ -29,6 +29,7 @@ spec:
   containers:
     - name: {{.Release.Name}}-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:
       - /tmp/helm-tests.sh
       env:
diff --git a/grafana/templates/deployment.yaml b/grafana/templates/deployment.yaml
index 73cd04923..8d0594061 100644
--- a/grafana/templates/deployment.yaml
+++ b/grafana/templates/deployment.yaml
@@ -72,34 +72,34 @@ spec:
             - name: PROMETHEUS_URL
               value: {{ tuple "monitoring" "internal" "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
           volumeMounts:
-          - name: pod-etc-grafana
-            mountPath: /etc/grafana
-          - name: pod-provisioning-grafana
-            mountPath: /var/lib/grafana/provisioning
-          - name: grafana-bin
-            mountPath: /tmp/grafana.sh
-            subPath: grafana.sh
-            readOnly: true
-          - name: grafana-etc
-            mountPath: /var/lib/grafana/provisioning/dashboards/dashboards.yaml
-            subPath: dashboards.yaml
-          - name: grafana-etc
-            mountPath: /var/lib/grafana/provisioning/datasources/datasources.yaml
-            subPath: datasources.yaml
-          - name: grafana-etc
-            mountPath: /etc/grafana/grafana.ini
-            subPath: grafana.ini
-          - name: grafana-etc
-            mountPath: /etc/grafana/ldap.toml
-            subPath: ldap.toml
-          - name: data
-            mountPath: /var/lib/grafana/data
-          {{- range $key, $value := .Values.conf.dashboards }}
-          - name: grafana-etc
-            mountPath: /var/lib/grafana/dashboards/{{$key}}.json
-            subPath: {{$key}}.json
-          {{- end }}
-{{ if $mounts_grafana.volumeMounts }}{{ toYaml $mounts_grafana.volumeMounts | indent 10 }}{{ end }}
+            - name: pod-etc-grafana
+              mountPath: /etc/grafana
+            - name: pod-provisioning-grafana
+              mountPath: /var/lib/grafana/provisioning
+            - name: grafana-bin
+              mountPath: /tmp/grafana.sh
+              subPath: grafana.sh
+              readOnly: true
+            - name: grafana-etc
+              mountPath: /var/lib/grafana/provisioning/dashboards/dashboards.yaml
+              subPath: dashboards.yaml
+            - name: grafana-etc
+              mountPath: /var/lib/grafana/provisioning/datasources/datasources.yaml
+              subPath: datasources.yaml
+            - name: grafana-etc
+              mountPath: /etc/grafana/grafana.ini
+              subPath: grafana.ini
+            - name: grafana-etc
+              mountPath: /etc/grafana/ldap.toml
+              subPath: ldap.toml
+            - name: data
+              mountPath: /var/lib/grafana/data
+            {{- range $key, $value := .Values.conf.dashboards }}
+            - name: grafana-etc
+              mountPath: /var/lib/grafana/dashboards/{{$key}}.json
+              subPath: {{$key}}.json
+            {{- end }}
+{{ if $mounts_grafana.volumeMounts }}{{ toYaml $mounts_grafana.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: pod-etc-grafana
           emptyDir: {}
diff --git a/grafana/templates/job-db-init-session.yaml b/grafana/templates/job-db-init-session.yaml
index 3b11d2b03..b556fef78 100644
--- a/grafana/templates/job-db-init-session.yaml
+++ b/grafana/templates/job-db-init-session.yaml
@@ -54,13 +54,13 @@ spec:
           command:
             - /tmp/db-init.py
           volumeMounts:
-          - name: grafana-bin
-            mountPath: /tmp/db-init.py
-            subPath: db-init.py
-            readOnly: true
+            - name: grafana-bin
+              mountPath: /tmp/db-init.py
+              subPath: db-init.py
+              readOnly: true
       volumes:
-      - name: grafana-bin
-        configMap:
-          name: grafana-bin
-          defaultMode: 0555
+        - name: grafana-bin
+          configMap:
+            name: grafana-bin
+            defaultMode: 0555
 {{- end }}
diff --git a/grafana/templates/job-db-init.yaml b/grafana/templates/job-db-init.yaml
index d7cfaab34..ca6395ce3 100644
--- a/grafana/templates/job-db-init.yaml
+++ b/grafana/templates/job-db-init.yaml
@@ -54,13 +54,13 @@ spec:
           command:
             - /tmp/db-init.py
           volumeMounts:
-          - name: grafana-bin
-            mountPath: /tmp/db-init.py
-            subPath: db-init.py
-            readOnly: true
+            - name: grafana-bin
+              mountPath: /tmp/db-init.py
+              subPath: db-init.py
+              readOnly: true
       volumes:
-      - name: grafana-bin
-        configMap:
-          name: grafana-bin
-          defaultMode: 0555
+        - name: grafana-bin
+          configMap:
+            name: grafana-bin
+            defaultMode: 0555
 {{- end }}
diff --git a/grafana/templates/job-db-session-sync.yaml b/grafana/templates/job-db-session-sync.yaml
index 3538da559..0ca6baad8 100644
--- a/grafana/templates/job-db-session-sync.yaml
+++ b/grafana/templates/job-db-session-sync.yaml
@@ -49,13 +49,13 @@ spec:
           command:
             - /tmp/db-session-sync.py
           volumeMounts:
-          - name: grafana-bin
-            mountPath: /tmp/db-session-sync.py
-            subPath: db-session-sync.py
-            readOnly: true
+            - name: grafana-bin
+              mountPath: /tmp/db-session-sync.py
+              subPath: db-session-sync.py
+              readOnly: true
       volumes:
-      - name: grafana-bin
-        configMap:
-          name: grafana-bin
-          defaultMode: 0555
+        - name: grafana-bin
+          configMap:
+            name: grafana-bin
+            defaultMode: 0555
 {{- end }}
diff --git a/kubernetes-keystone-webhook/templates/deployment.yaml b/kubernetes-keystone-webhook/templates/deployment.yaml
index 5cd788359..906574a15 100644
--- a/kubernetes-keystone-webhook/templates/deployment.yaml
+++ b/kubernetes-keystone-webhook/templates/deployment.yaml
@@ -31,6 +31,7 @@ spec:
       containers:
         - name: kubernetes-keystone-webhook
 {{ tuple $envAll "kubernetes_keystone_webhook" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/start.sh
           readinessProbe:
@@ -41,7 +42,6 @@ spec:
           ports:
             - name: k8sksauth-pub
               containerPort: {{ tuple "kubernetes_keystone_webhook" "internal" "api" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           volumeMounts:
             - name: etc-kubernetes-keystone-webhook
               mountPath: /etc/kubernetes-keystone-webhook
diff --git a/kubernetes-keystone-webhook/templates/pod-test.yaml b/kubernetes-keystone-webhook/templates/pod-test.yaml
index 38bb149fa..4133cb8d4 100644
--- a/kubernetes-keystone-webhook/templates/pod-test.yaml
+++ b/kubernetes-keystone-webhook/templates/pod-test.yaml
@@ -38,7 +38,8 @@ spec:
 {{ tuple $envAll "tests" $mounts_kubernetes_keystone_webhook_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
   containers:
     - name: {{ $envAll.Release.Name }}-kubernetes-keystone-webhook-test
-      image: {{ $envAll.Values.images.tags.scripted_test }}
+{{ tuple $envAll "scripted_test" | include "helm-toolkit.snippets.image" | indent 6 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:
         - name: WEBHOOK_URL
           value: {{ tuple "kubernetes_keystone_webhook" "internal" "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | quote }}
diff --git a/prometheus-alertmanager/templates/statefulset.yaml b/prometheus-alertmanager/templates/statefulset.yaml
index 39d198a88..dfbf33f17 100644
--- a/prometheus-alertmanager/templates/statefulset.yaml
+++ b/prometheus-alertmanager/templates/statefulset.yaml
@@ -48,9 +48,9 @@ spec:
 {{ tuple $envAll "alertmanager" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: alertmanager-perms
 {{ tuple $envAll "alertmanager" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.alertmanager | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: 0
-{{ tuple $envAll $envAll.Values.pod.resources.alertmanager | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - chown
             - -R
@@ -62,6 +62,7 @@ spec:
       containers:
         - name: alertmanager
 {{ tuple $envAll "alertmanager" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.alertmanager | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/alertmanager.sh
             - start
@@ -71,7 +72,6 @@ spec:
                 command:
                   - /tmp/alertmanager.sh
                   - stop
-{{ tuple $envAll $envAll.Values.pod.resources.alertmanager | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: DISCOVERY_SVC
               value: {{ tuple "alerts" "discovery" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
diff --git a/prometheus-node-exporter/templates/daemonset.yaml b/prometheus-node-exporter/templates/daemonset.yaml
index 957656d9e..fa3cb6d54 100644
--- a/prometheus-node-exporter/templates/daemonset.yaml
+++ b/prometheus-node-exporter/templates/daemonset.yaml
@@ -56,6 +56,7 @@ spec:
       containers:
         - name: node-exporter
 {{ tuple $envAll "node_exporter" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.node_exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           args:
             - --collector.ntp
             - --collector.ntp.server={{ .Values.conf.ntp_server_ip }}
@@ -67,7 +68,6 @@ spec:
             - name: metrics
               containerPort: {{ tuple "node_metrics" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
               hostPort: {{ tuple "node_metrics" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-{{ tuple $envAll $envAll.Values.pod.resources.node_exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           volumeMounts:
             - name: proc
               mountPath: /host/proc
diff --git a/prometheus-openstack-exporter/templates/job-ks-user.yaml b/prometheus-openstack-exporter/templates/job-ks-user.yaml
index 2528e0cb9..717522d4b 100644
--- a/prometheus-openstack-exporter/templates/job-ks-user.yaml
+++ b/prometheus-openstack-exporter/templates/job-ks-user.yaml
@@ -39,9 +39,9 @@ spec:
       containers:
         - name: prometheus-openstack-exporter-ks-user
 {{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 10 }}
-{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-user.sh
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           volumeMounts:
             - name: ks-user-sh
               mountPath: /tmp/ks-user.sh
diff --git a/prometheus/templates/statefulset.yaml b/prometheus/templates/statefulset.yaml
index 6e697d3da..407a01fc8 100644
--- a/prometheus/templates/statefulset.yaml
+++ b/prometheus/templates/statefulset.yaml
@@ -89,9 +89,9 @@ spec:
 {{ tuple $envAll "prometheus" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: prometheus-perms
 {{ tuple $envAll "prometheus" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.prometheus | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: 0
-{{ tuple $envAll $envAll.Values.pod.resources.prometheus | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - chown
             - -R
@@ -103,6 +103,7 @@ spec:
       containers:
         - name: prometheus
 {{ tuple $envAll "prometheus" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.prometheus | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/prometheus.sh
             - start
@@ -112,7 +113,6 @@ spec:
                 command:
                   - /tmp/prometheus.sh
                   - stop
-{{ tuple $envAll $envAll.Values.pod.resources.prometheus | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           ports:
             - name: prom-metrics
               containerPort: {{ tuple "monitoring" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
diff --git a/registry/templates/daemonset-registry-proxy.yaml b/registry/templates/daemonset-registry-proxy.yaml
index 7c63e2d1f..3a37fc3ae 100644
--- a/registry/templates/daemonset-registry-proxy.yaml
+++ b/registry/templates/daemonset-registry-proxy.yaml
@@ -41,20 +41,20 @@ spec:
       initContainers:
 {{ tuple $envAll "registry_proxy" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
-      - name: registry-proxy
-{{ tuple $envAll "registry_proxy" | include "helm-toolkit.snippets.image" | indent 8 }}
+        - name: registry-proxy
+{{ tuple $envAll "registry_proxy" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.registry_proxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-        command:
-          - /tmp/registry-proxy.sh
-        volumeMounts:
-          - name: registry-bin
-            mountPath: /tmp/registry-proxy.sh
-            subPath: registry-proxy.sh
-            readOnly: true
-          - name: registry-etc
-            mountPath: /etc/nginx/conf.d/default.conf
-            subPath: default.conf
-            readOnly: true
+          command:
+            - /tmp/registry-proxy.sh
+          volumeMounts:
+            - name: registry-bin
+              mountPath: /tmp/registry-proxy.sh
+              subPath: registry-proxy.sh
+              readOnly: true
+            - name: registry-etc
+              mountPath: /etc/nginx/conf.d/default.conf
+              subPath: default.conf
+              readOnly: true
       volumes:
         - name: registry-bin
           configMap: