diff --git a/inventory/group_vars/bugzilla2fedmsg b/inventory/group_vars/bugzilla2fedmsg
new file mode 100644
index 0000000000..4721004e1d
--- /dev/null
+++ b/inventory/group_vars/bugzilla2fedmsg
@@ -0,0 +1,21 @@
+---
+lvm_size: 20000
+mem_size: 6144
+num_cpus: 2
+freezes: false
+
+# for systems that do not match the above - specify the same parameter in
+# the host_vars/$hostname file
+
+tcp_ports: [ 3000 ]
+
+fas_client_groups: sysadmin-noc,sysadmin-datanommer
+
+# These are consumed by a task in roles/fedmsg/base/main.yml
+fedmsg_certs:
+- service: shell
+  owner: root
+  group: sysadmin
+- service: bugzilla2fedmsg
+  owner: root
+  group: fedmsg
diff --git a/inventory/group_vars/bugzilla2fedmsg-stg b/inventory/group_vars/bugzilla2fedmsg-stg
new file mode 100644
index 0000000000..fe05f50077
--- /dev/null
+++ b/inventory/group_vars/bugzilla2fedmsg-stg
@@ -0,0 +1,21 @@
+---
+# Define resources for this group of hosts here. 
+lvm_size: 20000
+mem_size: 1024
+num_cpus: 1
+
+# for systems that do not match the above - specify the same parameter in
+# the host_vars/$hostname file
+
+tcp_ports: [ 3000 ]
+
+fas_client_groups: sysadmin-noc,sysadmin-datanommer
+
+# These are consumed by a task in roles/fedmsg/base/main.yml
+fedmsg_certs:
+- service: shell
+  owner: root
+  group: sysadmin
+- service: bugzilla2fedmsg
+  owner: root
+  group: fedmsg
diff --git a/inventory/host_vars/bugzilla2fedmsg01.phx2.fedoraproject.org b/inventory/host_vars/bugzilla2fedmsg01.phx2.fedoraproject.org
new file mode 100644
index 0000000000..025851ea1d
--- /dev/null
+++ b/inventory/host_vars/bugzilla2fedmsg01.phx2.fedoraproject.org
@@ -0,0 +1,10 @@
+---
+nm: 255.255.255.0
+gw: 10.5.126.254
+dns: 10.5.126.21
+
+volgroup: /dev/vg_guests00
+vmhost: virthost14.phx2.fedoraproject.org
+datacenter: phx2
+
+eth0_ip: 10.5.126.249
diff --git a/inventory/host_vars/bugzilla2fedmsg01.stg.phx2.fedoraproject.org b/inventory/host_vars/bugzilla2fedmsg01.stg.phx2.fedoraproject.org
new file mode 100644
index 0000000000..2e0eac5f03
--- /dev/null
+++ b/inventory/host_vars/bugzilla2fedmsg01.stg.phx2.fedoraproject.org
@@ -0,0 +1,10 @@
+---
+nm: 255.255.255.0
+gw: 10.5.126.254
+dns: 10.5.126.21
+
+volgroup: /dev/vg_virthost16
+vmhost: virthost16.phx2.fedoraproject.org
+datacenter: phx2
+
+eth0_ip: 10.5.126.84
diff --git a/inventory/inventory b/inventory/inventory
index 8f6b3d15a1..543b38b7b3 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -96,6 +96,12 @@ bodhi02.phx2.fedoraproject.org
 [bodhi-stg]
 bodhi01.stg.phx2.fedoraproject.org
 
+[bugzilla2fedmsg]
+bugzilla2fedmsg01.phx2.fedoraproject.org
+
+[bugzilla2fedmsg-stg]
+bugzilla2fedmsg01.stg.phx2.fedoraproject.org
+
 [bvirthost]
 bvirthost01.phx2.fedoraproject.org
 bvirthost04.phx2.fedoraproject.org
@@ -147,6 +153,7 @@ busgateway01.stg.phx2.fedoraproject.org
 # This is a list of hosts that have a fedmsg-hub running, for convenience
 [fedmsg-hubs]
 badges-backend01.phx2.fedoraproject.org
+bugzill2fedmsg01.phx2.fedoraproject.org
 busgateway01.phx2.fedoraproject.org
 notifs-backend01.phx2.fedoraproject.org
 pkgs01.phx2.fedoraproject.org
@@ -154,6 +161,7 @@ summershum01.phx2.fedoraproject.org
 
 [fedmsg-hubs-stg]
 badges-backend01.stg.phx2.fedoraproject.org
+bugzill2fedmsg01.stg.phx2.fedoraproject.org
 busgateway01.stg.phx2.fedoraproject.org
 notifs-backend01.stg.phx2.fedoraproject.org
 pkgs01.stg.phx2.fedoraproject.org