diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index 0edfba0b88..9db862e258 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -39,8 +39,6 @@ groups:
     - git.openstack.org
     - git[0-9]*.openstack.org
     - lists*.open*.org
-    - nb[0-9]*.open*.org
-    - nl[0-9]*.open*.org
     - ze[0-9]*.open*.org
     - zk[0-9]*.open*.org
     - zm[0-9]*.open*.org
@@ -176,6 +174,8 @@ groups:
     - logstash[0-9]*.open*.org
     - mirror-update[0-9]*.open*.org
     - ^mirror[0-9].*\..*\.(?!linaro|linaro-london|arm64ci).*\.open.*\.org
+    - ^nb(?!03)[0-9]*\.open.*\.org
+    - nl[0-9]*.open*.org
     - openstackid[0-9]*.openstack.org
     - openstackid-dev[0-9]*.openstack.org
     - paste[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 23f8082c2c..f1fdd578e4 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
@@ -63,8 +63,8 @@ results:
     - nodepool
     - nodepool-builder
     - puppet
+    - puppet4
     - webservers
-    - futureparser
 
   ze01.openstack.org:
     - afs-client