diff --git a/calico/values.yaml b/calico/values.yaml
index 17e627479..eb4a70fcd 100644
--- a/calico/values.yaml
+++ b/calico/values.yaml
@@ -10,6 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+---
 images:
   tags:
     # These are minimum versions, older images will very likely not
@@ -571,3 +572,4 @@ manifests:
   job_calico_settings: true
   service_calico_etcd: true
   secret_certificates: true
+...
diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml
index c049db65c..f78e28f71 100644
--- a/ceph-client/values.yaml
+++ b/ceph-client/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 deployment:
   ceph: true
 
@@ -255,16 +256,16 @@ conf:
     mgr: true
     pg_autoscaler: true
   pool:
-  #NOTE(portdirect): this drives a simple approximation of
+  # NOTE(portdirect): this drives a simple approximation of
   # https://ceph.com/pgcalc/, the `target.osd` key should be set to match the
   # expected number of osds in a cluster, and the `target.pg_per_osd` should be
   # set to match the desired number of placement groups on each OSD.
     crush:
-      #NOTE(portdirect): to use RBD devices with Ubuntu 16.04's 4.4.x series
+      # NOTE(portdirect): to use RBD devices with Ubuntu 16.04's 4.4.x series
       # kernel this should be set to `hammer`
       tunables: null
     target:
-      #NOTE(portdirect): arbitrarily we set the default number of expected OSD's to 5
+      # NOTE(portdirect): arbitrarily we set the default number of expected OSD's to 5
       # to match the number of nodes in the OSH gate (used only for helm tests).
       osd: 5
       # This is  just for helm tests to proceed the deployment if  we have mentioned % of
@@ -272,7 +273,7 @@ conf:
       required_percent_of_osds: 75
       pg_per_osd: 100
       protected: true
-      #NOTE(st053q): target quota should be set to the overall cluster full percentage
+      # NOTE(st053q): target quota should be set to the overall cluster full percentage
       # to be tolerated as a quota (percent full to allow in order to tolerate some
       # level of failure)
       quota: 100
@@ -591,3 +592,4 @@ manifests:
   helm_tests: true
   cronjob_checkPGs: true
   cronjob_defragosds: true
+...
diff --git a/ceph-client/values_overrides/apparmor.yaml b/ceph-client/values_overrides/apparmor.yaml
index 6ed18adbb..e643dfd60 100644
--- a/ceph-client/values_overrides/apparmor.yaml
+++ b/ceph-client/values_overrides/apparmor.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
@@ -24,3 +25,4 @@ bootstrap:
 manifests:
   job_bootstrap: true
 
+...
diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml
index 5dc6f79ce..a0143419f 100644
--- a/ceph-mon/values.yaml
+++ b/ceph-mon/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 deployment:
   ceph: true
   storage_secrets: true
@@ -353,3 +354,4 @@ manifests:
   service_mon: true
   service_mon_discovery: true
   job_storage_admin_keys: true
+...
diff --git a/ceph-mon/values_overrides/apparmor.yaml b/ceph-mon/values_overrides/apparmor.yaml
index d8c77d8e2..4cdd5cdc6 100644
--- a/ceph-mon/values_overrides/apparmor.yaml
+++ b/ceph-mon/values_overrides/apparmor.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
@@ -18,3 +19,4 @@ bootstrap:
   enabled: true
 manifests:
   job_bootstrap: true
+...
diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml
index 2d9353be8..5f4f3b6a2 100644
--- a/ceph-osd/values.yaml
+++ b/ceph-osd/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 images:
   pull_policy: IfNotPresent
   tags:
@@ -40,10 +41,10 @@ labels:
     node_selector_key: ceph-osd
     node_selector_value: enabled
 
-#We could deploy ceph cluster now with either ceph-volume or ceph-disk however
-#ceph-disk is deprecated from Nautilus.
-#Keeping ceph-disk as default since gate scripts are still directory backed
-#osds, need to change this after moving the gates to disk backed osd.
+# We could deploy ceph cluster now with either ceph-volume or ceph-disk however
+# ceph-disk is deprecated from Nautilus.
+# Keeping ceph-disk as default since gate scripts are still directory backed
+# osds, need to change this after moving the gates to disk backed osd.
 deploy:
   tool: "ceph-disk"
 
@@ -359,3 +360,4 @@ manifests:
   job_post_apply: true
   job_image_repo_sync: true
   helm_tests: true
+...
diff --git a/ceph-osd/values_overrides/apparmor.yaml b/ceph-osd/values_overrides/apparmor.yaml
index 62b2de491..c0559ef51 100644
--- a/ceph-osd/values_overrides/apparmor.yaml
+++ b/ceph-osd/values_overrides/apparmor.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
@@ -9,4 +10,5 @@ pod:
       init: runtime/default
     ceph-osd-test:
       init: runtime/default
-      ceph-cluster-helm-test: runtime/default
\ No newline at end of file
+      ceph-cluster-helm-test: runtime/default
+...
diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml
index deb24430d..1f264edcd 100644
--- a/ceph-provisioners/values.yaml
+++ b/ceph-provisioners/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 deployment:
   ceph: true
   client_secrets: false
@@ -255,8 +256,8 @@ bootstrap:
 # if you change provision_storage_class to false
 # it is presumed you manage your own storage
 # class definition externally
-#(kranthikirang):We iterate over each storageclass parameters
-#and derive the manifest.
+# NOTE(kranthikirang) We iterate over each storageclass parameters
+# and derive the manifest.
 storageclass:
   rbd:
     provision_storage_class: true
@@ -325,3 +326,4 @@ manifests:
   job_namespace_client_key: true
   storageclass: true
   helm_tests: true
+...
diff --git a/ceph-provisioners/values_overrides/apparmor.yaml b/ceph-provisioners/values_overrides/apparmor.yaml
index 9eb74b901..b8ce7cc95 100644
--- a/ceph-provisioners/values_overrides/apparmor.yaml
+++ b/ceph-provisioners/values_overrides/apparmor.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
@@ -11,4 +12,5 @@ pod:
       init: runtime/default
     ceph-provisioner-test:
       init: runtime/default
-      ceph-provisioner-helm-test: runtime/default
\ No newline at end of file
+      ceph-provisioner-helm-test: runtime/default
+...
diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml
index 434cab54d..319341725 100644
--- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 deployment:
   ceph: false
 
@@ -249,24 +250,24 @@ conf:
   features:
     rgw: true
   pool:
-  #NOTE(portdirect): this drives a simple approximation of
-  # https://ceph.com/pgcalc/, the `target.osd` key should be set to match the
-  # expected number of osds in a cluster, and the `target.pg_per_osd` should be
-  # set to match the desired number of placement groups on each OSD.
+    # NOTE(portdirect): this drives a simple approximation of
+    # https://ceph.com/pgcalc/, the `target.osd` key should be set to match the
+    # expected number of osds in a cluster, and the `target.pg_per_osd` should be
+    # set to match the desired number of placement groups on each OSD.
     crush:
-      #NOTE(portdirect): to use RBD devices with Ubuntu 16.04's 4.4.x series
+      # NOTE(portdirect): to use RBD devices with Ubuntu 16.04's 4.4.x series
       # kernel this should be set to `hammer`
       tunables: null
     target:
-      #NOTE(portdirect): arbitrarily we set the default number of expected OSD's to 5
+      # NOTE(portdirect): arbitrarily we set the default number of expected OSD's to 5
       # to match the number of nodes in the OSH gate.
       osd: 5
       pg_per_osd: 100
     default:
-      #NOTE(portdirect): this should be 'same_host' for a single node
+      # NOTE(portdirect): this should be 'same_host' for a single node
       # cluster to be in a healthy state
       crush_rule: replicated_rule
-    #NOTE(portdirect): this section describes the pools that will be managed by
+    # NOTE(portdirect): this section describes the pools that will be managed by
     # the ceph pool management job, as it tunes the pgs and crush rule, based on
     # the above.
     spec:
@@ -347,12 +348,12 @@ conf:
         percent_total_data: 34.8
   rgw:
     config:
-      #NOTE (portdirect): See http://tracker.ceph.com/issues/21226
+      # NOTE (portdirect): See http://tracker.ceph.com/issues/21226
       rgw_keystone_token_cache_size: 0
-      #NOTE (JCL): See http://tracker.ceph.com/issues/7073
+      # NOTE (JCL): See http://tracker.ceph.com/issues/7073
       rgw_gc_max_objs: 997
-      #NOTE (JCL): See http://tracker.ceph.com/issues/24937
-      #NOTE (JCL): See https://tracker.ceph.com/issues/24551
+      # NOTE (JCL): See http://tracker.ceph.com/issues/24937
+      # NOTE (JCL): See https://tracker.ceph.com/issues/24551
       rgw_dynamic_resharding: false
       rgw_num_rados_handles: 4
       rgw_override_bucket_index_max_shards: 8
@@ -370,7 +371,7 @@ conf:
     enabled: false
     admin_caps: "users=*;buckets=*;zone=*"
     config:
-      #NOTE (supamatt): Unfortunately we do not conform to S3 compliant names with some of our charts
+      # NOTE (supamatt): Unfortunately we do not conform to S3 compliant names with some of our charts
       rgw_relaxed_s3_bucket_names: true
   ceph:
     global:
@@ -606,3 +607,4 @@ manifests:
   service_rgw: true
   helm_tests: true
   network_policy: false
+...
diff --git a/ceph-rgw/values_overrides/apparmor.yaml b/ceph-rgw/values_overrides/apparmor.yaml
index 9a4ac311f..c7adf8429 100644
--- a/ceph-rgw/values_overrides/apparmor.yaml
+++ b/ceph-rgw/values_overrides/apparmor.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
@@ -22,8 +23,9 @@ pod:
       ceph-rgw-ks-validation: runtime/default
 conf:
   rgw_s3:
-   enabled: true
+    enabled: true
 bootstrap:
   enabled: true
 manifests:
-  job_bootstrap: true
\ No newline at end of file
+  job_bootstrap: true
+...
diff --git a/ceph-rgw/values_overrides/netpol.yaml b/ceph-rgw/values_overrides/netpol.yaml
index b9f0898cd..958a2b4d0 100644
--- a/ceph-rgw/values_overrides/netpol.yaml
+++ b/ceph-rgw/values_overrides/netpol.yaml
@@ -1,3 +1,4 @@
+---
 manifests:
   network_policy: true
 network_policy:
@@ -18,3 +19,4 @@ network_policy:
         ports:
           - protocol: TCP
             port: %%%REPLACE_API_PORT%%%
+...
diff --git a/daemonjob-controller/values.yaml b/daemonjob-controller/values.yaml
index 4ad6b71f0..2bee9a392 100644
--- a/daemonjob-controller/values.yaml
+++ b/daemonjob-controller/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 release_group: null
 
 images:
@@ -113,3 +114,4 @@ manifests:
   job_image_repo_sync: true
   configmap_bin: true
   service: true
+...
diff --git a/daemonjob-controller/values_overrides/apparmor.yaml b/daemonjob-controller/values_overrides/apparmor.yaml
index 39922e5fb..139997e21 100644
--- a/daemonjob-controller/values_overrides/apparmor.yaml
+++ b/daemonjob-controller/values_overrides/apparmor.yaml
@@ -1,5 +1,7 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
     daemonjob-controller:
-      controller: localhost/docker-default
\ No newline at end of file
+      controller: localhost/docker-default
+...
diff --git a/elastic-apm-server/values.yaml b/elastic-apm-server/values.yaml
index b94928e94..ba369e5ae 100644
--- a/elastic-apm-server/values.yaml
+++ b/elastic-apm-server/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 release_group: null
 
 labels:
@@ -162,3 +163,4 @@ manifests:
   service: true
   job_image_repo_sync: true
   secret_elasticsearch: true
+...
diff --git a/elastic-filebeat/values.yaml b/elastic-filebeat/values.yaml
index ea87e9206..882572c32 100644
--- a/elastic-filebeat/values.yaml
+++ b/elastic-filebeat/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 release_group: null
 
 labels:
@@ -263,3 +264,4 @@ manifests:
   daemonset: true
   job_image_repo_sync: true
   secret_elasticsearch: true
+...
diff --git a/elastic-metricbeat/values.yaml b/elastic-metricbeat/values.yaml
index ac73a5dd4..1cedf9b2b 100644
--- a/elastic-metricbeat/values.yaml
+++ b/elastic-metricbeat/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 release_group: null
 
 labels:
@@ -262,3 +263,4 @@ manifests:
   deployment: true
   job_image_repo_sync: true
   secret_elasticsearch: true
+...
diff --git a/elastic-packetbeat/values.yaml b/elastic-packetbeat/values.yaml
index 568925db0..38b0b1c78 100644
--- a/elastic-packetbeat/values.yaml
+++ b/elastic-packetbeat/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 release_group: null
 
 labels:
@@ -181,3 +182,4 @@ manifests:
   daemonset: true
   job_image_repo_sync: true
   secret_elasticsearch: true
+...
diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index 1dc665df8..2f4206c18 100644
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 images:
   tags:
     apache_proxy: docker.io/httpd:2.4
@@ -956,3 +957,4 @@ manifests:
   service_logging: true
   statefulset_data: true
   statefulset_master: true
+...
diff --git a/elasticsearch/values_overrides/apparmor.yaml b/elasticsearch/values_overrides/apparmor.yaml
index 84b06df57..f1298e397 100644
--- a/elasticsearch/values_overrides/apparmor.yaml
+++ b/elasticsearch/values_overrides/apparmor.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   env:
     client: null
@@ -35,4 +36,5 @@ pod:
       init: runtime/default
     elasticsearch-verify-repositories:
       elasticsearch-verify-repositories: runtime/default
-      init: runtime/default
\ No newline at end of file
+      init: runtime/default
+...
diff --git a/elasticsearch/values_overrides/local-storage.yaml b/elasticsearch/values_overrides/local-storage.yaml
index 0d8b0d6f7..8219609e9 100644
--- a/elasticsearch/values_overrides/local-storage.yaml
+++ b/elasticsearch/values_overrides/local-storage.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   replicas:
     data: 1
@@ -18,3 +19,4 @@ manifests:
   job_s3_user: false
   job_s3_bucket: false
   helm_tests: false
+...
diff --git a/elasticsearch/values_overrides/remote-cluster.yaml b/elasticsearch/values_overrides/remote-cluster.yaml
index 093c3cd53..ca00971ed 100644
--- a/elasticsearch/values_overrides/remote-cluster.yaml
+++ b/elasticsearch/values_overrides/remote-cluster.yaml
@@ -11,6 +11,7 @@
 #               - elasticsearch-gateway-2.remote_host:9301
 #               - elasticsearch-gateway-3.remote_host:9301
 #             skip_unavailale: true
+---
 network:
   remote_clustering:
     enabled: true
@@ -28,3 +29,4 @@ pod:
 images:
   tags:
     elasticsearch: docker.io/openstackhelm/elasticsearch-s3:7_6_2-centos_7
+...
diff --git a/etcd/values.yaml b/etcd/values.yaml
index 9d077ea2d..9dea5b888 100644
--- a/etcd/values.yaml
+++ b/etcd/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 images:
   tags:
     etcd: 'gcr.io/google_containers/etcd-amd64:3.2.24'
@@ -111,3 +112,4 @@ manifests:
   deployment: true
   job_image_repo_sync: true
   service: true
+...
diff --git a/falco/values.yaml b/falco/values.yaml
index 1093a8f8d..4c8d7ef09 100644
--- a/falco/values.yaml
+++ b/falco/values.yaml
@@ -10,6 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+---
 images:
   pull_policy: IfNotPresent
   tags:
@@ -1366,3 +1367,4 @@ manifests:
   configmap_etc: true
   configmap_custom_rules: false
   configmap_bin: true
+...
diff --git a/flannel/values.yaml b/flannel/values.yaml
index 673cea071..d71b44d21 100644
--- a/flannel/values.yaml
+++ b/flannel/values.yaml
@@ -12,6 +12,7 @@
 
 # https://raw.githubusercontent.com/coreos/flannel/v0.8.0/Documentation/kube-flannel.yml
 
+---
 labels:
   job:
     node_selector_key: openstack-control-plane
@@ -82,3 +83,4 @@ manifests:
   configmap_kube_flannel_cfg: true
   daemonset_kube_flannel_ds: true
   job_image_repo_sync: true
+...
diff --git a/fluentbit/values.yaml b/fluentbit/values.yaml
index 2c99858aa..4cda5e01c 100644
--- a/fluentbit/values.yaml
+++ b/fluentbit/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 release_group: null
 
 labels:
