diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index 1be2b84a3c..c09baf5d88 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -35,8 +35,6 @@ groups:
   files: files[0-9]*.open*.org
   firehose: firehose[0-9]*.open*.org
   futureparser:
-    - afs[0-9]*.open*.org
-    - afsdb[0-9]*.open*.org
     - ask*.open*.org
     - git.openstack.org
     - git[0-9]*.openstack.org
@@ -155,6 +153,8 @@ groups:
     - zuul[0-9]*.open*.org
     - zk[0-9]*.open*.org
   puppet4:
+    - afs[0-9]*.open*.org
+    - afsdb[0-9]*.open*.org
     - ask-staging[0-9]*.open*.org
     - cacti[0-9]*.open*.org
     - codesearch[0-9]*.open*.org
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 c0a49d02e7..33add16ce5 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
@@ -10,8 +10,8 @@ results:
   afs01.dfw.openstack.org:
     - afs
     - afs-client
-    - futureparser
     - puppet
+    - puppet4
 
   firehose01.openstack.org:
     - firehose