diff --git a/glance/files/pike/glance-api.conf.Debian b/glance/files/pike/glance-api.conf.Debian
index c295381..62332c6 100644
--- a/glance/files/pike/glance-api.conf.Debian
+++ b/glance/files/pike/glance-api.conf.Debian
@@ -2033,13 +2033,10 @@
 #stores = file,http
 {%- if server.storage.default_store is defined %}
 default_store = {{ server.storage.default_store }}
-{%- endif %}
-{%- if 'file' in storage_engines %}
-stores = file,http
 {%- else %}
-  {%- if server.storage.default_store is not defined %}
 default_store = {{ storage_engines[0]  }}
-  {%- endif %}
+{%- endif %}
+{%- if storage_engines is defined %}
 stores = {{ server.storage.engine }}
 {%- endif %}
 
diff --git a/glance/files/queens/glance-api.conf.Debian b/glance/files/queens/glance-api.conf.Debian
index 91ce05a..f7400dd 100644
--- a/glance/files/queens/glance-api.conf.Debian
+++ b/glance/files/queens/glance-api.conf.Debian
@@ -2202,13 +2202,10 @@
 #default_store = file
 {%- if server.storage.default_store is defined %}
 default_store = {{ server.storage.default_store }}
-{%- endif %}
-{%- if 'file' in storage_engines %}
-stores = file,http
 {%- else %}
-  {%- if server.storage.default_store is not defined %}
 default_store = {{ storage_engines[0]  }}
-  {%- endif %}
+{%- endif %}
+{%- if storage_engines is defined %}
 stores = {{ server.storage.engine }}
 {%- endif %}
 
diff --git a/metadata/service/control/storage/file.yml b/metadata/service/control/storage/file.yml
index 9f54585..f2828dc 100644
--- a/metadata/service/control/storage/file.yml
+++ b/metadata/service/control/storage/file.yml
@@ -2,5 +2,5 @@
   glance:
     server:
       storage:
-        engine: file
+        engine: file,http
         default_store: file