diff --git a/packstack/puppet/modules/packstack/manifests/glance.pp b/packstack/puppet/modules/packstack/manifests/glance.pp
index ec883802c..e6fb79618 100644
--- a/packstack/puppet/modules/packstack/manifests/glance.pp
+++ b/packstack/puppet/modules/packstack/manifests/glance.pp
@@ -33,7 +33,9 @@ class packstack::glance ()
       pipeline            => 'keystone',
       database_connection => "mysql+pymysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
       workers             => hiera('CONFIG_SERVICE_WORKERS'),
-      stores              => ['file', 'http', 'swift'],
-      default_store       => $default_store,
+      enabled_backends    => ["${default_store}:${default_store}", "http:http"],
+      default_backend     => $default_store,
     }
+
+    glance::backend::multistore::http { 'http': }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/glance/backend/file.pp b/packstack/puppet/modules/packstack/manifests/glance/backend/file.pp
index 58b88bc74..59d8661ae 100644
--- a/packstack/puppet/modules/packstack/manifests/glance/backend/file.pp
+++ b/packstack/puppet/modules/packstack/manifests/glance/backend/file.pp
@@ -1,7 +1,6 @@
 class packstack::glance::backend::file ()
 {
-    # TO-DO: Make this configurable
-    class { 'glance::backend::file':
+    glance::backend::multistore::file { 'file':
       filesystem_store_datadir => '/var/lib/glance/images/',
     }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/glance/backend/swift.pp b/packstack/puppet/modules/packstack/manifests/glance/backend/swift.pp
index 02af7fb16..08a3fe8cf 100644
--- a/packstack/puppet/modules/packstack/manifests/glance/backend/swift.pp
+++ b/packstack/puppet/modules/packstack/manifests/glance/backend/swift.pp
@@ -7,7 +7,7 @@ class packstack::glance::backend::swift ()
       default => '3',
     }
 
-    class { 'glance::backend::swift':
+    glance::backend::multistore::swift { 'swift':
       swift_store_user                    => 'services:glance',
       swift_store_key                     => hiera('CONFIG_GLANCE_KS_PW'),
       swift_store_auth_address            => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),