diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index 3c43c3cd96..60deb58bf8 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -38,7 +38,6 @@ groups:
     - afs[0-9]*.open*.org
     - afsdb[0-9]*.open*.org
     - ask*.open*.org
-    - ask-staging[0-9]*.open*.org
     - git.openstack.org
     - git[0-9]*.openstack.org
     - grafana[0-9]*.open*.org
@@ -54,7 +53,6 @@ groups:
     - mirror[0-9]*.*.*.open*.org
     - nb[0-9]*.open*.org
     - nl[0-9]*.open*.org
-    - openstackid-dev[0-9]*.openstack.org
     - openstackid[0-9]*.openstack.org
     - paste[0-9]*.open*.org
     - pbx[0-9]*.opendev.org
@@ -177,6 +175,7 @@ groups:
     - zuul[0-9]*.open*.org
     - zk[0-9]*.open*.org
   puppet4:
+    - ask-staging[0-9]*.open*.org
     - cacti[0-9]*.open*.org
     - codesearch[0-9]*.open*.org
     - eavesdrop[0-9]*.open*.org
@@ -188,6 +187,7 @@ groups:
     - firehose[0-9]*.open*.org
     - groups-dev[0-9]*.open*.org
     - lists-dev[0-9]*.open*.org
+    - openstackid-dev[0-9]*.openstack.org
     - review-dev[0-9]*.open*.org
     - storyboard-dev[0-9]*.opendev.org
     - translate-dev[0-9]*.open*.org