diff --git a/cinder/controller.sls b/cinder/controller.sls
index 8e7023c..271e01e 100644
--- a/cinder/controller.sls
+++ b/cinder/controller.sls
@@ -153,6 +153,17 @@
 
 {% endif %}
 
+{%- if controller.version not in ["juno", "kilo", "liberty", "mitaka", "newton", "ocata", "pike"] %}
+{#- Since Queens reliase `policy.json` is changed to `policy.yaml`. But default option in `oslo_policy` is `policy.json` #}
+/etc/cinder/{{ controller.policy_file }}:
+  file.managed:
+    - mode: 0640
+    - user: root
+    - group: cinder
+    - require:
+      - pkg: cinder_controller_packages
+{%- endif %}
+
 {%- for name, rule in controller.get('policy', {}).items() %}
 
 {%- if rule != None %}
diff --git a/cinder/map.jinja b/cinder/map.jinja
index 18050cf..a2ae973 100644
--- a/cinder/map.jinja
+++ b/cinder/map.jinja
@@ -15,6 +15,7 @@
         'wipe_method': 'none',
         'notification': False,
         'cors': {},
+        'policy_file': 'policy.json',
         'audit': {
           'enabled': false
         },
@@ -46,6 +47,7 @@
         'wipe_method': 'none',
         'notification': False,
         'cors': {},
+        'policy_file': 'policy.json',
         'audit': {
           'enabled': false
         },