diff --git a/calico/templates/daemonset-calico-etcd.yaml b/calico/templates/daemonset-calico-etcd.yaml
index 2f7109c900..ce1521d96a 100644
--- a/calico/templates/daemonset-calico-etcd.yaml
+++ b/calico/templates/daemonset-calico-etcd.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.etcd .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.etcd .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.etcd -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.etcd -}}
 {{- end -}}
 
 {{- $serviceAccountName := "calico-etcd"}}
diff --git a/calico/templates/daemonset-calico-node.yaml b/calico/templates/daemonset-calico-node.yaml
index 63f49d903e..e54f1b63e2 100644
--- a/calico/templates/daemonset-calico-node.yaml
+++ b/calico/templates/daemonset-calico-node.yaml
@@ -35,9 +35,9 @@ limitations under the License.
 
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.calico_node .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.calico_node .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.calico_node -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.calico_node -}}
 {{- end -}}
 
 {{- $prometheus_annotations := $envAll.Values.monitoring.prometheus.calico_node }}
diff --git a/calico/templates/deployment-calico-kube-controllers.yaml b/calico/templates/deployment-calico-kube-controllers.yaml
index af7f41bef9..ef778642bb 100644
--- a/calico/templates/deployment-calico-kube-controllers.yaml
+++ b/calico/templates/deployment-calico-kube-controllers.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.calico_kube_policy_controllers .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.calico_kube_policy_controllers .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.calico_kube_policy_controllers -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.calico_kube_policy_controllers -}}
 {{- end -}}
 
 {{- $serviceAccountName := printf "%s-%s" .Release.Name "calico-kube-controllers"}}
diff --git a/calico/templates/job-calico-settings.yaml b/calico/templates/job-calico-settings.yaml
index 45a513bb20..1096557aa6 100644
--- a/calico/templates/job-calico-settings.yaml
+++ b/calico/templates/job-calico-settings.yaml
@@ -16,7 +16,7 @@ limitations under the License.
 
 {{- if .Values.manifests.job_calico_settings }}
 {{- $envAll := . }}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.calico_settings -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.calico_settings -}}
 
 {{- $serviceAccountName := "calico-settings"}}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/calico/templates/job-image-repo-sync.yaml b/calico/templates/job-image-repo-sync.yaml
index afd26fd432..edfc09012b 100644
--- a/calico/templates/job-image-repo-sync.yaml
+++ b/calico/templates/job-image-repo-sync.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_image_repo_sync }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
 
 {{- $serviceAccountName := "calico-image-repo-sync"}}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/calico/values.yaml b/calico/values.yaml
index 4837df38ea..66901d2cc6 100644
--- a/calico/values.yaml
+++ b/calico/values.yaml
@@ -117,20 +117,21 @@ pod:
         timeout: 5
 
 dependencies:
-  etcd:
-    services: null
-  calico_node:
-    services:
-    - service: etcd
-      endpoint: internal
-  calico_settings:
-    services:
-    - service: etcd
-      endpoint: internal
-  calico_kube_policy_controllers:
-    services:
-    - service: etcd
-      endpoint: internal
+  static:
+    calico_kube_policy_controllers:
+      services:
+        - endpoint: internal
+          service: etcd
+    calico_node:
+      services:
+        - endpoint: internal
+          service: etcd
+    calico_settings:
+      services:
+        - endpoint: internal
+          service: etcd
+    etcd:
+      services: null
 
 conditional_dependencies:
   local_image_registry:
diff --git a/elasticsearch/templates/cron-job-curator.yaml b/elasticsearch/templates/cron-job-curator.yaml
index 60f41417e9..a6da2dae03 100644
--- a/elasticsearch/templates/cron-job-curator.yaml
+++ b/elasticsearch/templates/cron-job-curator.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.cron_curator }}
 {{- if .Capabilities.APIVersions.Has "batch/v2alpha1" }}
 {{- $envAll := . }}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.curator -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.curator -}}
 
 {{- $serviceAccountName := "elastic-curator"}}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/elasticsearch/templates/deployment-client.yaml b/elasticsearch/templates/deployment-client.yaml
index 324412936b..fd2f98bbb7 100644
--- a/elasticsearch/templates/deployment-client.yaml
+++ b/elasticsearch/templates/deployment-client.yaml
@@ -19,9 +19,9 @@ limitations under the License.
 {{- $esUserSecret := .Values.secrets.elasticsearch.user }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.elasticsearch_client .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.elasticsearch_client .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.elasticsearch_client -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.elasticsearch_client -}}
 {{- end -}}
 
 {{- $mounts_elasticsearch := .Values.pod.mounts.elasticsearch.elasticsearch }}
diff --git a/elasticsearch/templates/deployment-master.yaml b/elasticsearch/templates/deployment-master.yaml
index 8b02bcb60d..a8ced6b88b 100644
--- a/elasticsearch/templates/deployment-master.yaml
+++ b/elasticsearch/templates/deployment-master.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.elasticsearch_master .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.elasticsearch_master .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.elasticsearch_master -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.elasticsearch_master -}}
 {{- end -}}
 
 {{- $mounts_elasticsearch := .Values.pod.mounts.elasticsearch.elasticsearch }}
diff --git a/elasticsearch/templates/job-image-repo-sync.yaml b/elasticsearch/templates/job-image-repo-sync.yaml
index 0d75d6d19d..d07425b852 100644
--- a/elasticsearch/templates/job-image-repo-sync.yaml
+++ b/elasticsearch/templates/job-image-repo-sync.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_image_repo_sync }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
 
 {{- $serviceAccountName := "elasticsearch-image-repo-sync"}}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/elasticsearch/templates/job-register-snapshot-repository.yaml b/elasticsearch/templates/job-register-snapshot-repository.yaml
index e825545453..e86a92deb5 100644
--- a/elasticsearch/templates/job-register-snapshot-repository.yaml
+++ b/elasticsearch/templates/job-register-snapshot-repository.yaml
@@ -18,7 +18,7 @@ limitations under the License.
 {{- if .Values.conf.elasticsearch.repository.enabled }}
 {{- $envAll := . }}
 {{- $esUserSecret := .Values.secrets.elasticsearch.user }}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.snapshot_repository -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.snapshot_repository -}}
 
 {{- $serviceAccountName := "elasticsearch-register-snapshot-repository" }}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/elasticsearch/templates/monitoring/prometheus/exporter-deployment.yaml b/elasticsearch/templates/monitoring/prometheus/exporter-deployment.yaml
index e1bc5c5a08..a95f9375cf 100644
--- a/elasticsearch/templates/monitoring/prometheus/exporter-deployment.yaml
+++ b/elasticsearch/templates/monitoring/prometheus/exporter-deployment.yaml
@@ -17,9 +17,9 @@ limitations under the License.
 {{- if and .Values.manifests.monitoring.prometheus.deployment_exporter .Values.monitoring.prometheus.enabled }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" (merge .Values.dependencies.prometheus_elasticsearch_exporter .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := set .Values "pod_dependency" (merge .Values.dependencies.static.prometheus_elasticsearch_exporter .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.prometheus_elasticsearch_exporter -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.prometheus_elasticsearch_exporter -}}
 {{- end -}}
 
 {{- $esUserSecret := .Values.secrets.elasticsearch.user }}
diff --git a/elasticsearch/templates/statefulset-data.yaml b/elasticsearch/templates/statefulset-data.yaml
index 4660719628..09222c710b 100644
--- a/elasticsearch/templates/statefulset-data.yaml
+++ b/elasticsearch/templates/statefulset-data.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.elasticsearch_data .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.elasticsearch_data .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.elasticsearch_data -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.elasticsearch_data -}}
 {{- end -}}
 
 {{- $mounts_elasticsearch := .Values.pod.mounts.elasticsearch.elasticsearch }}
diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index 6a3555a694..91f8106950 100644
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -39,26 +39,27 @@ labels:
   node_selector_value: enabled
 
 dependencies:
-  elasticsearch_client:
-    services: null
-  elasticsearch_master:
-    services: null
-  elasticsearch_data:
-    services: null
-  prometheus_elasticsearch_exporter:
-    services:
-      - service: elasticsearch
-        endpoint: internal
-  curator:
-    services: null
-  image_repo_sync:
-    services:
-      - service: local_image_registry
-        endpoint: internal
-  snapshot_repository:
-    services:
-      - service: elasticsearch
-        endpoint: internal
+  static:
+    curator:
+      services: null
+    elasticsearch_client:
+      services: null
+    elasticsearch_data:
+      services: null
+    elasticsearch_master:
+      services: null
+    image_repo_sync:
+      services:
+        - endpoint: internal
+          service: local_image_registry
+    prometheus_elasticsearch_exporter:
+      services:
+        - endpoint: internal
+          service: elasticsearch
+    snapshot_repository:
+      services:
+        - endpoint: internal
+          service: elasticsearch
 
 conditional_dependencies:
   local_image_registry:
diff --git a/flannel/templates/daemonset-kube-flannel-ds.yaml b/flannel/templates/daemonset-kube-flannel-ds.yaml
index ae03a04173..e2209a0d74 100644
--- a/flannel/templates/daemonset-kube-flannel-ds.yaml
+++ b/flannel/templates/daemonset-kube-flannel-ds.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.flannel .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.flannel .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.flannel -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.flannel -}}
 {{- end -}}
 
 {{- $serviceAccountName := printf "%s-%s" .Release.Name "flannel"}}
diff --git a/flannel/templates/job-image-repo-sync.yaml b/flannel/templates/job-image-repo-sync.yaml
index 012ec89401..bd86aca01b 100644
--- a/flannel/templates/job-image-repo-sync.yaml
+++ b/flannel/templates/job-image-repo-sync.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_image_repo_sync }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
 
 {{- $serviceAccountName := "flannel-image-repo-sync"}}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/flannel/values.yaml b/flannel/values.yaml
index b1f5007f76..076b5749b7 100644
--- a/flannel/values.yaml
+++ b/flannel/values.yaml
@@ -47,12 +47,13 @@ networking:
   podSubnet: 192.168.0.0/16
 
 dependencies:
-  flannel:
-    services: null
-  image_repo_sync:
-    services:
-      - service: local_image_registry
-        endpoint: internal
+  static:
+    flannel:
+      services: null
+    image_repo_sync:
+      services:
+        - endpoint: internal
+          service: local_image_registry
 
 conditional_dependencies:
   local_image_registry:
diff --git a/fluent-logging/templates/daemonset-fluent-bit.yaml b/fluent-logging/templates/daemonset-fluent-bit.yaml
index c7ad407e37..07020c19f5 100644
--- a/fluent-logging/templates/daemonset-fluent-bit.yaml
+++ b/fluent-logging/templates/daemonset-fluent-bit.yaml
@@ -16,12 +16,12 @@ limitations under the License.
 
 {{- if .Values.manifests.daemonset_fluentbit }}
 {{- $envAll := . }}
-{{- $dependencies := .Values.dependencies.fluentbit }}
+{{- $dependencies := .Values.dependencies.static.fluentbit }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.fluentbit .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.fluentbit .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.fluentbit -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.fluentbit -}}
 {{- end -}}
 
 {{- $mounts_fluentbit := .Values.pod.mounts.fluentbit.fluentbit }}
diff --git a/fluent-logging/templates/deployment-fluentd.yaml b/fluent-logging/templates/deployment-fluentd.yaml
index a77297d6a2..9f4ed7572d 100644
--- a/fluent-logging/templates/deployment-fluentd.yaml
+++ b/fluent-logging/templates/deployment-fluentd.yaml
@@ -19,9 +19,9 @@ limitations under the License.
 {{- $esUserSecret := .Values.secrets.elasticsearch.user }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.fluentd .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.fluentd .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.fluentd -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.fluentd -}}
 {{- end -}}
 
 {{- $mounts_fluentd := .Values.pod.mounts.fluentd.fluentd }}
diff --git a/fluent-logging/templates/job-elasticsearch-template.yaml b/fluent-logging/templates/job-elasticsearch-template.yaml
index 415f05d681..ad90cc1c03 100644
--- a/fluent-logging/templates/job-elasticsearch-template.yaml
+++ b/fluent-logging/templates/job-elasticsearch-template.yaml
@@ -16,7 +16,7 @@ limitations under the License.
 
 {{- if .Values.manifests.job_elasticsearch_template }}
 {{- $envAll := . }}
-{{- $dependencies := .Values.dependencies.elasticsearch_template }}
+{{- $dependencies := .Values.dependencies.static.elasticsearch_template }}
 {{- $mounts_elasticsearch_template := .Values.pod.mounts.elasticsearch_template.elasticsearch_template }}
 {{- $mounts_elasticsearch_template_init := .Values.pod.mounts.elasticsearch_template.init_container }}
 ---
diff --git a/fluent-logging/templates/job-image-repo-sync.yaml b/fluent-logging/templates/job-image-repo-sync.yaml
index 9c74f366e9..41d4794088 100644
--- a/fluent-logging/templates/job-image-repo-sync.yaml
+++ b/fluent-logging/templates/job-image-repo-sync.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_image_repo_sync }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
 
 {{- $serviceAccountName := "fluent-logging-image-repo-sync"}}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml b/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml
index fb5aea59f8..1f9e175be3 100644
--- a/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml
+++ b/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml
@@ -16,7 +16,7 @@ limitations under the License.
 
 {{- if and .Values.manifests.monitoring.prometheus.deployment_exporter .Values.monitoring.prometheus.enabled }}
 {{- $envAll := . }}
-{{- $dependencies := .Values.dependencies.prometheus_fluentd_exporter }}
+{{- $dependencies := .Values.dependencies.static.prometheus_fluentd_exporter }}
 
 {{ $fluentd_host := tuple "fluentd" "internal" "metrics" $envAll | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
 {{ $fluentd_metrics_path := "api/plugins.json" }}
diff --git a/fluent-logging/values.yaml b/fluent-logging/values.yaml
index 7ec2ecb941..ae125d3a92 100644
--- a/fluent-logging/values.yaml
+++ b/fluent-logging/values.yaml
@@ -53,40 +53,41 @@ secrets:
     user: fluentd-elasticsearch-user
 
 dependencies:
-  image_repo_sync:
-    services:
-      - service: local_image_registry
-        endpoint: internal
-  fluentd:
-    services:
-    - service: elasticsearch
-      endpoint: internal
-  fluentd_with_kafka:
-    services:
-    - service: elasticsearch
-      endpoint: internal
-    - service: kafka
-      endpoint: public
-  fluentbit:
-    jobs:
-    - elasticsearch-template
-    services:
-    - service: fluentd
-      endpoint: internal
-  elasticsearch-template:
-    services:
-    - service: elasticsearch
-      endpoint: internal
-  tests:
-    services:
-    - service: elasticsearch
-      endpoint: internal
-    - service: fluentd
-      endpoint: internal
-  prometheus_fluentd_exporter:
-    services:
-    - service: fluentd
-      endpoint: internal
+  static:
+    elasticsearch-template:
+      services:
+        - endpoint: internal
+          service: elasticsearch
+    fluentbit:
+      jobs:
+        - elasticsearch-template
+      services:
+        - endpoint: internal
+          service: fluentd
+    fluentd:
+      services:
+        - endpoint: internal
+          service: elasticsearch
+    fluentd_with_kafka:
+      services:
+        - endpoint: internal
+          service: elasticsearch
+        - endpoint: public
+          service: kafka
+    image_repo_sync:
+      services:
+        - endpoint: internal
+          service: local_image_registry
+    prometheus_fluentd_exporter:
+      services:
+        - endpoint: internal
+          service: fluentd
+    tests:
+      services:
+        - endpoint: internal
+          service: elasticsearch
+        - endpoint: internal
+          service: fluentd
 
 conditional_dependencies:
   local_image_registry:
diff --git a/grafana/templates/deployment.yaml b/grafana/templates/deployment.yaml
index de2a5ac6eb..e37bc175d0 100644
--- a/grafana/templates/deployment.yaml
+++ b/grafana/templates/deployment.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.grafana .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.grafana .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.grafana -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.grafana -}}
 {{- end -}}
 
 {{- $mounts_grafana := .Values.pod.mounts.grafana.grafana }}
