diff --git a/inventory/host_vars/docker-registry01.phx2.fedoraproject.org b/inventory/host_vars/docker-registry01.phx2.fedoraproject.org
new file mode 100644
index 0000000000..62015079f9
--- /dev/null
+++ b/inventory/host_vars/docker-registry01.phx2.fedoraproject.org
@@ -0,0 +1,18 @@
+---
+nm: 255.255.255.0
+gw: 10.5.125.254
+dns: 10.5.126.21
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
+ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
+volgroup: /dev/VirtGuests
+eth0_ip: 10.5.125.56
+vmhost: bvirthost07.phx2.fedoraproject.org
+datacenter: phx2
+
+nrpe_procs_warn: 900
+nrpe_procs_crit: 1000
+
+lvm_size: 120g
+mem_size: 16384
+max_mem_size: 16384
+num_cpus: 4
diff --git a/inventory/host_vars/docker-registry01.stg.phx2.fedoraproject.org b/inventory/host_vars/docker-registry01.stg.phx2.fedoraproject.org
new file mode 100644
index 0000000000..7bf36c496a
--- /dev/null
+++ b/inventory/host_vars/docker-registry01.stg.phx2.fedoraproject.org
@@ -0,0 +1,18 @@
+---
+nm: 255.255.255.0
+gw: 10.5.125.254
+dns: 10.5.126.21
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
+ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
+volgroup: /dev/VirtGuests
+eth0_ip: 10.5.125.55
+vmhost: bvirthost07.phx2.fedoraproject.org
+datacenter: phx2
+
+nrpe_procs_warn: 900
+nrpe_procs_crit: 1000
+
+lvm_size: 120g
+mem_size: 8192
+max_mem_size: 16384
+num_cpus: 4
diff --git a/inventory/host_vars/osbs-master01.phx2.fedoraproject.org b/inventory/host_vars/osbs-master01.phx2.fedoraproject.org
new file mode 100644
index 0000000000..62015079f9
--- /dev/null
+++ b/inventory/host_vars/osbs-master01.phx2.fedoraproject.org
@@ -0,0 +1,18 @@
+---
+nm: 255.255.255.0
+gw: 10.5.125.254
+dns: 10.5.126.21
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
+ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
+volgroup: /dev/VirtGuests
+eth0_ip: 10.5.125.56
+vmhost: bvirthost07.phx2.fedoraproject.org
+datacenter: phx2
+
+nrpe_procs_warn: 900
+nrpe_procs_crit: 1000
+
+lvm_size: 120g
+mem_size: 16384
+max_mem_size: 16384
+num_cpus: 4
diff --git a/inventory/host_vars/osbs-master01.stg.phx2.fedoraproject.org b/inventory/host_vars/osbs-master01.stg.phx2.fedoraproject.org
new file mode 100644
index 0000000000..3a061663c1
--- /dev/null
+++ b/inventory/host_vars/osbs-master01.stg.phx2.fedoraproject.org
@@ -0,0 +1,18 @@
+---
+nm: 255.255.255.0
+gw: 10.5.125.254
+dns: 10.5.126.21
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
+ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
+volgroup: /dev/VirtGuests
+eth0_ip: 10.5.125.53
+vmhost: bvirthost07.phx2.fedoraproject.org
+datacenter: phx2
+
+nrpe_procs_warn: 900
+nrpe_procs_crit: 1000
+
+lvm_size: 120g
+mem_size: 8192
+max_mem_size: 16384
+num_cpus: 4
diff --git a/inventory/inventory b/inventory/inventory
index 54fc548f03..107ccfb23b 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -647,6 +647,8 @@ mm-backend01.stg.phx2.fedoraproject.org
 mm-crawler01.stg.phx2.fedoraproject.org
 beaker-stg01.qa.fedoraproject.org
 zanata2fedmsg01.stg.phx2.fedoraproject.org
+osbs-master01.stg.phx2.fedoraproject.org
+docker-registry01.stg.phx2.fedoraproject.org
 
 # This is a list of hosts that are a little "friendly" with staging.
 # They are exempted from the iptables wall between staging and prod.
@@ -1142,3 +1144,7 @@ taskotron-client22.qa.fedoraproject.org
 taskotron-client23.qa.fedoraproject.org
 taskotron-client24.qa.fedoraproject.org
 taskotron-client25.qa.fedoraproject.org
+
+[osbs-hurd]
+docker-registry01.phx2.fedoraproject.org.
+osbs-master01.phx2.fedoraproject.org