diff --git a/deployment/puppet/openstack_tasks/examples/swift/tasks.yaml b/deployment/puppet/openstack_tasks/examples/swift/tasks.yaml
index 1b4eb234db..b7b19aa4dd 100644
--- a/deployment/puppet/openstack_tasks/examples/swift/tasks.yaml
+++ b/deployment/puppet/openstack_tasks/examples/swift/tasks.yaml
@@ -6,7 +6,7 @@
   requires: [openstack-controller, memcached]
   condition:
     yaql_exp: &swift_enabled >
-      (not $.storage.objects_ceph and not $.storage.images_ceph) and
+      not $.storage.objects_ceph and
       (changedAny($.network_scheme, $.network_metadata, $.swift,
         $.get('swift_master_role', 'primary-controller'),
         $.get('swift_object_roles'), ('primary-controller' in $.roles),
@@ -63,7 +63,7 @@
   requires: [swift-proxy_storage, primary-swift-proxy_storage]
   condition:
     yaql_exp: >
-      (not $.storage.objects_ceph and not $.storage.images_ceph) and
+      not $.storage.objects_ceph and
       (changedAny($.storage, $.get('swift_master_role', 'primary-controller'),
         $.get('swift_ring_min_part_hours'),('primary-controller' in $.roles)))
   parameters:
@@ -83,7 +83,7 @@
     - name: swift-proxy_storage
   condition:
     yaql_exp: >
-      (not $.storage.objects_ceph and not $.storage.images_ceph) and
+      not $.storage.objects_ceph and
       (changedAny($.swift, $.network_metadata.vips,
         $.get('region', 'RegionOne'), $.public_ssl, $.get('use_ssl')))
   parameters:
diff --git a/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_radosgw.pp b/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_radosgw.pp
index e966503daf..c60cd8a780 100644
--- a/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_radosgw.pp
+++ b/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_radosgw.pp
@@ -12,7 +12,7 @@ class osnailyfacter::openstack_haproxy::openstack_haproxy_radosgw {
   $external_lb      = hiera('external_lb', false)
 
   if !$external_lb {
-    if (!$storage_hash['images_ceph'] and !$storage_hash['objects_ceph']) {
+    if !$storage_hash['objects_ceph'] {
       $use_swift = true
     } else {
       $use_swift = false
diff --git a/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_swift.pp b/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_swift.pp
index 08c4559514..72b397e1d1 100644
--- a/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_swift.pp
+++ b/deployment/puppet/osnailyfacter/manifests/openstack_haproxy/openstack_haproxy_swift.pp
@@ -15,7 +15,7 @@ class osnailyfacter::openstack_haproxy::openstack_haproxy_swift {
 
   $external_lb       = hiera('external_lb', false)
 
-  if (!$storage_hash['images_ceph'] and !$storage_hash['objects_ceph']) {
+  if !$storage_hash['objects_ceph'] {
     $use_swift = true
   } else {
     $use_swift = false