diff --git a/cleanup.py b/cleanup.py
index b69cd62..f641a95 100644
--- a/cleanup.py
+++ b/cleanup.py
@@ -29,10 +29,15 @@
 image = cloud.image
 network = cloud.network
 orchestration = cloud.orchestration
-object_store = cloud.object_store
 volume = cloud.volume
 load_balancer = cloud.load_balancer
 
+# Check if Object Storage is present on the cloud, else skip
+object_store_present = any(service.type == 'object-store' for service
+                           in list(identity.services()))
+if object_store_present:
+    object_store = cloud.object_store
+
 mask = "cvp|s_rally|rally_|tempest-|tempest_|spt|fio"
 full_mask = f"^(?!.*(manual|-static-)).*({mask}).*$"
 mask_pattern = re.compile(full_mask, re.IGNORECASE)
@@ -454,7 +459,10 @@
     cleanup_load_balancers()
     cleanup_servers()
     cleanup_flavors()
-    cleanup_volume_backups()
+    try:  # Skip if cinder-backup service is not enabled
+        cleanup_volume_backups()
+    except openstack.exceptions.ResourceNotFound:
+        pass
     cleanup_snapshots()
     cleanup_volumes()
     cleanup_volume_groups()
@@ -469,7 +477,8 @@
     cleanup_regions()
     cleanup_routers()
     cleanup_networks()
-    cleanup_containers()
+    if object_store_present:
+        cleanup_containers()
     cleanup_floating_ips()
 
     if args.projects: