diff --git a/playbooks/openshift-apps/accountsystem.yml b/playbooks/openshift-apps/accountsystem.yml
index 72278ef0a1..8bee131ff9 100644
--- a/playbooks/openshift-apps/accountsystem.yml
+++ b/playbooks/openshift-apps/accountsystem.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters-stg[0]
+  hosts: os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/asknot.yml b/playbooks/openshift-apps/asknot.yml
index c8e6d5f498..d54c790396 100644
--- a/playbooks/openshift-apps/asknot.yml
+++ b/playbooks/openshift-apps/asknot.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters-stg[0]:os-masters[0]
+  hosts: os_masters_stg[0]:os_masters[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml
index b714bf5817..b2df69b9b5 100644
--- a/playbooks/openshift-apps/bodhi.yml
+++ b/playbooks/openshift-apps/bodhi.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters[0]:os-masters-stg[0]
+  hosts: os_masters[0]:os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/discourse2fedmsg.yml b/playbooks/openshift-apps/discourse2fedmsg.yml
index ca605b3764..8d93e090bc 100644
--- a/playbooks/openshift-apps/discourse2fedmsg.yml
+++ b/playbooks/openshift-apps/discourse2fedmsg.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters-stg[0]
+  hosts: os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/docsbuilding.yml b/playbooks/openshift-apps/docsbuilding.yml
index 8537315aed..d82f4ebd50 100644
--- a/playbooks/openshift-apps/docsbuilding.yml
+++ b/playbooks/openshift-apps/docsbuilding.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters[0]:os-masters-stg[0]
+  hosts: os_masters[0]:os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/elections.yml b/playbooks/openshift-apps/elections.yml
index e8f8c5ee40..77344c692e 100644
--- a/playbooks/openshift-apps/elections.yml
+++ b/playbooks/openshift-apps/elections.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters-stg[0]
+  hosts: os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/fas.yml b/playbooks/openshift-apps/fas.yml
index 9f2217499c..1e916d368c 100644
--- a/playbooks/openshift-apps/fas.yml
+++ b/playbooks/openshift-apps/fas.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters[0]:os-masters-stg[0]
+  hosts: os_masters[0]:os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/fedocal.yml b/playbooks/openshift-apps/fedocal.yml
index 918456452a..d32f0299e2 100644
--- a/playbooks/openshift-apps/fedocal.yml
+++ b/playbooks/openshift-apps/fedocal.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters-stg[0]
+  hosts: os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/fpdc.yml b/playbooks/openshift-apps/fpdc.yml
index e0d9f0645a..0994ad8aca 100644
--- a/playbooks/openshift-apps/fpdc.yml
+++ b/playbooks/openshift-apps/fpdc.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters[0]:os-masters-stg[0]
+  hosts: os_masters[0]:os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml
index 46e5d8a689..b66c9ad3d5 100644
--- a/playbooks/openshift-apps/greenwave.yml
+++ b/playbooks/openshift-apps/greenwave.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters[0]:os-masters-stg[0]
+  hosts: os_masters[0]:os_masters_stg[0]
   user: root
   gather_facts: False
 
@@ -104,7 +104,7 @@
     dcname: greenwave-fedmsg-consumers
 
 - name: Change the route haproxy default timeout
-  hosts: os-masters[0]:os-masters-stg[0]
+  hosts: os_masters[0]:os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml
index 113015b8fd..28d204da29 100644
--- a/playbooks/openshift-apps/koschei.yml
+++ b/playbooks/openshift-apps/koschei.yml
@@ -1,5 +1,5 @@
 - name: provision koschei
-  hosts: os-masters-stg[0]
+  hosts: os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/mdapi.yml b/playbooks/openshift-apps/mdapi.yml
index 4d7b58e2b0..4d99ac982c 100644
--- a/playbooks/openshift-apps/mdapi.yml
+++ b/playbooks/openshift-apps/mdapi.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters-stg[0]:os-masters
+  hosts: os_masters_stg[0]:os_masters
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml
index df6d1237c4..feb1265338 100644
--- a/playbooks/openshift-apps/messaging-bridges.yml
+++ b/playbooks/openshift-apps/messaging-bridges.yml
@@ -1,7 +1,7 @@
 # Create the RabbitMQ users
 
 - name: setup RabbitMQ
-  hosts: rabbitmq[0]:rabbitmq-stg[0]
+  hosts: rabbitmq[0]:rabbitmq_stg[0]
   user: root
   gather_facts: False
 
@@ -103,7 +103,7 @@
 # Now create the app
 
 - name: make the app be real
-  hosts: os-masters[0]:os-masters-stg[0]
+  hosts: os_masters[0]:os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/modernpaste.yml b/playbooks/openshift-apps/modernpaste.yml
index 6521180aa7..d21aca88f8 100644
--- a/playbooks/openshift-apps/modernpaste.yml
+++ b/playbooks/openshift-apps/modernpaste.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters-stg[0]
+  hosts: os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/nuancier.yml b/playbooks/openshift-apps/nuancier.yml
index 31e8d2ecae..5e3e98af11 100644
--- a/playbooks/openshift-apps/nuancier.yml
+++ b/playbooks/openshift-apps/nuancier.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters-stg[0]
+  hosts: os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/rats.yml b/playbooks/openshift-apps/rats.yml
index a3fdb0bb47..e692587df1 100644
--- a/playbooks/openshift-apps/rats.yml
+++ b/playbooks/openshift-apps/rats.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters-stg[0]
+  hosts: os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/release-monitoring.yml b/playbooks/openshift-apps/release-monitoring.yml
index 35e7db9f7b..67a4784897 100644
--- a/playbooks/openshift-apps/release-monitoring.yml
+++ b/playbooks/openshift-apps/release-monitoring.yml
@@ -1,7 +1,7 @@
 # Deploy the app
 
 - name: make the app be real
-  hosts: os-masters-stg[0]:os-masters[0]
+  hosts: os_masters_stg[0]:os_masters[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/silverblue.yml b/playbooks/openshift-apps/silverblue.yml
index 534fcade8c..83ef4e7c73 100644
--- a/playbooks/openshift-apps/silverblue.yml
+++ b/playbooks/openshift-apps/silverblue.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters[0]:os-masters-stg[0]
+  hosts: os_masters[0]:os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/the-new-hotness.yml b/playbooks/openshift-apps/the-new-hotness.yml
index dfad65a9e0..67aa645dde 100644
--- a/playbooks/openshift-apps/the-new-hotness.yml
+++ b/playbooks/openshift-apps/the-new-hotness.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters-stg[0]
+  hosts: os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/transtats.yml b/playbooks/openshift-apps/transtats.yml
index 5df79ef3af..626434464a 100644
--- a/playbooks/openshift-apps/transtats.yml
+++ b/playbooks/openshift-apps/transtats.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters[0]:os-masters-stg[0]
+  hosts: os_masters[0]:os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml
index 01ee68ea43..7efcc1c587 100644
--- a/playbooks/openshift-apps/waiverdb.yml
+++ b/playbooks/openshift-apps/waiverdb.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters[0]:os-masters-stg[0]
+  hosts: os_masters[0]:os_masters_stg[0]
   user: root
   gather_facts: False
 
diff --git a/playbooks/openshift-apps/websites.yml b/playbooks/openshift-apps/websites.yml
index be0806fad9..3331da172a 100644
--- a/playbooks/openshift-apps/websites.yml
+++ b/playbooks/openshift-apps/websites.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os-masters-stg[0]:os-masters[0]
+  hosts: os_masters_stg[0]:os_masters[0]
   user: root
   gather_facts: False