diff --git a/glance/files/kilo/glance-api.conf.Debian b/glance/files/kilo/glance-api.conf.Debian
index dde4c6a..0934516 100644
--- a/glance/files/kilo/glance-api.conf.Debian
+++ b/glance/files/kilo/glance-api.conf.Debian
@@ -544,12 +544,13 @@
 # by the stores option.
 # Deprecated group/name - [DEFAULT]/default_store
 # Default: 'file'
-default_store = file
 
 {%- if server.storage.engine == 'file' %}
+default_store = file
 stores = glance.store.filesystem.Store,
          glance.store.http.Store
 {%- else %}
+default_store = {{ server.storage.engine }}
 stores = {{ server.storage.engine }}
 {%- endif %}
 # ============ Filesystem Store Options ========================
diff --git a/glance/files/liberty/glance-api.conf.Debian b/glance/files/liberty/glance-api.conf.Debian
index dde4c6a..857733a 100644
--- a/glance/files/liberty/glance-api.conf.Debian
+++ b/glance/files/liberty/glance-api.conf.Debian
@@ -544,12 +544,12 @@
 # by the stores option.
 # Deprecated group/name - [DEFAULT]/default_store
 # Default: 'file'
-default_store = file
-
 {%- if server.storage.engine == 'file' %}
+default_store = file
 stores = glance.store.filesystem.Store,
          glance.store.http.Store
 {%- else %}
+default_store = {{ server.storage.engine }}
 stores = {{ server.storage.engine }}
 {%- endif %}
 # ============ Filesystem Store Options ========================