diff --git a/inventory/group_vars/blockerbugs b/inventory/group_vars/blockerbugs
index a5f2fae40e..01a3761679 100644
--- a/inventory/group_vars/blockerbugs
+++ b/inventory/group_vars/blockerbugs
@@ -15,3 +15,5 @@ fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-qa
 
 # This gets overridden by whichever node we want to run special cronjobs.
 master_blockerbugs_node: False
+
+host_group: blockerbugs
diff --git a/inventory/host_vars/blockerbugs02.phx2.fedoraproject.org b/inventory/host_vars/blockerbugs02.phx2.fedoraproject.org
new file mode 100644
index 0000000000..b7be35b45e
--- /dev/null
+++ b/inventory/host_vars/blockerbugs02.phx2.fedoraproject.org
@@ -0,0 +1,13 @@
+---
+nm: 255.255.255.0
+gw: 10.5.126.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/vg_guests00
+eth0_ip: 10.5.126.54
+vmhost: virthost14.phx2.fedoraproject.org
+datacenter: phx2
+
+# This is the secondary node
+master_blockerbugs_node: False
diff --git a/roles/hosts/blockerbugs-hosts b/roles/hosts/blockerbugs-hosts
new file mode 100644
index 0000000000..914d4b81cd
--- /dev/null
+++ b/roles/hosts/blockerbugs-hosts
@@ -0,0 +1,4 @@
+127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
+10.5.126.23 infrastructure.fedoraproject.org
+10.5.126.71 db-blockerbugs.phx2.fedoraproject.org db01.phx2.fedoraproject.org