diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index cbff170da3..114f81b557 100644
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@@ -209,5 +209,8 @@ fedora_required_images:
 #
 wsgi_wants_apache: true
 
-# Main IPA server for this server
+# IPA settings
 ipa_server: ipa01.stg.phx2.fedoraproject.org
+ipa_realm: FEDORAPROJECT.ORG
+ipa_dm_password: "{{ ipa_prod_dm_password }}"
+ipa_admin_password: "{{ ipa_prod_admin_password }}"
diff --git a/inventory/group_vars/ipa b/inventory/group_vars/ipa
index d9288a1b6b..59f50f2408 100644
--- a/inventory/group_vars/ipa
+++ b/inventory/group_vars/ipa
@@ -14,7 +14,3 @@ fas_client_groups: sysadmin-main,sysadmin-accounts
 
 nrpe_procs_warn: 300
 nrpe_procs_crit: 500
-
-ipa_realm: FEDORAPROJECT.ORG
-ipa_dm_password: "{{ ipa_prod_dm_password }}"
-ipa_admin_password: "{{ ipa_prod_admin_password }}"
diff --git a/inventory/group_vars/ipa-stg b/inventory/group_vars/ipa-stg
index 2098c8d80a..4753e92532 100644
--- a/inventory/group_vars/ipa-stg
+++ b/inventory/group_vars/ipa-stg
@@ -10,7 +10,3 @@ fas_client_groups: sysadmin-main,sysadmin-accounts
 
 nrpe_procs_warn: 300
 nrpe_procs_crit: 500
-
-ipa_realm: STG.FEDORAPROJECT.ORG
-ipa_dm_password: "{{ ipa_stg_dm_password }}"
-ipa_admin_password: "{{ ipa_stg_admin_password }}"
diff --git a/inventory/group_vars/staging b/inventory/group_vars/staging
index f0a472e557..218320b928 100644
--- a/inventory/group_vars/staging
+++ b/inventory/group_vars/staging
@@ -13,4 +13,8 @@ collectd_graphite: True
 fedmsg_prefix: org.fedoraproject
 fedmsg_env: stg
 
+# IPA details
 ipa_server: ipa01.stg.phx2.fedoraproject.org
+ipa_realm: STG.FEDORAPROJECT.ORG
+ipa_dm_password: "{{ ipa_stg_dm_password }}"
+ipa_admin_password: "{{ ipa_stg_admin_password }}"