diff --git a/planetstack/openstack/observer.py b/planetstack/openstack/observer.py
index c14b2cb..aeda8d1 100644
--- a/planetstack/openstack/observer.py
+++ b/planetstack/openstack/observer.py
@@ -105,7 +105,7 @@
         tenants = self.manager.driver.shell.keystone.tenants.findall()
         system_tenants = ['admin','service']
         for tenant in tenants:
-            if tenant.name == 'admin': 
+            if tenant.name in system_tenants: 
                 continue
             if tenant.name not in site_dict and tenant.name not in slice_dict:
                 try: