diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index b5505d88b2..03b497561b 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -270,17 +270,7 @@ groups:
     - translate01.openstack.org
     - wiki-dev01.openstack.org
     - wiki-upgrade-test.openstack.org
-    - ze01.openstack.org
-    - ze02.openstack.org
-    - ze03.openstack.org
-    - ze04.openstack.org
-    - ze05.openstack.org
-    - ze06.openstack.org
-    - ze07.openstack.org
-    - ze08.openstack.org
-    - ze09.openstack.org
-    - ze10.openstack.org
-    - ze11.openstack.org
+    - ze[0-9]*.openstack.org
     - zk01.openstack.org
     - zk02.openstack.org
     - zk03.openstack.org
@@ -356,17 +346,7 @@ groups:
     - zk02.openstack.org
     - zk03.openstack.org
   zuul-executor:
-    - ze01.openstack.org
-    - ze02.openstack.org
-    - ze03.openstack.org
-    - ze04.openstack.org
-    - ze05.openstack.org
-    - ze06.openstack.org
-    - ze07.openstack.org
-    - ze08.openstack.org
-    - ze09.openstack.org
-    - ze10.openstack.org
-    - ze11.openstack.org
+    - ze[0-9]*.openstack.org
   zuul-merger:
     - zm[0-9]*.openstack.org
   zuul-scheduler: