diff --git a/inventory/group_vars/os b/inventory/group_vars/os
new file mode 100644
index 0000000000..e837201446
--- /dev/null
+++ b/inventory/group_vars/os
@@ -0,0 +1,2 @@
+---
+host_group: os
diff --git a/inventory/inventory b/inventory/inventory
index 1b6651e04c..9c5c0e81a3 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -1342,6 +1342,11 @@ os-master03.stg.phx2.fedoraproject.org
 os-node01.stg.phx2.fedoraproject.org
 os-node02.stg.phx2.fedoraproject.org
 
+[os:children]
+os-nodes-stg
+os-masters-stg
+os-control-stg
+
 [ci]
 ci-cc-rdu01.fedoraproject.org
 
diff --git a/roles/hosts/files/os-hosts b/roles/hosts/files/os-hosts
new file mode 100644
index 0000000000..f07ce4176a
--- /dev/null
+++ b/roles/hosts/files/os-hosts
@@ -0,0 +1,3 @@
+127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
+209.132.182.64 registery.access.redhat.com