@@ -253,3 +254,4 @@ manifests:
   configmap_etc: true
   daemonset_fluentbit: true
   job_image_repo_sync: true
+...
diff --git a/fluentd/values.yaml b/fluentd/values.yaml
index 616cae3ca..5eb3307e8 100644
--- a/fluentd/values.yaml
+++ b/fluentd/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 release_group: null
 
 deployment:
@@ -453,3 +454,4 @@ manifests:
   secret_fluentd_env: true
   secret_kafka: false
   service_fluentd: true
+...
diff --git a/fluentd/values_overrides/apparmor.yaml b/fluentd/values_overrides/apparmor.yaml
index aa6b51738..b5121b582 100644
--- a/fluentd/values_overrides/apparmor.yaml
+++ b/fluentd/values_overrides/apparmor.yaml
@@ -1,6 +1,8 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
     fluentd:
       fluentd: runtime/default
       init: runtime/default
+...
diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml
index 70a7c9a3a..eeadd470d 100644
--- a/gnocchi/values.yaml
+++ b/gnocchi/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 labels:
   api:
     node_selector_key: openstack-control-plane
@@ -429,11 +430,11 @@ conf:
       provider: uuid
     api:
       auth_mode: keystone
-      #NOTE(portdirect): the bind port should not be defined, and is manipulated
+      # NOTE(portdirect): the bind port should not be defined, and is manipulated
       # via the endpoints section.
       port: null
     statsd:
-      #NOTE(portdirect): the bind port should not be defined, and is manipulated
+      # NOTE(portdirect): the bind port should not be defined, and is manipulated
       # via the endpoints section.
       port: null
     metricd:
@@ -646,3 +647,4 @@ manifests:
   service_api: true
   service_ingress_api: true
   service_statsd: true
+...
diff --git a/grafana/values.yaml b/grafana/values.yaml
index 3d74e25bc..3d1d992d9 100644
--- a/grafana/values.yaml
+++ b/grafana/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 images:
   tags:
     grafana: docker.io/grafana/grafana:6.2.0
@@ -502,3 +503,4 @@ conf:
     grafana_net:
       url: https://grafana.net
   dashboards: {}
+...
diff --git a/grafana/values_overrides/apparmor.yaml b/grafana/values_overrides/apparmor.yaml
index 22633644f..0259b3e3f 100644
--- a/grafana/values_overrides/apparmor.yaml
+++ b/grafana/values_overrides/apparmor.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
@@ -21,4 +22,5 @@ pod:
       init: runtime/default
     grafana-test:
       init: runtime/default
-      grafana-selenium-tests: runtime/default
\ No newline at end of file
+      grafana-selenium-tests: runtime/default
+...
diff --git a/grafana/values_overrides/calico.yaml b/grafana/values_overrides/calico.yaml
index 2543d58b2..35e06a816 100644
--- a/grafana/values_overrides/calico.yaml
+++ b/grafana/values_overrides/calico.yaml
@@ -1,5 +1,6 @@
 # NOTE(srwilkers): This overrides file provides a reference for a dashboard for
 # the Calico CNI
+---
 conf:
   dashboards:
     calico: |-
@@ -1356,4 +1357,5 @@ conf:
         "timezone": "browser",
         "title": "Kubernetes Calico",
         "version": 1
-      }
\ No newline at end of file
+      }
+...
diff --git a/grafana/values_overrides/ceph.yaml b/grafana/values_overrides/ceph.yaml
index 562929921..d2245ad53 100644
--- a/grafana/values_overrides/ceph.yaml
+++ b/grafana/values_overrides/ceph.yaml
@@ -1,6 +1,7 @@
 # NOTE(srwilkers): This overrides file provides a reference for dashboards for
 # the overall state of ceph clusters, ceph osds in those clusters, and the
 # status of ceph pools for those clusters
+---
 conf:
   dashboards:
     ceph_cluster: |-
@@ -3671,4 +3672,5 @@ conf:
         "timezone": "browser",
         "title": "Ceph - Pools",
         "version": 1
-      }
\ No newline at end of file
+      }
+...
diff --git a/grafana/values_overrides/containers.yaml b/grafana/values_overrides/containers.yaml
index 12037cead..95f899a73 100644
--- a/grafana/values_overrides/containers.yaml
+++ b/grafana/values_overrides/containers.yaml
@@ -1,5 +1,6 @@
 # NOTE(srwilkers): This overrides file provides a reference for a dashboard for
 # container metrics, specific to each host
+---
 conf:
   dashboards:
     containers: |-
@@ -2100,4 +2101,5 @@ conf:
         "timezone": "browser",
         "title": "Container Metrics (cAdvisor)",
         "version": 1
-      }
\ No newline at end of file
+      }
+...
diff --git a/grafana/values_overrides/coredns.yaml b/grafana/values_overrides/coredns.yaml
index ba37d3897..c50391c48 100644
--- a/grafana/values_overrides/coredns.yaml
+++ b/grafana/values_overrides/coredns.yaml
@@ -1,5 +1,6 @@
 # NOTE(srwilkers): This overrides file provides a reference for a dashboard for
 # CoreDNS
+---
 conf:
   dashboards:
     coredns: |-
@@ -1376,4 +1377,5 @@ conf:
         "timezone": "browser",
         "title": "CoreDNS",
         "version": 1
-      }
\ No newline at end of file
+      }
+...
diff --git a/grafana/values_overrides/elasticsearch.yaml b/grafana/values_overrides/elasticsearch.yaml
index f7a317f41..8d1c9d417 100644
--- a/grafana/values_overrides/elasticsearch.yaml
+++ b/grafana/values_overrides/elasticsearch.yaml
@@ -1,5 +1,6 @@
 # NOTE(srwilkers): This overrides file provides a reference for a dashboard for
 # an Elasticsearch cluster
+---
 conf:
   dashboards:
     elasticsearch: |-
@@ -3472,4 +3473,5 @@ conf:
         "timezone": "browser",
         "title": "Elasticsearch",
         "version": 1
-      }
\ No newline at end of file
+      }
+...
diff --git a/grafana/values_overrides/home_dashboard.yaml b/grafana/values_overrides/home_dashboard.yaml
index dd8f2dde9..d08511d26 100644
--- a/grafana/values_overrides/home_dashboard.yaml
+++ b/grafana/values_overrides/home_dashboard.yaml
@@ -1,5 +1,6 @@
 # This override file provides a reference for dashboards for
 # customized OSH Welcome Page
+---
 conf:
   dashboards:
     home_dashboard: |-
@@ -106,4 +107,5 @@ conf:
       }
 
 manifests:
-  job_add_home_dashboard: true
\ No newline at end of file
+  job_add_home_dashboard: true
+...
diff --git a/grafana/values_overrides/kubernetes.yaml b/grafana/values_overrides/kubernetes.yaml
index b1e892ef7..b41b0d8ac 100644
--- a/grafana/values_overrides/kubernetes.yaml
+++ b/grafana/values_overrides/kubernetes.yaml
@@ -1,5 +1,6 @@
 # NOTE(srwilkers): This overrides file provides a reference for dashboards that
 # reflect the overall state of a Kubernetes deployment
+---
 conf:
   dashboards:
     kubernetes_capacity_planning: |-
@@ -2110,4 +2111,5 @@ conf:
         "timezone": "browser",
         "title": "Kubernetes Cluster Status",
         "version": 1
-      }
\ No newline at end of file
+      }
+...
diff --git a/grafana/values_overrides/nginx.yaml b/grafana/values_overrides/nginx.yaml
index daa3086a9..a4872e3da 100644
--- a/grafana/values_overrides/nginx.yaml
+++ b/grafana/values_overrides/nginx.yaml
@@ -1,5 +1,6 @@
 # NOTE(srwilkers): This overrides file provides a reference for a dashboard for
 # nginx
+---
 conf:
   dashboards:
     nginx_stats: |-
@@ -1461,4 +1462,5 @@ conf:
         "title": "NGINX Ingress controller",
         "uid": "nginx",
         "version": 1
-      }
\ No newline at end of file
+      }
+...
diff --git a/grafana/values_overrides/nodes.yaml b/grafana/values_overrides/nodes.yaml
index a2d30678d..b598f8058 100644
--- a/grafana/values_overrides/nodes.yaml
+++ b/grafana/values_overrides/nodes.yaml
@@ -1,5 +1,6 @@
 # NOTE(srwilkers): This overrides file provides a reference for a dashboard for
 # the status of all nodes in a deployment
