diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml
index b4870c215e..4b56286dcf 100644
--- a/playbooks/groups/os-cluster.yml
+++ b/playbooks/groups/os-cluster.yml
@@ -140,9 +140,9 @@
         openshift_ansible_ssh_user: root,
         openshift_ansible_install_examples: true,
         openshift_ansible_containerized_deploy: false,
-        openshift_cluster_masters_group: "os-masters-stg",
-        openshift_cluster_nodes_group: "os-nodes-stg",
-        openshift_cluster_infra_group: "os-nodes-stg",
+        openshift_cluster_masters_group: "os_masters_stg",
+        openshift_cluster_nodes_group: "os_nodes_stg",
+        openshift_cluster_infra_group: "os_nodes_stg",
         openshift_auth_profile: "fedoraidp-stg",
         openshift_master_ha: true,
         openshift_debug_level: 1,
@@ -169,9 +169,9 @@
         openshift_ansible_ssh_user: root,
         openshift_ansible_install_examples: true,
         openshift_ansible_containerized_deploy: false,
-        openshift_cluster_masters_group: "os-masters",
-        openshift_cluster_nodes_group: "os-nodes",
-        openshift_cluster_infra_group: "os-nodes",
+        openshift_cluster_masters_group: "os_masters",
+        openshift_cluster_nodes_group: "os_nodes",
+        openshift_cluster_infra_group: "os_nodes",
         openshift_auth_profile: "fedoraidp",
         openshift_master_ha: true,
         openshift_debug_level: 1,
diff --git a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
index d016903de0..8074ca9262 100644
--- a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
@@ -97,7 +97,7 @@
 #
 
 - name: setup db users/passwords for mailman and hyperkitty
-  hosts: lists_dev.fedorainfracloud.org
+  hosts: lists-dev.fedorainfracloud.org
   gather_facts: no
   become: yes
   become_user: postgres
@@ -125,7 +125,7 @@
 
 
 - name: setup mailman and hyperkitty
-  hosts: lists_dev.fedorainfracloud.org
+  hosts: lists-dev.fedorainfracloud.org
   gather_facts: True
   vars_files:
   - /srv/web/infra/ansible/vars/global.yml
diff --git a/playbooks/openshift-apps/ipsilon.yml b/playbooks/openshift-apps/ipsilon.yml
index 4ce1edbbc1..96a4c29ef0 100644
--- a/playbooks/openshift-apps/ipsilon.yml
+++ b/playbooks/openshift-apps/ipsilon.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