diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index 852fe7ab1..ea62d27c5 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -264,7 +264,7 @@ if $step == 2 {
   # TODO: notifications, scrubber, etc.
   include ::glance::api
   include ::glance::registry
-  include ::glance::backend::swift
+  include ::glance::backend::file
   include ::glance::notify::rabbitmq
 
   class { '::nova':
diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index f37525b0a..9c54d3c5b 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -71,9 +71,10 @@ glance::api::identity_uri: "%{hiera('keystone_identity_uri')}"
 glance::api::registry_host: {{LOCAL_IP}}
 glance::api::keystone_password: {{UNDERCLOUD_GLANCE_PASSWORD}}
 glance::api::stores:
-  - glance.store.filesystem.Store
-  - glance.store.swift.Store
-glance::api::default_store: 'glance.store.swift.Store'
+  - file
+# For now, we can't enable Swift backend because of OOM issue.
+# See https://bugs.launchpad.net/tripleo/+bug/1595916
+glance::api::default_store: 'file'
 glance::api::pipeline: 'keystone'
 # used to construct glance_api_servers
 glance_port: 9292