+---
 conf:
   dashboards:
     nodes: |-
@@ -975,4 +976,5 @@ conf:
         "timezone": "browser",
         "title": "Nodes",
         "version": 1
-      }
\ No newline at end of file
+      }
+...
diff --git a/grafana/values_overrides/openstack.yaml b/grafana/values_overrides/openstack.yaml
index fb35b6fb2..daf049aac 100644
--- a/grafana/values_overrides/openstack.yaml
+++ b/grafana/values_overrides/openstack.yaml
@@ -1,6 +1,7 @@
 # NOTE(srwilkers): This overrides file provides a reference for dashboards for
 # the openstack control plane as a whole, the individual openstack services, and
 # rabbitmq
+---
 conf:
   dashboards:
     rabbitmq: |-
@@ -4159,4 +4160,5 @@ conf:
         "timezone": "browser",
         "title": "Openstack Service",
         "version": 1
-      }
\ No newline at end of file
+      }
+...
diff --git a/grafana/values_overrides/persistentvolume.yaml b/grafana/values_overrides/persistentvolume.yaml
index 6eb99018a..961038436 100644
--- a/grafana/values_overrides/persistentvolume.yaml
+++ b/grafana/values_overrides/persistentvolume.yaml
@@ -1,5 +1,6 @@
 # This overrides file provides a raw json file for a dashboard for
 # the etcd
+---
 conf:
   dashboards:
     persistent_volume: |-
@@ -548,4 +549,5 @@ conf:
         "timezone": "",
         "title": "Persistent Volumes",
         "version": 0
-      }
\ No newline at end of file
+      }
+...
diff --git a/grafana/values_overrides/prometheus.yaml b/grafana/values_overrides/prometheus.yaml
index 73a8551ee..8916f010c 100644
--- a/grafana/values_overrides/prometheus.yaml
+++ b/grafana/values_overrides/prometheus.yaml
@@ -1,5 +1,6 @@
 # NOTE(srwilkers): This overrides file provides a reference for a dashboard for
 # Prometheus
+---
 conf:
   dashboards:
     prometheus: |-
@@ -3704,4 +3705,5 @@ conf:
         "timezone": "browser",
         "title": "Prometheus2.0 (v1.0.0 by FUSAKLA)",
         "version": 1
-      }
\ No newline at end of file
+      }
+...
diff --git a/ingress/values.yaml b/ingress/values.yaml
index 2257854bb..789af624f 100644
--- a/ingress/values.yaml
+++ b/ingress/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 deployment:
   mode: namespace
   type: Deployment
@@ -142,7 +143,7 @@ network:
     keepalived_router_id: 100
   ingress:
     annotations:
-      #NOTE(portdirect): if left blank this is populated from
+      # NOTE(portdirect): if left blank this is populated from
       # .deployment.cluster.class
       kubernetes.io/ingress.class: null
       nginx.ingress.kubernetes.io/proxy-body-size: "0"
@@ -253,13 +254,13 @@ network_policy:
 
 conf:
   controller:
-    #NOTE(portdirect): if left blank this is populated from
+    # NOTE(portdirect): if left blank this is populated from
     # .deployment.cluster.class in cluster mode, or set to
     # "nginx" in namespace mode
     INGRESS_CLASS: null
   ingress:
     enable-underscores-in-headers: "true"
-    #NOTE(portdirect): if left blank this is populated from
+    # NOTE(portdirect): if left blank this is populated from
     # .network.vip.addr when running in host networking
     # and .network.vip.manage=true, otherwise it is left as
     # an empty string (the default).
@@ -286,3 +287,4 @@ manifests:
     prometheus:
       service_exporter: true
   network_policy: false
+...
diff --git a/ingress/values_overrides/apparmor.yaml b/ingress/values_overrides/apparmor.yaml
index 6a4f7fc79..11ae3c11b 100644
--- a/ingress/values_overrides/apparmor.yaml
+++ b/ingress/values_overrides/apparmor.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
@@ -8,3 +9,4 @@ pod:
       init: runtime/default
       ingress: runtime/default
       ingress-vip: runtime/default
+...
diff --git a/ingress/values_overrides/netpol.yaml b/ingress/values_overrides/netpol.yaml
index 7a8575320..7eedf73ca 100644
--- a/ingress/values_overrides/netpol.yaml
+++ b/ingress/values_overrides/netpol.yaml
@@ -1,2 +1,4 @@
+---
 manifests:
   network_policy: true
+...
diff --git a/ingress/values_overrides/rocky-opensuse_15.yaml b/ingress/values_overrides/rocky-opensuse_15.yaml
index 0f54f057e..6209b8a2a 100644
--- a/ingress/values_overrides/rocky-opensuse_15.yaml
+++ b/ingress/values_overrides/rocky-opensuse_15.yaml
@@ -3,3 +3,4 @@ images:
   tags:
     ingress_module_init: "docker.io/openstackhelm/neutron:rocky-opensuse_15"
     ingress_routed_vip: "docker.io/openstackhelm/neutron:rocky-opensuse_15"
+...
diff --git a/kafka/values.yaml b/kafka/values.yaml
index d3ce70265..239675dc2 100644
--- a/kafka/values.yaml
+++ b/kafka/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 images:
   tags:
     kafka: docker.io/wurstmeister/kafka:2.12-2.3.0
@@ -330,7 +331,7 @@ conf:
       # List of topic strings formatted like:
       # topic_name:number_of_partitions:replication_factor
       # - "mytopic:1:1"
-    jaas: # Define Authentication Details in this section
+    jaas:  # Define Authentication Details in this section
       producers:
         # region_a: # Just an ID used to iterate through the dict of producers
         #   username: region-a-producer
@@ -375,3 +376,4 @@ conf:
         };
     jvm_options:
       - -Djava.security.auth.login.config=/opt/kafka/config/jaas.conf
+...
diff --git a/kibana/values.yaml b/kibana/values.yaml
index 3ef5785fd..2d11c1d12 100644
--- a/kibana/values.yaml
+++ b/kibana/values.yaml
@@ -10,6 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+---
 labels:
   kibana:
     node_selector_key: openstack-control-plane
@@ -418,3 +419,4 @@ manifests:
   service_ingress: true
   job_register_kibana_indexes: true
   job_flush_kibana_metadata: true
+...
diff --git a/kibana/values_overrides/apparmor.yaml b/kibana/values_overrides/apparmor.yaml
index 3ecc51094..271646cc0 100644
--- a/kibana/values_overrides/apparmor.yaml
+++ b/kibana/values_overrides/apparmor.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
@@ -11,3 +12,4 @@ pod:
     flush-kibana-metadata:
       flush-kibana-metadata: runtime/default
       init: runtime/default
+...
diff --git a/kube-dns/values.yaml b/kube-dns/values.yaml
index aaf04dcc2..321745d2b 100644
--- a/kube-dns/values.yaml
+++ b/kube-dns/values.yaml
@@ -12,6 +12,7 @@
 
 # https://raw.githubusercontent.com/coreos/flannel/v0.8.0/Documentation/kube-flannel.yml
 
+---
 labels:
   job:
     node_selector_key: openstack-control-plane
@@ -87,3 +88,4 @@ manifests:
   job_image_repo_sync: true
   service_kube_dns: true
   serviceaccount_kube_dns: true
+...
diff --git a/kubernetes-keystone-webhook/values.yaml b/kubernetes-keystone-webhook/values.yaml
index 1388b5127..53a81d4e3 100644
--- a/kubernetes-keystone-webhook/values.yaml
+++ b/kubernetes-keystone-webhook/values.yaml
@@ -10,6 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+---
 labels:
   api:
     node_selector_key: openstack-control-plane
@@ -544,3 +545,4 @@ manifests:
   secret_keystone: true
   service_ingress_api: true
   service: true
+...
diff --git a/ldap/values.yaml b/ldap/values.yaml
index f0c2e578c..c54c7e580 100644
--- a/ldap/values.yaml
+++ b/ldap/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 pod:
   affinity:
     anti:
@@ -242,3 +243,4 @@ manifests:
   network_policy: false
   statefulset: true
   service: true
+...
diff --git a/libvirt/values.yaml b/libvirt/values.yaml
index eede5da96..f5f3b9156 100644
--- a/libvirt/values.yaml
+++ b/libvirt/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 release_group: null
 
 labels:
@@ -188,3 +189,4 @@ manifests:
   daemonset_libvirt: true
   job_image_repo_sync: true
   network_policy: false
+...
diff --git a/libvirt/values_overrides/apparmor.yaml b/libvirt/values_overrides/apparmor.yaml
index 8e990571c..399031430 100644
--- a/libvirt/values_overrides/apparmor.yaml
+++ b/libvirt/values_overrides/apparmor.yaml
@@ -1,5 +1,7 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
     libvirt-libvirt-default:
       libvirt: runtime/default
+...
diff --git a/libvirt/values_overrides/netpol.yaml b/libvirt/values_overrides/netpol.yaml
index 7a8575320..7eedf73ca 100644
--- a/libvirt/values_overrides/netpol.yaml
+++ b/libvirt/values_overrides/netpol.yaml
@@ -1,2 +1,4 @@
+---
 manifests:
   network_policy: true
+...
diff --git a/libvirt/values_overrides/ocata-ubuntu_xenial.yaml b/libvirt/values_overrides/ocata-ubuntu_xenial.yaml
index a55da3986..239aea3b4 100644
--- a/libvirt/values_overrides/ocata-ubuntu_xenial.yaml
+++ b/libvirt/values_overrides/ocata-ubuntu_xenial.yaml
@@ -2,3 +2,4 @@
 images:
   tags:
     libvirt: docker.io/openstackhelm/libvirt:ubuntu_xenial-20190903
+...
diff --git a/libvirt/values_overrides/pike-ubuntu_xenial.yaml b/libvirt/values_overrides/pike-ubuntu_xenial.yaml
index a55da3986..239aea3b4 100644
--- a/libvirt/values_overrides/pike-ubuntu_xenial.yaml
+++ b/libvirt/values_overrides/pike-ubuntu_xenial.yaml
@@ -2,3 +2,4 @@
 images:
   tags:
     libvirt: docker.io/openstackhelm/libvirt:ubuntu_xenial-20190903
+...
diff --git a/libvirt/values_overrides/queens-ubuntu_xenial.yaml b/libvirt/values_overrides/queens-ubuntu_xenial.yaml
index a55da3986..239aea3b4 100644
--- a/libvirt/values_overrides/queens-ubuntu_xenial.yaml
+++ b/libvirt/values_overrides/queens-ubuntu_xenial.yaml
@@ -2,3 +2,4 @@
 images:
   tags:
     libvirt: docker.io/openstackhelm/libvirt:ubuntu_xenial-20190903
+...
diff --git a/libvirt/values_overrides/rocky-opensuse_15.yaml b/libvirt/values_overrides/rocky-opensuse_15.yaml
index a4f925eb4..c72b12239 100644
--- a/libvirt/values_overrides/rocky-opensuse_15.yaml
+++ b/libvirt/values_overrides/rocky-opensuse_15.yaml
@@ -2,3 +2,4 @@
 images:
   tags:
     libvirt: docker.io/openstackhelm/libvirt:latest-opensuse_15
+...
diff --git a/libvirt/values_overrides/rocky-ubuntu_xenial.yaml b/libvirt/values_overrides/rocky-ubuntu_xenial.yaml
index a55da3986..239aea3b4 100644
--- a/libvirt/values_overrides/rocky-ubuntu_xenial.yaml
+++ b/libvirt/values_overrides/rocky-ubuntu_xenial.yaml
@@ -2,3 +2,4 @@
 images:
   tags:
     libvirt: docker.io/openstackhelm/libvirt:ubuntu_xenial-20190903
+...
diff --git a/local-storage/values.yaml b/local-storage/values.yaml
index a2a28277b..32a41a788 100644
--- a/local-storage/values.yaml
+++ b/local-storage/values.yaml
@@ -10,6 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+---
 labels:
   node_affinity:
     node_selector_key: openstack-control-plane
@@ -37,3 +38,4 @@ conf:
 manifests:
   storage_class: true
   persistent_volumes: true
+...
diff --git a/local-storage/values_overrides/local-storage.yaml b/local-storage/values_overrides/local-storage.yaml
index 7ef9baaca..f3267f02c 100644
--- a/local-storage/values_overrides/local-storage.yaml
+++ b/local-storage/values_overrides/local-storage.yaml
@@ -1,3 +1,4 @@
+---
 conf:
   persistent_volumes:
     - name: local-persistent-volume-0
@@ -33,3 +34,4 @@ conf:
 manifests:
   storage_class: true
   persistent_volumes: true
+...
diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index 26f264f11..4ef16b7ad 100644
--- a/mariadb/values.yaml
+++ b/mariadb/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 release_group: null
 
 images:
@@ -541,3 +542,4 @@ manifests:
   service_error: true
   service: true
   statefulset: true
+...
diff --git a/mariadb/values_overrides/apparmor.yaml b/mariadb/values_overrides/apparmor.yaml
index 36b8e1ee8..5fed2dcc5 100644
--- a/mariadb/values_overrides/apparmor.yaml
+++ b/mariadb/values_overrides/apparmor.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
@@ -30,3 +31,4 @@ monitoring:
 
 manifests:
   cron_job_mariadb_backup: true
+...
diff --git a/mariadb/values_overrides/local-storage.yaml b/mariadb/values_overrides/local-storage.yaml
index 11a4e9f23..2346728ca 100644
--- a/mariadb/values_overrides/local-storage.yaml
+++ b/mariadb/values_overrides/local-storage.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   replicas:
     server: 1
@@ -7,3 +8,4 @@ volume:
 monitoring:
   prometheus:
     enabled: false
+...
diff --git a/mariadb/values_overrides/netpol.yaml b/mariadb/values_overrides/netpol.yaml
index bcbd613d5..cd470ed0b 100644
--- a/mariadb/values_overrides/netpol.yaml
+++ b/mariadb/values_overrides/netpol.yaml
@@ -1,3 +1,4 @@
+---
 manifests:
   network_policy: true
 network_policy:
@@ -86,3 +87,4 @@ network_policy:
           port: 80
         - protocol: TCP
           port: 8080
+...
diff --git a/memcached/values.yaml b/memcached/values.yaml
index 6e491e149..116a989b7 100644
--- a/memcached/values.yaml
+++ b/memcached/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 conf:
   memcached:
     max_connections: 8192
@@ -206,3 +207,4 @@ pod:
         limits:
           memory: "1024Mi"
           cpu: "2000m"
+...
diff --git a/memcached/values_overrides/apparmor.yaml b/memcached/values_overrides/apparmor.yaml
index 8e11b2742..1d9522289 100644
--- a/memcached/values_overrides/apparmor.yaml
+++ b/memcached/values_overrides/apparmor.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
@@ -11,3 +12,4 @@ pod:
 monitoring:
   prometheus:
     enabled: false
+...
diff --git a/memcached/values_overrides/netpol.yaml b/memcached/values_overrides/netpol.yaml
index fabb36e08..2bafd8cbe 100644
--- a/memcached/values_overrides/netpol.yaml
+++ b/memcached/values_overrides/netpol.yaml
@@ -1,3 +1,4 @@
+---
 manifests:
   network_policy: true
 network_policy:
@@ -82,3 +83,4 @@ network_policy:
         ports:
           - protocol: TCP
             port: %%%REPLACE_API_PORT%%%
+...
diff --git a/metacontroller/values.yaml b/metacontroller/values.yaml
index 63ce43c20..14f8ffb69 100644
--- a/metacontroller/values.yaml
+++ b/metacontroller/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 release_group: null
 
 images:
@@ -109,3 +110,4 @@ manifests:
   rbac: true
 
 
+...
diff --git a/metacontroller/values_overrides/apparmor.yaml b/metacontroller/values_overrides/apparmor.yaml
index f194450b0..07c57be16 100644
--- a/metacontroller/values_overrides/apparmor.yaml
+++ b/metacontroller/values_overrides/apparmor.yaml
@@ -1,5 +1,7 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
     metacontroller:
-      metacontroller: localhost/docker-default
\ No newline at end of file
+      metacontroller: localhost/docker-default
+...
diff --git a/mongodb/values.yaml b/mongodb/values.yaml
index cacead509..cf482f634 100644
--- a/mongodb/values.yaml
+++ b/mongodb/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 release_group: null
 
 pod:
@@ -26,7 +27,7 @@ pod:
       weight:
         default: 10
   replicas:
-    #only 1 replica currently supported
+    # only 1 replica currently supported
     server: 1
   resources:
     enabled: false
@@ -125,3 +126,4 @@ manifests:
   secret_db_root_creds: true
   service: true
   statefulset: true
+...
diff --git a/nagios/values.yaml b/nagios/values.yaml
index 63e8ec56c..eec055bea 100644
--- a/nagios/values.yaml
+++ b/nagios/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 images:
   tags:
     apache_proxy: docker.io/httpd:2.4
@@ -236,7 +237,7 @@ pod:
     termination_grace_period:
       nagios:
         timeout: 30
-  #env:
+  # env:
   #
   # NOTE(megheisler): This value can be used to hold
   # the domain name. Functionality has been added in
@@ -1182,3 +1183,4 @@ conf:
         use_pending_states=1
         use_ssl_authentication=0
     query_es_clauses: null
+...
diff --git a/nagios/values_overrides/apparmor.yaml b/nagios/values_overrides/apparmor.yaml
index 582be5bf2..c4aaf760c 100644
--- a/nagios/values_overrides/apparmor.yaml
+++ b/nagios/values_overrides/apparmor.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
@@ -8,4 +9,5 @@ pod:
       apache-proxy: runtime/default
     nagios-test:
       init: runtime/default
-      nagios-helm-tests: runtime/default
\ No newline at end of file
+      nagios-helm-tests: runtime/default
+...
diff --git a/nagios/values_overrides/elasticsearch-objects.yaml b/nagios/values_overrides/elasticsearch-objects.yaml
index 14119a02f..15e590fea 100644
--- a/nagios/values_overrides/elasticsearch-objects.yaml
+++ b/nagios/values_overrides/elasticsearch-objects.yaml
@@ -1,3 +1,4 @@
+---
 conf:
   nagios:
     objects:
@@ -91,3 +92,4 @@ conf:
             service_description ES_cluster-running-data-node-count
             use generic-service
           }
+...
diff --git a/nagios/values_overrides/openstack-objects.yaml b/nagios/values_overrides/openstack-objects.yaml
index 07222f7b4..a6c5d177b 100644
--- a/nagios/values_overrides/openstack-objects.yaml
+++ b/nagios/values_overrides/openstack-objects.yaml
@@ -1,3 +1,4 @@
+---
 conf:
   nagios:
     objects:
@@ -268,3 +269,4 @@ conf:
             service_description Prometheus-exporter_Openstack
             use generic-service
           }
+...
diff --git a/nagios/values_overrides/postgresql-objects.yaml b/nagios/values_overrides/postgresql-objects.yaml
index caed1789f..355b81e1c 100644
--- a/nagios/values_overrides/postgresql-objects.yaml
+++ b/nagios/values_overrides/postgresql-objects.yaml
@@ -1,3 +1,4 @@
+---
 conf:
   nagios:
     objects:
@@ -30,3 +31,4 @@ conf:
             service_description Postgresql_deadlocks
             use generic-service
           }
+...
diff --git a/namespace-config/values.yaml b/namespace-config/values.yaml
index 57611a6e5..1df4eb122 100644
--- a/namespace-config/values.yaml
+++ b/namespace-config/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 limits:
   - type: Container
     default:
@@ -23,3 +24,4 @@ limits:
     defaultRequest:
       cpu: 0.1
       memory: 64Mi
+...
diff --git a/nfs-provisioner/values.yaml b/nfs-provisioner/values.yaml
index fd3598e52..dceb5f37f 100644
--- a/nfs-provisioner/values.yaml
+++ b/nfs-provisioner/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 pod:
   affinity:
     anti:
@@ -24,7 +25,7 @@ pod:
       weight:
         default: 10
   replicas:
-    #only 1 replica currently supported
+    # only 1 replica currently supported
     server: 1
   resources:
     enabled: false
@@ -63,7 +64,7 @@ storage:
   persistentVolumeClaim:
     access_mode: ReadWriteOnce
     class_name: general
-    #NOTE(portdirect): Unless explicity set the PV name will be populated to
+    # NOTE(portdirect): Unless explicity set the PV name will be populated to
     # match "{{ .Release.Name }}".
     name: null
     size: 10Gi
@@ -77,10 +78,10 @@ labels:
     node_selector_value: enabled
 
 storageclass:
-  #NOTE(portdirect): Unless explicity set the provisioner name will be generated
+  # NOTE(portdirect): Unless explicity set the provisioner name will be generated
   # with the format "nfs/{{ .Release.Name }}"
   provisioner: null
-  #NOTE(portdirect): Unless explicity set the PV name will be populated to
+  # NOTE(portdirect): Unless explicity set the PV name will be populated to
   # match "{{ .Release.Name }}".
   name: null
 
@@ -133,3 +134,4 @@ manifests:
   service: true
   storage_class: true
   volume_claim: true
+...
diff --git a/openvswitch/values.yaml b/openvswitch/values.yaml
index f64b95452..0f92d7c0d 100644
--- a/openvswitch/values.yaml
+++ b/openvswitch/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 release_group: null
 
 images:
@@ -216,3 +217,4 @@ conf:
     #     vHost IOMMU feature restricts the vhost memory that a virtio device
     #     access, available with DPDK v17.11
     # vhost_iommu_support: true
+...
diff --git a/openvswitch/values_overrides/apparmor.yaml b/openvswitch/values_overrides/apparmor.yaml
index ddf3d37bc..5719c83db 100644
--- a/openvswitch/values_overrides/apparmor.yaml
+++ b/openvswitch/values_overrides/apparmor.yaml
@@ -1,4 +1,5 @@
-#NOTE: Enable this with the correct policy
+# NOTE: Enable this with the correct policy
+---
 pod:
   mandatory_access_control:
     type: apparmor
@@ -9,4 +10,5 @@ pod:
     openvswitch-db:
       openvswitch-db: runtime/default
       openvswitch-db-perms: runtime/default
-      init: runtime/default
\ No newline at end of file
+      init: runtime/default
+...
diff --git a/openvswitch/values_overrides/dpdk-opensuse_15.yaml b/openvswitch/values_overrides/dpdk-opensuse_15.yaml
index 7fc31d9ae..86f81faf7 100644
--- a/openvswitch/values_overrides/dpdk-opensuse_15.yaml
+++ b/openvswitch/values_overrides/dpdk-opensuse_15.yaml
@@ -21,3 +21,4 @@ conf:
     hugepages_mountpath: /dev/hugepages
     vhostuser_socket_dir: vhostuser
     socket_memory: 1024
+...
diff --git a/openvswitch/values_overrides/dpdk-ubuntu_bionic.yaml b/openvswitch/values_overrides/dpdk-ubuntu_bionic.yaml
index 3c5a69ed9..21f4d39c3 100644
--- a/openvswitch/values_overrides/dpdk-ubuntu_bionic.yaml
+++ b/openvswitch/values_overrides/dpdk-ubuntu_bionic.yaml
@@ -21,3 +21,4 @@ conf:
     hugepages_mountpath: /dev/hugepages
     vhostuser_socket_dir: vhostuser
     socket_memory: 1024
+...
diff --git a/openvswitch/values_overrides/netpol.yaml b/openvswitch/values_overrides/netpol.yaml
index 7a8575320..7eedf73ca 100644
--- a/openvswitch/values_overrides/netpol.yaml
+++ b/openvswitch/values_overrides/netpol.yaml
@@ -1,2 +1,4 @@
+---
 manifests:
   network_policy: true
+...
diff --git a/openvswitch/values_overrides/rocky-opensuse_15.yaml b/openvswitch/values_overrides/rocky-opensuse_15.yaml
index 0c238afd6..df0633f2a 100644
--- a/openvswitch/values_overrides/rocky-opensuse_15.yaml
+++ b/openvswitch/values_overrides/rocky-opensuse_15.yaml
@@ -3,3 +3,4 @@ images:
   tags:
     openvswitch_db_server: docker.io/openstackhelm/openvswitch:latest-opensuse_15
     openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-opensuse_15
+...
diff --git a/podsecuritypolicy/values.yaml b/podsecuritypolicy/values.yaml
index fdb22dd5b..daa0c3ccd 100644
--- a/podsecuritypolicy/values.yaml
+++ b/podsecuritypolicy/values.yaml
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+---
 conf:
   # The keys under serviceaccounts define specific serviceaccounts, for
   # which this tempalte creates clusterRoleBindigs to bind the serviceaccounts
@@ -45,7 +46,7 @@ data:
   # Note: you can define as many PSPs here as you need.
   #
   psp-default:  # This will be the `metadata.name` of the PodSecurityPolicy
-    annotations: {} # Placeholder to add seccomp/apparmor default annotations
+    annotations: {}  # Placeholder to add seccomp/apparmor default annotations
     spec:
       privileged: true
       allowPrivilegeEscalation: true
@@ -69,3 +70,4 @@ data:
           max: 65536
 manifests:
   podsecuritypolicy: true
+...
diff --git a/postgresql/values.yaml b/postgresql/values.yaml
index 6b88d3c72..892adf594 100644
--- a/postgresql/values.yaml
+++ b/postgresql/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 release_group: null
 
 pod:
@@ -543,3 +544,4 @@ manifests:
       job_user_create: true
       secret_etc: true
       service_exporter: true
+...
diff --git a/postgresql/values_overrides/apparmor.yaml b/postgresql/values_overrides/apparmor.yaml
index 718a0fdf2..dc0e982f1 100644
--- a/postgresql/values_overrides/apparmor.yaml
+++ b/postgresql/values_overrides/apparmor.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
@@ -10,4 +11,5 @@ pod:
       init: runtime/default
     prometheus-postgresql-exporter-create-user:
       prometheus-postgresql-exporter-create-user: runtime/default
-      init: runtime/default
\ No newline at end of file
+      init: runtime/default
+...
diff --git a/postgresql/values_overrides/netpol.yaml b/postgresql/values_overrides/netpol.yaml
index c8588f530..3c7edac4a 100644
--- a/postgresql/values_overrides/netpol.yaml
+++ b/postgresql/values_overrides/netpol.yaml
@@ -1,3 +1,4 @@
+---
 manifests:
   network_policy: true
 network_policy:
@@ -9,3 +10,4 @@ network_policy:
         ports:
           - protocol: TCP
             port: %%%REPLACE_API_PORT%%%
+...
diff --git a/powerdns/values.yaml b/powerdns/values.yaml
index 60a4a8b27..0ce61a790 100644
--- a/powerdns/values.yaml
+++ b/powerdns/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 images:
   tags:
     powerdns: docker.io/psitrax/powerdns:4.1.10
@@ -200,3 +201,4 @@ manifests:
   secret_db: true
   service_dns: true
   service_api: false
+...
diff --git a/prometheus-alertmanager/values.yaml b/prometheus-alertmanager/values.yaml
index 054d8b49c..d01a82693 100644
--- a/prometheus-alertmanager/values.yaml
+++ b/prometheus-alertmanager/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 images:
   tags:
     alertmanager: docker.io/prom/alertmanager:v0.11.0
@@ -314,3 +315,4 @@ conf:
             message_format: html
             notify: true
   alert_templates: null
+...
diff --git a/prometheus-alertmanager/values_overrides/apparmor.yaml b/prometheus-alertmanager/values_overrides/apparmor.yaml
index 433273ca3..93b0c2760 100644
--- a/prometheus-alertmanager/values_overrides/apparmor.yaml
+++ b/prometheus-alertmanager/values_overrides/apparmor.yaml
@@ -1,6 +1,8 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
     alertmanager:
       alertmanager-perms: runtime/default
       init: runtime/default
+...
diff --git a/prometheus-kube-state-metrics/values.yaml b/prometheus-kube-state-metrics/values.yaml
index 80112e49a..c9be4cc4f 100644
--- a/prometheus-kube-state-metrics/values.yaml
+++ b/prometheus-kube-state-metrics/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 images:
   tags:
     kube_state_metrics: docker.io/bitnami/kube-state-metrics:1.3.1
@@ -182,3 +183,4 @@ manifests:
   service_controller_manager: true
   service_scheduler: true
   serviceaccount: true
+...
diff --git a/prometheus-kube-state-metrics/values_overrides/apparmor.yaml b/prometheus-kube-state-metrics/values_overrides/apparmor.yaml
index 1158225a6..e77643c63 100644
--- a/prometheus-kube-state-metrics/values_overrides/apparmor.yaml
+++ b/prometheus-kube-state-metrics/values_overrides/apparmor.yaml
@@ -1,6 +1,8 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
     kube-state-metrics:
       kube-state-metrics: runtime/default
       init: runtime/default
+...
diff --git a/prometheus-node-exporter/values.yaml b/prometheus-node-exporter/values.yaml
index e06c9e880..c68df35fa 100644
--- a/prometheus-node-exporter/values.yaml
+++ b/prometheus-node-exporter/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 images:
   tags:
     node_exporter: docker.io/prom/node-exporter:v0.15.0
@@ -157,3 +158,4 @@ conf:
     disable:
     textfile:
       directory: /var/log/node-exporter-vfstats
+...
diff --git a/prometheus-node-exporter/values_overrides/apparmor.yaml b/prometheus-node-exporter/values_overrides/apparmor.yaml
index 1beeeecae..2aaa0f78d 100644
--- a/prometheus-node-exporter/values_overrides/apparmor.yaml
+++ b/prometheus-node-exporter/values_overrides/apparmor.yaml
@@ -1,6 +1,8 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
     node-exporter:
       node-exporter: runtime/default
       init: runrtime/default
+...
diff --git a/prometheus-openstack-exporter/values.yaml b/prometheus-openstack-exporter/values.yaml
index 8cb4cf1e2..60911557b 100644
--- a/prometheus-openstack-exporter/values.yaml
+++ b/prometheus-openstack-exporter/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 images:
   tags:
     prometheus_openstack_exporter: docker.io/openstackhelm/prometheus-openstack-exporter:ubuntu_bionic-20191017
@@ -218,3 +219,4 @@ manifests:
   network_policy: false
   secret_keystone: true
   service: true
+...
diff --git a/prometheus-openstack-exporter/values_overrides/apparmor.yaml b/prometheus-openstack-exporter/values_overrides/apparmor.yaml
index 3e08c9f87..eb71f1199 100644
--- a/prometheus-openstack-exporter/values_overrides/apparmor.yaml
+++ b/prometheus-openstack-exporter/values_overrides/apparmor.yaml
@@ -1,6 +1,8 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
     prometheus-openstack-exporter:
       openstack-metrics-exporter: runtime/default
       init: runtime/default
+...
diff --git a/prometheus-openstack-exporter/values_overrides/netpol.yaml b/prometheus-openstack-exporter/values_overrides/netpol.yaml
index 7a8575320..7eedf73ca 100644
--- a/prometheus-openstack-exporter/values_overrides/netpol.yaml
+++ b/prometheus-openstack-exporter/values_overrides/netpol.yaml
@@ -1,2 +1,4 @@
+---
 manifests:
   network_policy: true
+...
diff --git a/prometheus-process-exporter/values.yaml b/prometheus-process-exporter/values.yaml
index 123454c59..559c1e34b 100644
--- a/prometheus-process-exporter/values.yaml
+++ b/prometheus-process-exporter/values.yaml
@@ -14,6 +14,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+---
 images:
   tags:
     process_exporter: docker.io/ncabatoff/process-exporter:0.2.11
@@ -158,3 +159,4 @@ manifests:
 conf:
   processes: dockerd,kubelet,kube-proxy,bgsagent,bgscollect,bgssd
   children: true
+...
diff --git a/prometheus/values.yaml b/prometheus/values.yaml
index d79c2c5c9..0c2c55b19 100644
--- a/prometheus/values.yaml
+++ b/prometheus/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 images:
   tags:
     apache_proxy: docker.io/httpd:2.4
@@ -1059,3 +1060,4 @@ conf:
               regex: peer-mesh
               action: drop
     rules: []
+...
diff --git a/prometheus/values_overrides/alertmanager.yaml b/prometheus/values_overrides/alertmanager.yaml
index 8e6572e84..0fc857ced 100644
--- a/prometheus/values_overrides/alertmanager.yaml
+++ b/prometheus/values_overrides/alertmanager.yaml
@@ -1,3 +1,4 @@
+---
 conf:
   prometheus:
     rules:
@@ -29,3 +30,4 @@ conf:
             annotations:
               description: Reloading Alertmanager's configuration has failed for {{ $labels.namespace }}/{{ $labels.pod }}.
               summary: Alertmanager configuration reload has failed
+...
diff --git a/prometheus/values_overrides/apparmor.yaml b/prometheus/values_overrides/apparmor.yaml
index cdf81e884..bf6f5b6ee 100644
--- a/prometheus/values_overrides/apparmor.yaml
+++ b/prometheus/values_overrides/apparmor.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
@@ -8,4 +9,5 @@ pod:
       init: runtime/default
     prometheus-test:
       prometheus-helm-tests: runtime/default
-      init: runtime/default
\ No newline at end of file
+      init: runtime/default
+...
diff --git a/prometheus/values_overrides/ceph.yaml b/prometheus/values_overrides/ceph.yaml
index 32b4ade80..3cadf4b50 100644
--- a/prometheus/values_overrides/ceph.yaml
+++ b/prometheus/values_overrides/ceph.yaml
@@ -1,3 +1,4 @@
+---
 conf:
   prometheus:
     rules:
@@ -80,3 +81,4 @@ conf:
             annotations:
               description: 'ceph OSD {{ $labels.ceph_daemon }} is out in instance {{ $labels.instance }}.'
               summary: 'ceph OSD {{ $labels.ceph_daemon }} is out in instance {{ $labels.instance }}.'
+...
diff --git a/prometheus/values_overrides/elasticsearch.yaml b/prometheus/values_overrides/elasticsearch.yaml
index d009eba1e..965fb163c 100644
--- a/prometheus/values_overrides/elasticsearch.yaml
+++ b/prometheus/values_overrides/elasticsearch.yaml
@@ -1,3 +1,4 @@
+---
 conf:
   prometheus:
     rules:
@@ -97,3 +98,4 @@ conf:
             annotations:
               description: Fluentd exporter is not collecting metrics or is not available for past 10 minutes
               title: Fluentd exporter is not collecting metrics or is not available
+...
diff --git a/prometheus/values_overrides/kubernetes.yaml b/prometheus/values_overrides/kubernetes.yaml
index ddf4d411c..8145ef217 100644
--- a/prometheus/values_overrides/kubernetes.yaml
+++ b/prometheus/values_overrides/kubernetes.yaml
@@ -1,3 +1,4 @@
+---
 conf:
   prometheus:
     rules:
@@ -377,3 +378,4 @@ conf:
             annotations:
               description: 'volume claim {{$labels.persistentvolumeclaim}} usage has exceeded 80% of total capacity'
               summary: '{{$labels.persistentvolumeclaim}} usage has exceeded 80% of total capacity.'
+...
diff --git a/prometheus/values_overrides/local-storage.yaml b/prometheus/values_overrides/local-storage.yaml
index 384260f42..4d604da22 100644
--- a/prometheus/values_overrides/local-storage.yaml
+++ b/prometheus/values_overrides/local-storage.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   replicas:
     prometheus: 1
@@ -5,3 +6,4 @@ storage:
   requests:
     storage: 1Gi
   storage_class: local-storage
+...
diff --git a/prometheus/values_overrides/nodes.yaml b/prometheus/values_overrides/nodes.yaml
index 42c76430f..41c3e737b 100644
--- a/prometheus/values_overrides/nodes.yaml
+++ b/prometheus/values_overrides/nodes.yaml
@@ -1,3 +1,4 @@
+---
 conf:
   prometheus:
     rules:
@@ -241,3 +242,4 @@ conf:
             annotations:
               description: '{{$labels.device}} has a high write latency of {{ $value }}'
               summary: 'High write latency observed for device {{ $labels.device }}'
+...
diff --git a/prometheus/values_overrides/openstack.yaml b/prometheus/values_overrides/openstack.yaml
index 2134fbe1d..e7c3db80e 100644
--- a/prometheus/values_overrides/openstack.yaml
+++ b/prometheus/values_overrides/openstack.yaml
@@ -1,3 +1,4 @@
+---
 conf:
   prometheus:
     rules:
@@ -321,3 +322,4 @@ conf:
             annotations:
               description: 'RabbitMQ has high message load. Total Queue depth > 17000 or growth more than 4000 messages.'
               summary: 'RabbitMQ has high message load'
+...
diff --git a/prometheus/values_overrides/postgresql.yaml b/prometheus/values_overrides/postgresql.yaml
index 22fe481e1..1d68981ca 100644
--- a/prometheus/values_overrides/postgresql.yaml
+++ b/prometheus/values_overrides/postgresql.yaml
@@ -1,3 +1,4 @@
+---
 conf:
   prometheus:
     rules:
@@ -37,3 +38,4 @@ conf:
             annotations:
               description: postgresql at {{$labels.instance}} is showing {{$value}} rate of deadlocks for database {{$labels.datname}}
               title: Postgres server is experiencing deadlocks
+...
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
index d46330d43..97776979b 100644
--- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 labels:
   server:
     node_selector_key: openstack-control-plane
@@ -370,3 +371,4 @@ manifests:
   service_ingress_management: true
   service: true
   statefulset: true
+...
diff --git a/rabbitmq/values_overrides/apparmor.yaml b/rabbitmq/values_overrides/apparmor.yaml
index c1092ae2e..f6ca7efdb 100644
--- a/rabbitmq/values_overrides/apparmor.yaml
+++ b/rabbitmq/values_overrides/apparmor.yaml
@@ -1,3 +1,4 @@
+---
 pod:
   mandatory_access_control:
     type: apparmor
@@ -21,3 +22,4 @@ pod:
 monitoring:
   prometheus:
     enabled: true
+...
diff --git a/rabbitmq/values_overrides/netpol.yaml b/rabbitmq/values_overrides/netpol.yaml
index 98f006939..cf22ee707 100644
--- a/rabbitmq/values_overrides/netpol.yaml
+++ b/rabbitmq/values_overrides/netpol.yaml
@@ -1,3 +1,4 @@
+---
 network_policy:
   rabbitmq:
     ingress:
@@ -104,3 +105,4 @@ manifests:
     prometheus:
       network_policy_exporter: true
   network_policy: true
+...
diff --git a/redis/values.yaml b/redis/values.yaml
index a3973af2d..51bb8e69b 100644
--- a/redis/values.yaml
+++ b/redis/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 images:
   tags:
     redis: docker.io/redis:4.0.1
@@ -124,3 +125,4 @@ manifests:
   job_image_repo_sync: true
   service: true
   helm_tests: true
+...
diff --git a/registry/values.yaml b/registry/values.yaml
index d3cc2c88d..af0a64cc1 100644
--- a/registry/values.yaml
+++ b/registry/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 labels:
   registry:
     node_selector_key: openstack-control-plane
@@ -207,3 +208,4 @@ manifests:
   job_image_repo_sync: true
   pvc_images: true
   service_registry: true
+...
diff --git a/tiller/values.yaml b/tiller/values.yaml
index fcb7eb249..65458ef27 100644
--- a/tiller/values.yaml
+++ b/tiller/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 labels:
   job:
     node_selector_key: openstack-control-plane
@@ -99,3 +100,4 @@ manifests:
   deployment_tiller: true
   job_image_repo_sync: true
   service_tiller_deploy: true
+...
diff --git a/yamllint.conf b/yamllint.conf
index e36af6366..919ee6ea2 100644
--- a/yamllint.conf
+++ b/yamllint.conf
@@ -10,34 +10,23 @@ rules:
   brackets: enable
   colons: enable
   commas: enable
-  comments:
-    level: warning
+  comments: enable
   comments-indentation:
     level: warning
-  document-end:
-    level: warning
-  document-start:
-    level: warning
-  empty-lines:
-    level: warning
-  empty-values:
-    level: warning
-  hyphens:
-    level: warning
+  document-end: enable
+  document-start: enable
+  empty-lines: enable
+  empty-values: disable
+  hyphens: enable
   indentation:
     spaces: 2
     indent-sequences: whatever
-    level: warning
-  key-duplicates:
-    level: warning
+  key-duplicates: enable
   key-ordering: disable
   line-length: disable
-  new-line-at-end-of-file:
-    level: warning
-  new-lines:
-    level: warning
-  octal-values:
-    level: warning
+  new-line-at-end-of-file: enable
+  new-lines: enable
+  octal-values: enable
   quoted-strings: disable
   trailing-spaces: enable
   truthy:
diff --git a/zookeeper/values.yaml b/zookeeper/values.yaml
index 1c727f6a3..d04ef5475 100644
--- a/zookeeper/values.yaml
+++ b/zookeeper/values.yaml
@@ -15,6 +15,7 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
+---
 images:
   tags:
     zookeeper: docker.io/zookeeper:3.5.5
@@ -267,3 +268,4 @@ conf:
         };
     jvm_options:
       - -Djava.security.auth.login.config=/conf/jaas.conf
+...