diff --git a/grafana/templates/job-db-init-session.yaml b/grafana/templates/job-db-init-session.yaml
index ee80903a28..d8753c8729 100644
--- a/grafana/templates/job-db-init-session.yaml
+++ b/grafana/templates/job-db-init-session.yaml
@@ -16,7 +16,7 @@ limitations under the License.
 
 {{- if .Values.manifests.job_db_init_session }}
 {{- $envAll := . }}
-{{- $dependencies := .Values.dependencies.db_init_session }}
+{{- $dependencies := .Values.dependencies.static.db_init_session }}
 
 {{- $serviceAccountName := "grafana-db-init-session" }}
 {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/grafana/templates/job-db-init.yaml b/grafana/templates/job-db-init.yaml
index 06de4c0346..d395f60ab6 100644
--- a/grafana/templates/job-db-init.yaml
+++ b/grafana/templates/job-db-init.yaml
@@ -16,7 +16,7 @@ limitations under the License.
 
 {{- if .Values.manifests.job_db_init }}
 {{- $envAll := . }}
-{{- $dependencies := .Values.dependencies.db_init }}
+{{- $dependencies := .Values.dependencies.static.db_init }}
 
 {{- $serviceAccountName := "grafana-db-init" }}
 {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/grafana/templates/job-db-session-sync.yaml b/grafana/templates/job-db-session-sync.yaml
index 439e7ea327..4cdcfa9aa6 100644
--- a/grafana/templates/job-db-session-sync.yaml
+++ b/grafana/templates/job-db-session-sync.yaml
@@ -16,7 +16,7 @@ limitations under the License.
 
 {{- if .Values.manifests.job_db_session_sync }}
 {{- $envAll := . }}
-{{- $dependencies := .Values.dependencies.db_session_sync }}
+{{- $dependencies := .Values.dependencies.static.db_session_sync }}
 
 {{- $serviceAccountName := "grafana-db-session-sync" }}
 {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/grafana/templates/job-image-repo-sync.yaml b/grafana/templates/job-image-repo-sync.yaml
index 55a994c551..9ec1fa8e2d 100644
--- a/grafana/templates/job-image-repo-sync.yaml
+++ b/grafana/templates/job-image-repo-sync.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_image_repo_sync }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
 
 {{- $serviceAccountName := "grafana-image-repo-sync" }}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/grafana/templates/job-prometheus-datasource.yaml b/grafana/templates/job-prometheus-datasource.yaml
index 45b69d99ed..9c923f727d 100644
--- a/grafana/templates/job-prometheus-datasource.yaml
+++ b/grafana/templates/job-prometheus-datasource.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_datasource }}
 {{- $envAll := . }}
 
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.register_datasource -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.register_datasource -}}
 {{- $serviceAccountName := "grafana-register-datasource" }}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
diff --git a/grafana/values.yaml b/grafana/values.yaml
index ab4e95e982..a7f39fb417 100644
--- a/grafana/values.yaml
+++ b/grafana/values.yaml
@@ -180,35 +180,36 @@ endpoints:
         public: 80
 
 dependencies:
-  db_init:
-    services:
-      - service: oslo_db
-        endpoint: internal
-  db_init_session:
-    services:
-      - service: oslo_db
-        endpoint: internal
-  db_session_sync:
-    jobs:
-      - grafana-db-init-session
-    services:
-      - service: oslo_db
-        endpoint: internal
-  register_datasource:
-    services:
-      - service: grafana
-        endpoint: internal
-  grafana:
-    jobs:
-      - grafana-db-init
-      - grafana-db-session-sync
-    services:
-      - service: oslo_db
-        endpoint: internal
-  image_repo_sync:
-    services:
-      - service: local_image_registry
-        endpoint: internal
+  static:
+    db_init:
+      services:
+        - endpoint: internal
+          service: oslo_db
+    db_init_session:
+      services:
+        - endpoint: internal
+          service: oslo_db
+    db_session_sync:
+      jobs:
+        - grafana-db-init-session
+      services:
+        - endpoint: internal
+          service: oslo_db
+    grafana:
+      jobs:
+        - grafana-db-init
+        - grafana-db-session-sync
+      services:
+        - endpoint: internal
+          service: oslo_db
+    image_repo_sync:
+      services:
+        - endpoint: internal
+          service: local_image_registry
+    register_datasource:
+      services:
+        - endpoint: internal
+          service: grafana
 
 conditional_dependencies:
   local_image_registry:
diff --git a/kibana/templates/deployment.yaml b/kibana/templates/deployment.yaml
index 482438e4ca..a8338ae52e 100644
--- a/kibana/templates/deployment.yaml
+++ b/kibana/templates/deployment.yaml
@@ -19,9 +19,9 @@ limitations under the License.
 {{- $esUserSecret := .Values.secrets.elasticsearch.user }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.kibana .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.kibana .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.kibana -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.kibana -}}
 {{- end -}}
 
 {{- $serviceAccountName := "kibana" }}
diff --git a/kibana/templates/job-image-repo-sync.yaml b/kibana/templates/job-image-repo-sync.yaml
index 40b222438e..b1e3adeb5e 100644
--- a/kibana/templates/job-image-repo-sync.yaml
+++ b/kibana/templates/job-image-repo-sync.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_image_repo_sync }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
 
 {{- $serviceAccountName := "kibana-image-repo-sync" }}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/kibana/values.yaml b/kibana/values.yaml
index 66ec2380a2..2b6589b8cc 100644
--- a/kibana/values.yaml
+++ b/kibana/values.yaml
@@ -72,14 +72,15 @@ secrets:
     admin: kibana-admin-creds
 
 dependencies:
