diff --git a/inventory/group_vars/osbs_control b/inventory/group_vars/osbs_control
index ab4d6fd238..2593a2098c 100644
--- a/inventory/group_vars/osbs_control
+++ b/inventory/group_vars/osbs_control
@@ -6,11 +6,11 @@ sudoers: "{{ private }}/files/sudo/osbs-sudoers"
 # Variables used in the ansible-ansible-openshift-ansible role in osbs-cluster playbook
 osbs_url: "osbs.fedoraproject.org"
 inventory_filename: "cluster-inventory"
-cluster_masters_group: "osbs-masters"
-cluster_nodes_group: "osbs-nodes"
-cluster_infra_group: "osbs-masters"
+cluster_masters_group: "osbs_masters"
+cluster_nodes_group: "osbs_nodes"
+cluster_infra_group: "osbs_masters"
 
 # Aarch64 variables
-aarch_masters_group: "osbs-aarch64-masters"
-aarch_nodes_group: "osbs-aarch64-nodes"
-aarch_infra_group: "osbs-aarch64-masters"
+aarch_masters_group: "osbs_aarch64_masters"
+aarch_nodes_group: "osbs_aarch64_nodes"
+aarch_infra_group: "osbs_aarch64_masters"
diff --git a/inventory/group_vars/osbs_control_stg b/inventory/group_vars/osbs_control_stg
index 11920e5de7..00f191d172 100644
--- a/inventory/group_vars/osbs_control_stg
+++ b/inventory/group_vars/osbs_control_stg
@@ -6,11 +6,11 @@ sudoers: "{{ private }}/files/sudo/osbs-sudoers"
 # Variables used in the ansible-ansible-openshift-ansible role in osbs-cluster playbook
 osbs_url: "osbs.stg.fedoraproject.org"
 inventory_filename: "cluster-inventory-stg"
-cluster_masters_group: "osbs-masters-stg"
-cluster_nodes_group: "osbs-nodes-stg"
-cluster_infra_group: "osbs-masters-stg"
+cluster_masters_group: "osbs_masters_stg"
+cluster_nodes_group: "osbs_nodes_stg"
+cluster_infra_group: "osbs_masters_stg"
 
 # Aarch64 variables
-aarch_masters_group: "osbs-aarch64-masters-stg"
-aarch_nodes_group: "osbs-aarch64-nodes-stg"
-aarch_infra_group: "osbs-aarch64-masters-stg"
+aarch_masters_group: "osbs_aarch64_masters_stg"
+aarch_nodes_group: "osbs_aarch64_nodes_stg"
+aarch_infra_group: "osbs_aarch64_masters_stg"