diff --git a/glance/files/ocata/glance-api.conf.Debian b/glance/files/ocata/glance-api.conf.Debian
index a29833a..1e3e07b 100644
--- a/glance/files/ocata/glance-api.conf.Debian
+++ b/glance/files/ocata/glance-api.conf.Debian
@@ -2027,7 +2027,7 @@
 default_store = file
 stores = file,http
 {%- else %}
-default_store = {{ storage_engines[0]  }}
+default_store = {{ server.storage.get('default_store', storage_engines[0]) }}
 stores = {{ server.storage.engine }}
 {%- endif %}
 #
diff --git a/glance/files/ocata/glance-glare.conf.Debian b/glance/files/ocata/glance-glare.conf.Debian
index c9e79d6..9a43951 100644
--- a/glance/files/ocata/glance-glare.conf.Debian
+++ b/glance/files/ocata/glance-glare.conf.Debian
@@ -692,7 +692,7 @@
 default_store = file
 stores = file,http
 {%- else %}
-default_store = {{ storage_engines[0]  }}
+default_store = {{ server.storage.get('default_store', storage_engines[0]) }}
 stores = {{ server.storage.engine }}
 {%- endif %}
 #