-  kibana:
-    services:
-      - service: elasticsearch
-        endpoint: internal
-  image_repo_sync:
-    services:
-      - service: local_image_registry
-        endpoint: internal
+  static:
+    image_repo_sync:
+      services:
+        - endpoint: internal
+          service: local_image_registry
+    kibana:
+      services:
+        - endpoint: internal
+          service: elasticsearch
 
 conditional_dependencies:
   local_image_registry:
diff --git a/kube-dns/templates/deployment-kube-dns.yaml b/kube-dns/templates/deployment-kube-dns.yaml
index 11afe82b8c..9288dbd5fa 100644
--- a/kube-dns/templates/deployment-kube-dns.yaml
+++ b/kube-dns/templates/deployment-kube-dns.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.kube_dns .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.kube_dns .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.kube_dns -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.kube_dns -}}
 {{- end -}}
 ---
 apiVersion: extensions/v1beta1
diff --git a/kube-dns/templates/job-image-repo-sync.yaml b/kube-dns/templates/job-image-repo-sync.yaml
index 18041ca251..27a40e6a06 100644
--- a/kube-dns/templates/job-image-repo-sync.yaml
+++ b/kube-dns/templates/job-image-repo-sync.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_image_repo_sync }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
 
 {{- $serviceAccountName := "kube-dns-image-repo-sync"}}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/kube-dns/values.yaml b/kube-dns/values.yaml
index a0307cd349..4917945ff7 100644
--- a/kube-dns/values.yaml
+++ b/kube-dns/values.yaml
@@ -49,12 +49,13 @@ networking:
   dnsIP: 10.96.0.10
 
 dependencies:
-  kube_dns:
-    services: null
-  image_repo_sync:
-    services:
-      - service: local_image_registry
-        endpoint: internal
+  static:
+    image_repo_sync:
+      services:
+        - endpoint: internal
+          service: local_image_registry
+    kube_dns:
+      services: null
 
 conditional_dependencies:
   local_image_registry:
diff --git a/nfs-provisioner/templates/deployment.yaml b/nfs-provisioner/templates/deployment.yaml
index 5d59376f84..2450fd2c1c 100644
--- a/nfs-provisioner/templates/deployment.yaml
+++ b/nfs-provisioner/templates/deployment.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.nfs .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.nfs .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.nfs -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.nfs -}}
 {{- end -}}
 
 {{- $serviceAccountName := printf "%s-%s" .Release.Name "nfs-provisioner"}}
diff --git a/nfs-provisioner/templates/job-image-repo-sync.yaml b/nfs-provisioner/templates/job-image-repo-sync.yaml
index 364e8d190c..6d3b1b7c36 100644
--- a/nfs-provisioner/templates/job-image-repo-sync.yaml
+++ b/nfs-provisioner/templates/job-image-repo-sync.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_image_repo_sync }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
 
 {{- $serviceAccountName := "nfs-image-repo-sync"}}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/nfs-provisioner/values.yaml b/nfs-provisioner/values.yaml
index d28b66fd32..60d08aeb99 100644
--- a/nfs-provisioner/values.yaml
+++ b/nfs-provisioner/values.yaml
@@ -81,12 +81,13 @@ storageclass:
   name: null
 
 dependencies:
-  nfs:
-    services: null
-  image_repo_sync:
-    services:
-      - service: local_image_registry
-        endpoint: internal
+  static:
+    image_repo_sync:
+      services:
+        - endpoint: internal
+          service: local_image_registry
+    nfs:
+      services: null
 
 conditional_dependencies:
   local_image_registry:
diff --git a/prometheus-alertmanager/templates/job-image-repo-sync.yaml b/prometheus-alertmanager/templates/job-image-repo-sync.yaml
index db3cce3098..ab9c87021c 100644
--- a/prometheus-alertmanager/templates/job-image-repo-sync.yaml
+++ b/prometheus-alertmanager/templates/job-image-repo-sync.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_image_repo_sync }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
 
 {{- $serviceAccountName := "alertmanager-image-repo-sync"}}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/prometheus-alertmanager/templates/statefulset.yaml b/prometheus-alertmanager/templates/statefulset.yaml
index 20a69100d2..38578a9dd7 100644
--- a/prometheus-alertmanager/templates/statefulset.yaml
+++ b/prometheus-alertmanager/templates/statefulset.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.alertmanager .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.alertmanager .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.alertmanager -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.alertmanager -}}
 {{- end -}}
 
 {{- $mounts_alertmanager := .Values.pod.mounts.alertmanager.alertmanager }}
diff --git a/prometheus-alertmanager/values.yaml b/prometheus-alertmanager/values.yaml
index a8ae6f2783..5ea08636a6 100644
--- a/prometheus-alertmanager/values.yaml
+++ b/prometheus-alertmanager/values.yaml
@@ -35,11 +35,11 @@ labels:
 
 pod:
   affinity:
-      anti:
-        type:
-          default: preferredDuringSchedulingIgnoredDuringExecution
-        topologyKey:
-          default: kubernetes.io/hostname
+    anti:
+      type:
+        default: preferredDuringSchedulingIgnoredDuringExecution
+      topologyKey:
+        default: kubernetes.io/hostname
   mounts:
     alertmanager:
       alertmanager:
@@ -109,12 +109,13 @@ endpoints:
         default: 6783
 
 dependencies:
