diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index cd88214227..2e955a1eca 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -37,10 +37,6 @@ groups:
   futureparser:
     - ask*.open*.org
     - lists*.open*.org
-    - ze[0-9]*.open*.org
-    - zk[0-9]*.open*.org
-    - zm[0-9]*.open*.org
-    - zuul01.open*.org
   gerrit:
     - review-dev[0-9]*.open*.org
     - review[0-9]*.open*.org
@@ -186,6 +182,10 @@ groups:
     - translate-dev[0-9]*.open*.org
     - wiki[0-9]*.openstack.org
     - wiki-dev[0-9]*.openstack.org
+    - ze[0-9]*.open*.org
+    - zk[0-9]*.open*.org
+    - zm[0-9]*.open*.org
+    - zuul01.open*.org
   refstack:
     - refstack*.open*.org
   registry:
diff --git a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
index 84ffa800b9..011c35e6a1 100644
--- a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
+++ b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
@@ -69,10 +69,10 @@ results:
   ze01.openstack.org:
     - afs-client
     - puppet
+    - puppet4
     - zuul-executor
-    - futureparser
 
   zk01.openstack.org:
     - puppet
+    - puppet4
     - zookeeper
-    - futureparser