diff --git a/build-tools/build-helm-charts.sh b/build-tools/build-helm-charts.sh
index da22f343..2fa2ca21 100755
--- a/build-tools/build-helm-charts.sh
+++ b/build-tools/build-helm-charts.sh
@@ -315,7 +315,7 @@ def merge_yaml(yaml_merged, yaml_new):
 yaml_out = collections.OrderedDict()
 for yaml_file in yaml_files:
     print 'Merging yaml from file: %s' % yaml_file
-    for document in yaml.load_all(open(yaml_file), Loader=yaml.RoundTripLoader, preserve_quotes=True):
+    for document in yaml.load_all(open(yaml_file), Loader=yaml.RoundTripLoader, preserve_quotes=True, version=(1, 1)):
         document_name = (document['schema'], document['metadata']['schema'], document['metadata']['name'])
         if document_name in yaml_out:
             merge_yaml(yaml_out[document_name], document)
diff --git a/build-tools/helm_chart_modify.py b/build-tools/helm_chart_modify.py
index 4069347b..9b6b5b57 100755
--- a/build-tools/helm_chart_modify.py
+++ b/build-tools/helm_chart_modify.py
@@ -160,7 +160,10 @@ def main(argv):
 
     # Load chart into dictionary(s) and then modify any image locations/tags if required
     for document in yaml.load_all(
-        open(yaml_file), Loader=yaml.RoundTripLoader, preserve_quotes=True):
+        open(yaml_file),
+        Loader=yaml.RoundTripLoader,
+        preserve_quotes=True,
+        version=(1, 1)):
         document_name = (document['schema'],
                          document['metadata']['schema'],
                          document['metadata']['name'])