-  alertmanager:
-    services: null
-  image_repo_sync:
-    services:
-      - service: local_image_registry
-        endpoint: internal
+  static:
+    alertmanager:
+      services: null
+    image_repo_sync:
+      services:
+        - endpoint: internal
+          service: local_image_registry
 
 conditional_dependencies:
   local_image_registry:
diff --git a/prometheus-kube-state-metrics/templates/deployment.yaml b/prometheus-kube-state-metrics/templates/deployment.yaml
index 3168e242d4..b2fcfb7dd6 100644
--- a/prometheus-kube-state-metrics/templates/deployment.yaml
+++ b/prometheus-kube-state-metrics/templates/deployment.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.kube_state_metrics .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.kube_state_metrics .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.kube_state_metrics -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.kube_state_metrics -}}
 {{- end -}}
 
 {{- $serviceAccountName := printf "%s-%s" .Release.Name "kube-state-metrics"}}
diff --git a/prometheus-kube-state-metrics/templates/job-image-repo-sync.yaml b/prometheus-kube-state-metrics/templates/job-image-repo-sync.yaml
index f763fe0724..06d2960774 100644
--- a/prometheus-kube-state-metrics/templates/job-image-repo-sync.yaml
+++ b/prometheus-kube-state-metrics/templates/job-image-repo-sync.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_image_repo_sync }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
 
 {{- $serviceAccountName := "kube-metrics-image-repo-sync"}}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/prometheus-kube-state-metrics/values.yaml b/prometheus-kube-state-metrics/values.yaml
index 6e739a73a7..dea02616bd 100644
--- a/prometheus-kube-state-metrics/values.yaml
+++ b/prometheus-kube-state-metrics/values.yaml
@@ -34,11 +34,11 @@ labels:
 
 pod:
   affinity:
-      anti:
-        type:
-          default: preferredDuringSchedulingIgnoredDuringExecution
-        topologyKey:
-          default: kubernetes.io/hostname
+    anti:
+      type:
+        default: preferredDuringSchedulingIgnoredDuringExecution
+      topologyKey:
+        default: kubernetes.io/hostname
   mounts:
     kube_state_metrics:
       kube_state_metrics:
@@ -74,10 +74,11 @@ pod:
           cpu: "2000m"
 
 dependencies:
-  image_repo_sync:
-    services:
-      - service: local_image_registry
-        endpoint: internal
+  static:
+    image_repo_sync:
+      services:
+        - endpoint: internal
+          service: local_image_registry
 
 conditional_dependencies:
   local_image_registry:
diff --git a/prometheus-node-exporter/templates/daemonset.yaml b/prometheus-node-exporter/templates/daemonset.yaml
index 3a12b61919..e9c4249933 100644
--- a/prometheus-node-exporter/templates/daemonset.yaml
+++ b/prometheus-node-exporter/templates/daemonset.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.node_exporter .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.node_exporter .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.node_exporter -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.node_exporter -}}
 {{- end -}}
 
 {{- $serviceAccountName := printf "%s-%s" .Release.Name "node-exporter"}}
diff --git a/prometheus-node-exporter/templates/job-image-repo-sync.yaml b/prometheus-node-exporter/templates/job-image-repo-sync.yaml
index 8d3c1d3961..7392f4bedc 100644
--- a/prometheus-node-exporter/templates/job-image-repo-sync.yaml
+++ b/prometheus-node-exporter/templates/job-image-repo-sync.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_image_repo_sync }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
 
 {{- $serviceAccountName := "node-exporter-image-repo-sync"}}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/prometheus-node-exporter/values.yaml b/prometheus-node-exporter/values.yaml
index 8faeb513fb..cd41c8138c 100644
--- a/prometheus-node-exporter/values.yaml
+++ b/prometheus-node-exporter/values.yaml
@@ -34,11 +34,11 @@ labels:
 
 pod:
   affinity:
-      anti:
-        type:
-          default: preferredDuringSchedulingIgnoredDuringExecution
-        topologyKey:
-          default: kubernetes.io/hostname
+    anti:
+      type:
+        default: preferredDuringSchedulingIgnoredDuringExecution
+      topologyKey:
+        default: kubernetes.io/hostname
   mounts:
     node_exporter:
       node_exporter:
@@ -77,12 +77,13 @@ pod:
           cpu: "2000m"
 
 dependencies:
-  node_exporter:
-    services: null
-  image_repo_sync:
-    services:
-      - service: local_image_registry
-        endpoint: internal
+  static:
+    image_repo_sync:
+      services:
+        - endpoint: internal
+          service: local_image_registry
+    node_exporter:
+      services: null
 
 conditional_dependencies:
   local_image_registry:
diff --git a/prometheus-openstack-exporter/templates/deployment.yaml b/prometheus-openstack-exporter/templates/deployment.yaml
index acc5f17c8b..f67213ce0f 100644
--- a/prometheus-openstack-exporter/templates/deployment.yaml
+++ b/prometheus-openstack-exporter/templates/deployment.yaml
@@ -19,9 +19,9 @@ limitations under the License.
 {{- $ksUserSecret := .Values.secrets.identity.user }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.prometheus_openstack_exporter .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.prometheus_openstack_exporter .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.prometheus_openstack_exporter -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.prometheus_openstack_exporter -}}
 {{- end -}}
 
 {{- $serviceAccountName := "prometheus-openstack-exporter" }}
