diff --git a/gnocchi/templates/configmap-etc.yaml b/gnocchi/templates/configmap-etc.yaml
index 148b62dc3f..3fb0282525 100644
--- a/gnocchi/templates/configmap-etc.yaml
+++ b/gnocchi/templates/configmap-etc.yaml
@@ -96,6 +96,6 @@ type: Opaque
 data:
   gnocchi.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.gnocchi | b64enc }}
   api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
-  policy.json: {{ toJson .Values.conf.policy | b64enc }}
+  policy.yaml: {{ toYaml .Values.conf.policy | b64enc }}
 {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.apache "key" "wsgi-gnocchi.conf" "format" "Secret" ) | indent 2 }}
 {{- end }}
diff --git a/gnocchi/templates/daemonset-metricd.yaml b/gnocchi/templates/daemonset-metricd.yaml
index 6fe7759394..174a38448e 100644
--- a/gnocchi/templates/daemonset-metricd.yaml
+++ b/gnocchi/templates/daemonset-metricd.yaml
@@ -82,8 +82,8 @@ spec:
               subPath: gnocchi.conf
               readOnly: true
             - name: gnocchi-etc
-              mountPath: /etc/gnocchi/policy.json
-              subPath: policy.json
+              mountPath: /etc/gnocchi/policy.yaml
+              subPath: policy.yaml
               readOnly: true
             - name: gnocchi-bin
               mountPath: /tmp/gnocchi-metricd.sh
diff --git a/gnocchi/templates/daemonset-statsd.yaml b/gnocchi/templates/daemonset-statsd.yaml
index 316265bc84..b8f2f7f87b 100644
--- a/gnocchi/templates/daemonset-statsd.yaml
+++ b/gnocchi/templates/daemonset-statsd.yaml
@@ -88,8 +88,8 @@ spec:
               subPath: api-paste.ini
               readOnly: true
             - name: gnocchi-etc
-              mountPath: /etc/gnocchi/policy.json
-              subPath: policy.json
+              mountPath: /etc/gnocchi/policy.yaml
+              subPath: policy.yaml
               readOnly: true
             - name: gnocchi-bin
               mountPath: /tmp/gnocchi-statsd.sh
diff --git a/gnocchi/templates/deployment-api.yaml b/gnocchi/templates/deployment-api.yaml
index 68555b184d..beb43a249d 100644
--- a/gnocchi/templates/deployment-api.yaml
+++ b/gnocchi/templates/deployment-api.yaml
@@ -105,8 +105,8 @@ spec:
               readOnly: true
             {{- end }}
             - name: gnocchi-etc
-              mountPath: /etc/gnocchi/policy.json
-              subPath: policy.json
+              mountPath: /etc/gnocchi/policy.yaml
+              subPath: policy.yaml
               readOnly: true
             - name: gnocchi-etc
               mountPath: /etc/apache2/conf-enabled/wsgi-gnocchi.conf
diff --git a/watcher/templates/configmap-etc.yaml b/watcher/templates/configmap-etc.yaml
index 499a3c1051..d2c12b3838 100644
--- a/watcher/templates/configmap-etc.yaml
+++ b/watcher/templates/configmap-etc.yaml
@@ -83,7 +83,7 @@ data:
   rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }}
   watcher.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.watcher | b64enc }}
   logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
-  policy.json: {{ toJson .Values.conf.policy | b64enc }}
+  policy.yaml: {{ toYaml .Values.conf.policy | b64enc }}
 {{- range $key, $value := $envAll.Values.conf.rally_tests.templates }}
   {{ printf "test_template_%d" $key }}: {{ $value.template | b64enc }}
 {{- end }}
diff --git a/watcher/templates/deployment-api.yaml b/watcher/templates/deployment-api.yaml
index 6caa013578..f086e91ba2 100644
--- a/watcher/templates/deployment-api.yaml
+++ b/watcher/templates/deployment-api.yaml
@@ -91,8 +91,8 @@ spec:
               subPath: {{ base .Values.conf.watcher.DEFAULT.log_config_append }}
               readOnly: true
             - name: watcher-etc
-              mountPath: /etc/watcher/policy.json
-              subPath: policy.json
+              mountPath: /etc/watcher/policy.yaml
+              subPath: policy.yaml
               readOnly: true
 {{ if $mounts_watcher_api.volumeMounts }}{{ toYaml $mounts_watcher_api.volumeMounts | indent 12 }}{{ end }}
       volumes: