diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml
index 5b29a4ea71..96cf275933 100644
--- a/playbooks/groups/mirrormanager.yml
+++ b/playbooks/groups/mirrormanager.yml
@@ -32,7 +32,7 @@
   - fas_client
   - sudo
   - collectd/base
-  - { role: openvpn/client, when: env != "staging" and inventory_hostname.startswith('mm-frontend01')  }
+  - { role: openvpn/client, when: env != "staging" and inventory_hostname.startswith('mm-frontend')  }
   - { role: nfs/client, when: inventory_hostname.startswith('mm-backend01'), mnt_dir: '/srv/pub',  nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' }
 
   tasks:
diff --git a/roles/fedmsg/base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2
index 0c5e44bc37..643f7e847d 100644
--- a/roles/fedmsg/base/templates/endpoints.py.j2
+++ b/roles/fedmsg/base/templates/endpoints.py.j2
@@ -61,6 +61,12 @@ config = dict(
             "tcp://mm-frontend01.%s:30%02i" % (suffix, i)
             for i in range(2)
         ],
+{% if env != 'staging' %}
+        "mirrormanager2.mm-frontend02": [
+            "tcp://mm-frontend02.%s:30%02i" % (suffix, i)
+            for i in range(2)
+        ],
+{% endif %}
 
         # mizdebsk says he thinks we'll need four sockets.  Two services
         # (koschei-resolver and koschei-polling) are only sending messages, one
diff --git a/roles/nagios_server/files/nagios/hosts/mm-frontend02.cfg b/roles/nagios_server/files/nagios/hosts/mm-frontend02.cfg
new file mode 100644
index 0000000000..aa2013bc0e
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/mm-frontend02.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    mm-frontend02
+  alias                        mm-frontend02.phx2.fedoraproject.org
+  use                          defaulttemplate
+  address                      mm-frontend02.phx2.fedoraproject.org
+  parents                      virthost02 
+}
diff --git a/roles/nagios_server/files/nagios/services/websites.cfg b/roles/nagios_server/files/nagios/services/websites.cfg
index d7b9b2177b..2a32ba36f8 100644
--- a/roles/nagios_server/files/nagios/services/websites.cfg
+++ b/roles/nagios_server/files/nagios/services/websites.cfg
@@ -44,7 +44,7 @@ define service {
 }
 
 define service {
-  host_name             mm-frontend01,mm-frontend01.stg
+  host_name             mm-frontend01,mm-frontend02,mm-frontend01.stg
   service_description   mm-publiclist-internal
   check_command         check_website!localhost!/mirrormanager/api/mirroradmins/?name=dl.fedoraproject.org
   use                   internalwebsitetemplate