diff --git a/prometheus-openstack-exporter/templates/job-image-repo-sync.yaml b/prometheus-openstack-exporter/templates/job-image-repo-sync.yaml
index 589ebb8777..ab71d7b63b 100644
--- a/prometheus-openstack-exporter/templates/job-image-repo-sync.yaml
+++ b/prometheus-openstack-exporter/templates/job-image-repo-sync.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_image_repo_sync }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
 
 {{- $serviceAccountName := "prometheus-openstack-exporter-image-repo-sync"}}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/prometheus-openstack-exporter/templates/job-ks-user.yaml b/prometheus-openstack-exporter/templates/job-ks-user.yaml
index d559b02d92..937f98424c 100644
--- a/prometheus-openstack-exporter/templates/job-ks-user.yaml
+++ b/prometheus-openstack-exporter/templates/job-ks-user.yaml
@@ -16,7 +16,7 @@ limitations under the License.
 
 {{- if .Values.manifests.job_ks_user }}
 {{- $envAll := . }}
-{{- $dependencies := .Values.dependencies.ks_user }}
+{{- $dependencies := .Values.dependencies.static.ks_user }}
 
 {{- $serviceAccountName := "prometheus-openstack-exporter-ks-user" }}
 {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/prometheus-openstack-exporter/values.yaml b/prometheus-openstack-exporter/values.yaml
index 758a997e05..3f527cd123 100644
--- a/prometheus-openstack-exporter/values.yaml
+++ b/prometheus-openstack-exporter/values.yaml
@@ -82,20 +82,21 @@ pod:
           cpu: "2000m"
 
 dependencies:
-  ks_user:
-    services:
-      - service: identity
-        endpoint: internal
-  prometheus_openstack_exporter:
-    jobs:
-      - prometheus-openstack-exporter-ks-user
-    services:
-      - service: identity
-        endpoint: internal
-  image_repo_sync:
-    services:
-      - service: local_image_registry
-        endpoint: internal
+  static:
+    image_repo_sync:
+      services:
+        - endpoint: internal
+          service: local_image_registry
+    ks_user:
+      services:
+        - endpoint: internal
+          service: identity
+    prometheus_openstack_exporter:
+      jobs:
+        - prometheus-openstack-exporter-ks-user
+      services:
+        - endpoint: internal
+          service: identity
 
 conditional_dependencies:
   local_image_registry:
diff --git a/prometheus/templates/job-image-repo-sync.yaml b/prometheus/templates/job-image-repo-sync.yaml
index 301622614b..b239dfb71a 100644
--- a/prometheus/templates/job-image-repo-sync.yaml
+++ b/prometheus/templates/job-image-repo-sync.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_image_repo_sync }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
 
 {{- $serviceAccountName := "prometheus-image-repo-sync"}}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/prometheus/templates/statefulset.yaml b/prometheus/templates/statefulset.yaml
index 1d79243415..0fc737376f 100644
--- a/prometheus/templates/statefulset.yaml
+++ b/prometheus/templates/statefulset.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.prometheus .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.prometheus .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.prometheus -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.prometheus -}}
 {{- end -}}
 
 {{- $mounts_prometheus := .Values.pod.mounts.prometheus.prometheus }}
diff --git a/prometheus/values.yaml b/prometheus/values.yaml
index 386e18f1c2..68283cc10f 100644
--- a/prometheus/values.yaml
+++ b/prometheus/values.yaml
@@ -36,11 +36,11 @@ labels:
 
 pod:
   affinity:
-      anti:
-        type:
-          default: preferredDuringSchedulingIgnoredDuringExecution
-        topologyKey:
-          default: kubernetes.io/hostname
+    anti:
+      type:
+        default: preferredDuringSchedulingIgnoredDuringExecution
+      topologyKey:
+        default: kubernetes.io/hostname
   mounts:
     prometheus:
       prometheus:
@@ -130,12 +130,13 @@ endpoints:
         public: 80
 
 dependencies:
-  prometheus:
-    services: null
-  image_repo_sync:
-    services:
-      - service: local_image_registry
-        endpoint: internal
+  static:
+    image_repo_sync:
+      services:
+        - endpoint: internal
+          service: local_image_registry
+    prometheus:
+      services: null
 
 conditional_dependencies:
   local_image_registry:
diff --git a/redis/templates/deployment.yaml b/redis/templates/deployment.yaml
index 7db88ac8e8..7d7a295917 100644
--- a/redis/templates/deployment.yaml
+++ b/redis/templates/deployment.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.redis .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.redis .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.redis -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.redis -}}
 {{- end -}}
 
 {{- $serviceAccountName := "redis"}}
diff --git a/redis/templates/job-image-repo-sync.yaml b/redis/templates/job-image-repo-sync.yaml
index 203f3317cc..282b24845e 100644
--- a/redis/templates/job-image-repo-sync.yaml
+++ b/redis/templates/job-image-repo-sync.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_image_repo_sync }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
 
 {{- $serviceAccountName := "redis-image-repo-sync"}}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/redis/values.yaml b/redis/values.yaml
index 41f33e6f41..0fdea747ef 100644
--- a/redis/values.yaml
+++ b/redis/values.yaml
@@ -72,12 +72,13 @@ network:
   port: 6379
 
 dependencies:
-  redis:
-    services: null
-  image_repo_sync:
-    services:
-      - service: local_image_registry
-        endpoint: internal
+  static:
+    image_repo_sync:
+      services:
+        - endpoint: internal
+          service: local_image_registry
+    redis:
+      services: null
 
 conditional_dependencies:
   local_image_registry:
