diff --git a/glance/files/queens/glance-api.conf.Debian b/glance/files/queens/glance-api.conf.Debian
index b20f2b6..40bf715 100644
--- a/glance/files/queens/glance-api.conf.Debian
+++ b/glance/files/queens/glance-api.conf.Debian
@@ -3775,8 +3775,8 @@
 {%- include "oslo_templates/files/queens/oslo/_database.conf" %}
 
 [oslo_policy]
-{%- if server.policy is defined %}
-{%- set _data = server.policy %}
+{%- if server.oslo_policy is defined %}
+{%- set _data = server.oslo_policy %}
 {%- include "oslo_templates/files/queens/oslo/_policy.conf" %}
 {%- endif %}
 
diff --git a/glance/files/queens/glance-cache.conf.Debian b/glance/files/queens/glance-cache.conf.Debian
index 34eba0d..6c95146 100644
--- a/glance/files/queens/glance-cache.conf.Debian
+++ b/glance/files/queens/glance-cache.conf.Debian
@@ -2620,8 +2620,8 @@
 {% endif %}
 
 [oslo_policy]
-{%- if server.policy is defined %}
-{%- set _data = server.policy %}
+{%- if server.oslo_policy is defined %}
+{%- set _data = server.oslo_policy %}
 {%- include "oslo_templates/files/queens/oslo/_policy.conf" %}
 {%- endif %}
 
diff --git a/glance/files/queens/glance-registry.conf.Debian b/glance/files/queens/glance-registry.conf.Debian
index 8eb30ae..09e6620 100644
--- a/glance/files/queens/glance-registry.conf.Debian
+++ b/glance/files/queens/glance-registry.conf.Debian
@@ -1084,8 +1084,8 @@
 {%- include "oslo_templates/files/queens/oslo/_database.conf" %}
 
 [oslo_policy]
-{%- if server.policy is defined %}
-{%- set _data = server.policy %}
+{%- if server.oslo_policy is defined %}
+{%- set _data = server.oslo_policy %}
 {%- include "oslo_templates/files/queens/oslo/_policy.conf" %}
 {%- endif %}
 
diff --git a/glance/files/queens/glance-scrubber.conf.Debian b/glance/files/queens/glance-scrubber.conf.Debian
index 53e21b3..7bd8e6b 100644
--- a/glance/files/queens/glance-scrubber.conf.Debian
+++ b/glance/files/queens/glance-scrubber.conf.Debian
@@ -2264,7 +2264,7 @@
 
 [oslo_concurrency]
 {%- if server.concurrency is defined %}
-{%- set _data = server.policy %}
+{%- set _data = server.oslo_policy %}
 {%- include "oslo_templates/files/queens/oslo/_concurrency.conf" %}
 {%- endif %}
 
@@ -2274,7 +2274,7 @@
 {%- include "oslo_templates/files/queens/oslo/_database.conf" %}
 
 [oslo_policy]
-{%- if server.policy is defined %}
-{%- set _data = server.policy %}
+{%- if server.oslo_policy is defined %}
+{%- set _data = server.oslo_policy %}
 {%- include "oslo_templates/files/queens/oslo/_policy.conf" %}
 {%- endif %}
diff --git a/glance/map.jinja b/glance/map.jinja
index 0a11145..3303071 100644
--- a/glance/map.jinja
+++ b/glance/map.jinja
@@ -20,7 +20,7 @@
         'amqp': {
           'default_notification_exchange': 'glance'
         },
-        'policy': {
+        'oslo_policy': {
           'policy_file': '/etc/glance/policy.json'
         },
         'logging': {
@@ -46,7 +46,7 @@
         'amqp': {
           'default_notification_exchange': 'glance'
         },
-        'policy': {
+        'oslo_policy': {
           'policy_file': '/etc/glance/policy.json'
         },
         'logging': {