diff --git a/cinder/controller.sls b/cinder/controller.sls
index 31cb53c..cc7091f 100644
--- a/cinder/controller.sls
+++ b/cinder/controller.sls
@@ -168,8 +168,8 @@
 {% 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 }}:
+{#- Since Queens release `policy.json` is changed to `policy.yaml`. But default option in `oslo_policy` is `policy.json` #}
+/etc/cinder/{{ controller.get('oslo_policy', {}).get('policy_file', 'policy.json') }}:
   file.managed:
     - mode: 0640
     - user: root
@@ -183,7 +183,7 @@
 {%- if rule != None %}
 cinder_keystone_rule_{{ name }}_present:
   keystone_policy.rule_present:
-  - path: /etc/cinder/policy.json
+  - path: /etc/cinder/{{ controller.get('oslo_policy', {}).get('policy_file', 'policy.json') }}
   - name: {{ name }}
   - rule: {{ rule }}
   - require:
@@ -193,7 +193,7 @@
 
 cinder_keystone_rule_{{ name }}_absent:
   keystone_policy.rule_absent:
-  - path: /etc/cinder/policy.json
+  - path: /etc/cinder/{{ controller.get('oslo_policy', {}).get('policy_file', 'policy.json') }}
   - name: {{ name }}
   - require:
     - pkg: cinder_controller_packages
diff --git a/cinder/files/queens/cinder.conf.controller.Debian b/cinder/files/queens/cinder.conf.controller.Debian
index 3952e6f..6582861 100644
--- a/cinder/files/queens/cinder.conf.controller.Debian
+++ b/cinder/files/queens/cinder.conf.controller.Debian
@@ -3343,8 +3343,8 @@
 {%- include "oslo_templates/files/queens/oslo/_middleware.conf" %}
 
 [oslo_policy]
-{%- if controller.policy is defined %}
-{%- set _data = controller.policy %}
+{%- if controller.oslo_policy is defined %}
+{%- set _data = controller.oslo_policy %}
 {%- include "oslo_templates/files/queens/oslo/_policy.conf" %}
 {%- endif %}
 
diff --git a/cinder/map.jinja b/cinder/map.jinja
index a2ae973..ddc1ebd 100644
--- a/cinder/map.jinja
+++ b/cinder/map.jinja
@@ -15,7 +15,9 @@
         'wipe_method': 'none',
         'notification': False,
         'cors': {},
-        'policy_file': 'policy.json',
+        'oslo_policy': {
+          'policy_file': 'policy.json'
+        },
         'audit': {
           'enabled': false
         },
@@ -47,7 +49,9 @@
         'wipe_method': 'none',
         'notification': False,
         'cors': {},
-        'policy_file': 'policy.json',
+        'oslo_policy': {
+          'policy_file': 'policy.json'
+        },
         'audit': {
           'enabled': false
         },