diff --git a/master.yml b/master.yml
index ae4019d28b..4ab022efb0 100644
--- a/master.yml
+++ b/master.yml
@@ -100,7 +100,6 @@
 #
 
 - include: /srv/web/infra/ansible/playbooks/hosts/artboard.cloud.fedoraproject.org.yml
-- include: /srv/web/infra/ansible/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml
 - include: /srv/web/infra/ansible/playbooks/hosts/bodhi.dev.fedoraproject.org.yml
 - include: /srv/web/infra/ansible/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml
 - include: /srv/web/infra/ansible/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml
@@ -111,3 +110,4 @@
 - include: /srv/web/infra/ansible/playbooks/hosts/logserver.yml
 - include: /srv/web/infra/ansible/playbooks/hosts/logstash-dev.cloud.fedoraproject.org.yml
 - include: /srv/web/infra/ansible/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml
+- include: /srv/web/infra/ansible/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml
diff --git a/roles/nagios_server/files/nagios/hosts/mm-backend01-stg.cfg b/roles/nagios_server/files/nagios/hosts/mm-backend01-stg.cfg
new file mode 100644
index 0000000000..534d4f2b3d
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/mm-backend01-stg.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    mm-backend01.stg
+  alias                        mm-backend01.stg.phx2.fedoraproject.org
+  use                          defaulttemplate
+  address                      mm-backend01.stg.phx2.fedoraproject.org
+  parents                      virthost16 
+}
diff --git a/roles/nagios_server/files/nagios/hosts/mm-backend01.cfg b/roles/nagios_server/files/nagios/hosts/mm-backend01.cfg
new file mode 100644
index 0000000000..502578f622
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/mm-backend01.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    mm-backend01
+  alias                        mm-backend01.phx2.fedoraproject.org
+  use                          defaulttemplate
+  address                      mm-backend01.phx2.fedoraproject.org
+  parents                      virthost03 
+}
diff --git a/roles/nagios_server/files/nagios/hosts/mm-crawler01-stg.cfg b/roles/nagios_server/files/nagios/hosts/mm-crawler01-stg.cfg
new file mode 100644
index 0000000000..9c24b31bbf
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/mm-crawler01-stg.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    mm-crawler01.stg
+  alias                        mm-crawler01.stg.phx2.fedoraproject.org
+  use                          defaulttemplate
+  address                      mm-crawler01.stg.phx2.fedoraproject.org
+  parents                      virthost11 
+}
diff --git a/roles/nagios_server/files/nagios/hosts/mm-crawler01.cfg b/roles/nagios_server/files/nagios/hosts/mm-crawler01.cfg
new file mode 100644
index 0000000000..bf30015b8f
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/mm-crawler01.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    mm-crawler01
+  alias                        mm-crawler01.phx2.fedoraproject.org
+  use                          defaulttemplate
+  address                      mm-crawler01.phx2.fedoraproject.org
+  parents                      virthost02 
+}
diff --git a/roles/nagios_server/files/nagios/hosts/mm-crawler02.cfg b/roles/nagios_server/files/nagios/hosts/mm-crawler02.cfg
new file mode 100644
index 0000000000..fe70fa4e24
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/mm-crawler02.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    mm-crawler02
+  alias                        mm-crawler02.phx2.fedoraproject.org
+  use                          defaulttemplate
+  address                      mm-crawler02.phx2.fedoraproject.org
+  parents                      virthost03 
+}
diff --git a/roles/nagios_server/files/nagios/hosts/mm-frontend01-stg.cfg b/roles/nagios_server/files/nagios/hosts/mm-frontend01-stg.cfg
new file mode 100644
index 0000000000..c87a3f9bd3
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/mm-frontend01-stg.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    mm-frontend01.stg
+  alias                        mm-frontend01.stg.phx2.fedoraproject.org
+  use                          defaulttemplate
+  address                      mm-frontend01.stg.phx2.fedoraproject.org
+  parents                      virthost16 
+}
diff --git a/roles/nagios_server/files/nagios/hosts/mm-frontend01.cfg b/roles/nagios_server/files/nagios/hosts/mm-frontend01.cfg
new file mode 100644
index 0000000000..dbc156df3f
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/mm-frontend01.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    mm-frontend01
+  alias                        mm-frontend01.phx2.fedoraproject.org
+  use                          defaulttemplate
+  address                      mm-frontend01.phx2.fedoraproject.org
+  parents                      virthost02 
+}