diff --git a/manila/api.sls b/manila/api.sls
index 97a565d..2188af2 100644
--- a/manila/api.sls
+++ b/manila/api.sls
@@ -81,7 +81,7 @@
       - manila_site_enabled
       - sls: manila.db.offline_sync
 
-/etc/manila/policy.json:
+/etc/manila/{{ api.get('oslo_policy', {}).get('policy_file', 'policy.json') }}:
   file.managed:
   - source: salt://manila/files/{{ api.version }}/policy.json
   - template: jinja
diff --git a/manila/files/queens/manila.conf b/manila/files/queens/manila.conf
index cb2bb56..10de26c 100644
--- a/manila/files/queens/manila.conf
+++ b/manila/files/queens/manila.conf
@@ -1719,8 +1719,8 @@
 
 
 [oslo_policy]
-{%- if cfg.policy is defined %}
-{%- set _data = cfg.policy %}
+{%- if cfg.oslo_policy is defined %}
+{%- set _data = cfg.oslo_policy %}
 {%- include "oslo_templates/files/queens/oslo/_policy.conf" %}
 {%- endif %}
 
diff --git a/manila/map.jinja b/manila/map.jinja
index 24f62ff..83eff3f 100644
--- a/manila/map.jinja
+++ b/manila/map.jinja
@@ -15,6 +15,9 @@
             }
           },
         },
+        'oslo_policy': {
+            'policy_file': 'policy.json'
+        },
     }
 }, merge=pillar.manila.get('common', {})) %}