diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml
index 2644a9b338..b21282bf12 100644
--- a/inventory/service/groups.yaml
+++ b/inventory/service/groups.yaml
@@ -1,13 +1,10 @@
 plugin: yamlgroup
 groups:
   adns: adns*.open*.org
-  afs-1.8:
-    - afs01.ord.openstack.org
-    - afs02.dfw.openstack.org
   afs:
     - afs01.dfw.openstack.org
-    - afsdb01.openstack.org
-    - afsdb02.openstack.org
+    - afs02.dfw.openstack.org
+    - afs01.ord.openstack.org
   afs-client:
     - review-dev[0-9]*.open*.org
     - mirror[0-9]*.opendev.org
@@ -145,7 +142,6 @@ groups:
   pbx:
     - pbx[0-9]*.opendev.org
   puppet:
-    - afs01.dfw.openstack.org
     - afsdb01.openstack.org
     - afsdb02.openstack.org
     - ask*.open*.org
@@ -180,7 +176,6 @@ groups:
     - wiki-dev[0-9]*.openstack.org
     - wiki[0-9]*.openstack.org
   puppet4:
-    - afs01.dfw.openstack.org
     - afsdb01.openstack.org
     - afsdb02.openstack.org
     - ask*.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 ae59ded35d..08fd64e600 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,6 @@ results:
   afs01.dfw.openstack.org:
     - afs
     - afs-client
-    - puppet
-    - puppet4
 
   firehose01.openstack.org:
     - firehose
diff --git a/playbooks/service-afs.yaml b/playbooks/service-afs.yaml
index e22c7fd105..c1f517a92b 100644
--- a/playbooks/service-afs.yaml
+++ b/playbooks/service-afs.yaml
@@ -4,13 +4,13 @@
   roles:
     - puppet-setup-ansible
 
-- hosts: "afs:afsdb:!disabled"
+- hosts: "afsdb:!disabled"
   name: "AFS: run puppet on the AFS servers"
   strategy: free
   roles:
     - puppet-run
 
-- hosts: "afs-1.8:!disabled"
+- hosts: "afs:!disabled"
   name: "Configure AFS server"
   roles:
     - openafs-server
@@ -26,7 +26,7 @@
       register: vos_release_keypair
 
 # Note: relies on vos_release_keypair installed to mirror above
-- hosts: "afs:afs-1.8:!disabled"
+- hosts: "afs:!disabled"
   name: "Allow remote vos_release"
   roles:
     - vos-release