diff --git a/inventory/group_vars/os b/inventory/group_vars/os
index 20ab63b8ff..4601e8161f 100644
--- a/inventory/group_vars/os
+++ b/inventory/group_vars/os
@@ -4,3 +4,10 @@ baseiptables: False
 no_http2: True
 nm_controlled_resolv: True
 #openshift_ansible_upgrading: False
+ipa_host_group: openshift
+ipa_host_group_desc: OpenShift cluster
+
+ipa_client_shell_groups:
+- sysadmin-openshift
+ipa_client_sudo_groups:
+- sysadmin-openshift
diff --git a/inventory/group_vars/os_control b/inventory/group_vars/os_control
index 1c1f09fb5c..cd55a7ced5 100644
--- a/inventory/group_vars/os_control
+++ b/inventory/group_vars/os_control
@@ -3,7 +3,3 @@
 os_url: os.fedoraproject.org
 os_app_url: app.os.fedoraproject.org
 
-ipa_client_shell_groups:
-- sysadmin-openshift
-ipa_client_sudo_groups:
-- sysadmin-openshift
diff --git a/inventory/group_vars/os_control_stg b/inventory/group_vars/os_control_stg
index d0aaf440f6..7394cd849b 100644
--- a/inventory/group_vars/os_control_stg
+++ b/inventory/group_vars/os_control_stg
@@ -3,7 +3,3 @@
 os_url: os.stg.fedoraproject.org
 os_app_url: app.os.stg.fedoraproject.org
 
-ipa_client_shell_groups:
-- sysadmin-openshift
-ipa_client_sudo_groups:
-- sysadmin-openshift
diff --git a/inventory/group_vars/os_stg b/inventory/group_vars/os_stg
index 65044f6fec..8a6c253899 100644
--- a/inventory/group_vars/os_stg
+++ b/inventory/group_vars/os_stg
@@ -5,3 +5,10 @@ no_http2: False
 nm_controlled_resolv: True
 # Only define this when upgrading, otherwise comment it
 # openshift_ansible_upgrading: True
+ipa_host_group: openshift
+ipa_host_group_desc: OpenShift cluster
+
+ipa_client_shell_groups:
+- sysadmin-openshift
+ipa_client_sudo_groups:
+- sysadmin-openshift