diff --git a/registry/templates/daemonset-registry-proxy.yaml b/registry/templates/daemonset-registry-proxy.yaml
index 84c982ac9d..4e7fd4769b 100644
--- a/registry/templates/daemonset-registry-proxy.yaml
+++ b/registry/templates/daemonset-registry-proxy.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.registry_proxy .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.registry_proxy .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.registry_proxy -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.registry_proxy -}}
 {{- end -}}
 
 {{- $serviceAccountName := "docker-registry-proxy"}}
diff --git a/registry/templates/deployment-registry.yaml b/registry/templates/deployment-registry.yaml
index df6cd23f4d..0e071dc7a0 100644
--- a/registry/templates/deployment-registry.yaml
+++ b/registry/templates/deployment-registry.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.registry .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.registry .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.registry -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.registry -}}
 {{- end -}}
 
 {{- $serviceAccountName := "docker-registry"}}
diff --git a/registry/templates/job-bootstrap.yaml b/registry/templates/job-bootstrap.yaml
index 4407ebf74a..1c3a70f22b 100644
--- a/registry/templates/job-bootstrap.yaml
+++ b/registry/templates/job-bootstrap.yaml
@@ -19,9 +19,9 @@ limitations under the License.
 {{- if .Values.bootstrap.enabled }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.bootstrap .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.bootstrap .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.bootstrap -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.bootstrap -}}
 {{- end -}}
 
 {{- $serviceAccountName := "docker-bootstrap"}}
diff --git a/registry/values.yaml b/registry/values.yaml
index 158d1b36b3..04423c1824 100644
--- a/registry/values.yaml
+++ b/registry/values.yaml
@@ -72,11 +72,11 @@ conf:
 
 pod:
   affinity:
-      anti:
-        type:
-          default: preferredDuringSchedulingIgnoredDuringExecution
-        topologyKey:
-          default: kubernetes.io/hostname
+    anti:
+      type:
+        default: preferredDuringSchedulingIgnoredDuringExecution
+      topologyKey:
+        default: kubernetes.io/hostname
   replicas:
     registry: 1
   lifecycle:
@@ -120,20 +120,21 @@ bootstrap:
     - quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
 
 dependencies:
-  registry:
-    services:
-    - service: redis
-      endpoint: internal
-  registry_proxy:
-    services:
-    - service: docker_registry
-      endpoint: internal
-  bootstrap:
-    daemonset:
-    - docker-registry-proxy
-    services:
-    - service: docker_registry
-      endpoint: internal
+  static:
+    bootstrap:
+      daemonset:
+        - docker-registry-proxy
+      services:
+        - endpoint: internal
+          service: docker_registry
+    registry:
+      services:
+        - endpoint: internal
+          service: redis
+    registry_proxy:
+      services:
+        - endpoint: internal
+          service: docker_registry
 
 endpoints:
   cluster_domain_suffix: cluster.local
diff --git a/tiller/templates/deployment-tiller.yaml b/tiller/templates/deployment-tiller.yaml
index 94ed0a251c..9002625821 100644
--- a/tiller/templates/deployment-tiller.yaml
+++ b/tiller/templates/deployment-tiller.yaml
@@ -18,9 +18,9 @@ limitations under the License.
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
 {{- $_ := set .Values "pod_dependency" dict -}}
-{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.tiller .Values.conditional_dependencies.local_image_registry) -}}
+{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.tiller .Values.conditional_dependencies.local_image_registry) -}}
 {{- else -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.tiller -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.tiller -}}
 {{- end -}}
 
 {{- $serviceAccountName := printf "%s-%s" .Release.Name "tiller" }}
diff --git a/tiller/templates/job-image-repo-sync.yaml b/tiller/templates/job-image-repo-sync.yaml
index 8cadeb5872..6f2400fa52 100644
--- a/tiller/templates/job-image-repo-sync.yaml
+++ b/tiller/templates/job-image-repo-sync.yaml
@@ -17,7 +17,7 @@ limitations under the License.
 {{- if .Values.manifests.job_image_repo_sync }}
 {{- $envAll := . }}
 {{- if .Values.images.local_registry.active -}}
-{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
+{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
 
 {{- $serviceAccountName := "kube-dns-image-repo-sync"}}
 {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
diff --git a/tiller/values.yaml b/tiller/values.yaml
index 5785cbcac6..f7b4b86f19 100644
--- a/tiller/values.yaml
+++ b/tiller/values.yaml
@@ -48,12 +48,13 @@ pod:
           cpu: "2000m"
 
 dependencies:
-  tiller:
-    services: null
-  image_repo_sync:
-    services:
-      - service: local_image_registry
-        endpoint: internal
+  static:
+    image_repo_sync:
+      services:
+        - endpoint: internal
+          service: local_image_registry
+    tiller:
+      services: null
 
 conditional_dependencies:
   local_image_registry:
diff --git a/tools/gate/chart-deploys/default.yaml b/tools/gate/chart-deploys/default.yaml
index 1551e81042..75edaa1834 100644
--- a/tools/gate/chart-deploys/default.yaml
+++ b/tools/gate/chart-deploys/default.yaml
@@ -151,9 +151,10 @@ charts:
       manifests:
         job_ks_user: false
       dependencies:
-        prometheus_openstack_exporter:
-          jobs: null
-          services: null
+        static:
+          prometheus_openstack_exporter:
+            jobs: null
+            services: null
 
   grafana:
     chart_name: grafana
@@ -165,9 +166,10 @@ charts:
       output: false
     values:
       dependencies:
-        grafana:
-          jobs: null
-          services: null
+        static:
+          grafana:
+            jobs: null
+            services: null
       manifests:
         ingress: false
         job_db_init: false