diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index 264f8f278d..aa521993b2 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -114,6 +114,11 @@ groups:
     - nl[0-9]*.open*.org
   ns:
     - ns[0-9]*.open*.org
+  openstackid-dev:
+    - openstackid-dev*.openstack.org
+  openstackid:
+    - openstackid.org
+    - openstackid[0-9]*.openstack.org
   paste:
     - paste[0-9]*.open*.org
   pbx:
@@ -150,6 +155,7 @@ groups:
     - nl[0-9]*.open*.org
     - openstackid-dev*.openstack.org
     - openstackid.org
+    - openstackid[0-9]*.openstack.org
     - paste[0-9]*.open*.org
     - pbx*.open*.org
     - planet[0-9]*.open*.org
@@ -210,6 +216,7 @@ groups:
     - nl[0-9]*.open*.org
     - openstackid-dev*.openstack.org
     - openstackid.org
+    - openstackid[0-9]*.openstack.org
     - paste[0-9]*.open*.org
     - planet[0-9]*.open*.org
     - refstack*.open*.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 3d4da0d068..711984c0e4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1062,7 +1062,8 @@ node /^backup\d+\..*\.ci\.open.*\.org$/ {
 }
 
 # Node-OS: trusty
-node 'openstackid.org' {
+node /^openstackid\d*(\.openstack)?\.org$/ {
+  $group = "openstackid"
   class { 'openstack_project::openstackid_prod':
     site_admin_password         => hiera('openstackid_site_admin_password'),
     id_mysql_host               => hiera('openstackid_id_mysql_host', 'localhost'),
@@ -1091,7 +1092,7 @@ node 'openstackid.org' {
 }
 
 # Node-OS: xenial
-node /^openstackid-dev\d*.openstack\.org$/ {
+node /^openstackid-dev\d*\.openstack\.org$/ {
   $group = "openstackid-dev"
   class { 'openstack_project::openstackid_dev':
     site_admin_password         => hiera('openstackid_dev_site_admin_password'),