diff --git a/inventory/backups b/inventory/backups
index ed92428f17..e1693d5357 100644
--- a/inventory/backups
+++ b/inventory/backups
@@ -14,8 +14,7 @@ pagure01.fedoraproject.org
 people01.fedoraproject.org
 pkgs02.phx2.fedoraproject.org
 log01.phx2.fedoraproject.org
-# re-add this once we have rhit firewall allowing it
-#qadevel.qa.fedoraproject.org:222
+qadevel.qa.fedoraproject.org:222
 db-qa01.qa.fedoraproject.org
 db-koji01.phx2.fedoraproject.org
 copr-be.cloud.fedoraproject.org
diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
index 68139da6c0..395e058e2e 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
@@ -21,11 +21,11 @@ subnet 10.5.126.0 netmask 255.255.255.0 {
         option host-name "virthost02";
     }
 
-    host virthost04 {
+    host atomic-qa01 {
         hardware ethernet e4:1f:13:ba:84:d0;
         fixed-address 10.5.126.144;
         next-server 10.5.126.41;
-        option host-name "virthost04";
+        option host-name "atomic-qa01";
 	filename "pxelinux.0";
     }
 
diff --git a/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org
index 2a7dbb0391..c2ce1afdf3 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org
@@ -25,11 +25,11 @@ subnet 10.5.126.0 netmask 255.255.255.0 {
         option host-name "virthost02";
     }
 
-    host virthost04 {
+    host atomic-qa01 {
         hardware ethernet e4:1f:13:ba:84:d0;
         fixed-address 10.5.126.144;
         next-server 10.5.126.41;
-        option host-name "virthost04";
+        option host-name "atomic-qa01";
 	filename "pxelinux.0";
     }
 
diff --git a/roles/fedmsg/irc/templates/ircbot.py b/roles/fedmsg/irc/templates/ircbot.py
index 8b7665126e..f26ec01b05 100644
--- a/roles/fedmsg/irc/templates/ircbot.py
+++ b/roles/fedmsg/irc/templates/ircbot.py
@@ -174,6 +174,25 @@ config = dict(
             ),
         ),
 
+        # And for #fedora-g11n
+        dict(
+            network='chat.freenode.net',
+            port=6667,
+            make_pretty=True,
+            make_terse=True,
+
+            {% if env == 'staging' %}
+            nickname='fedmsg-g11n-stg',
+            {% else %}
+            nickname='fedmsg-g11n',
+            {% endif %}
+            channel='#fedora-g11n',
+            # If the word G11N appears in any message, forward it.
+            filters=dict(
+                body=['^((?!G11N).)*$'],
+            ),
+        ),
+
         # Hook up the design-team with badges messages
         dict(
             network='chat.freenode.net',