diff --git a/hieradata/cluster/corecp/role/ipamaster.yaml b/hieradata/cluster/corecp/role/ipamaster.yaml
deleted file mode 100644
index 69c682aa21..0000000000
--- a/hieradata/cluster/corecp/role/ipamaster.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-easy_ipa::ipa_server_fqdn: "%{facts.fqdn}"
-easy_ipa::ip_address: "%{facts.networking.ip}"
diff --git a/hieradata/cluster/corecp/role/ipareplica.yaml b/hieradata/cluster/corecp/role/ipareplica.yaml
deleted file mode 100644
index 69c682aa21..0000000000
--- a/hieradata/cluster/corecp/role/ipareplica.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-easy_ipa::ipa_server_fqdn: "%{facts.fqdn}"
-easy_ipa::ip_address: "%{facts.networking.ip}"
diff --git a/hieradata/cluster/coretuc/role/ipamaster.yaml b/hieradata/cluster/coretuc/role/ipamaster.yaml
deleted file mode 100644
index 69c682aa21..0000000000
--- a/hieradata/cluster/coretuc/role/ipamaster.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-easy_ipa::ipa_server_fqdn: "%{facts.fqdn}"
-easy_ipa::ip_address: "%{facts.networking.ip}"
diff --git a/hieradata/cluster/coretuc/role/ipareplica.yaml b/hieradata/cluster/coretuc/role/ipareplica.yaml
deleted file mode 100644
index 69c682aa21..0000000000
--- a/hieradata/cluster/coretuc/role/ipareplica.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-easy_ipa::ipa_server_fqdn: "%{facts.fqdn}"
-easy_ipa::ip_address: "%{facts.networking.ip}"
diff --git a/hieradata/org/lsst/role/ipamaster.yaml b/hieradata/org/lsst/role/ipamaster.yaml
index d4b49c4507..906ec70f74 100644
--- a/hieradata/org/lsst/role/ipamaster.yaml
+++ b/hieradata/org/lsst/role/ipamaster.yaml
@@ -14,3 +14,5 @@ easy_ipa::install_epel: false
 easy_ipa::install_autofs: false
 easy_ipa::install_sssdtools: false
 easy_ipa::install_kstart: false
+easy_ipa::ipa_server_fqdn: "%{facts.fqdn}"
+easy_ipa::ip_address: "%{facts.networking.ip}"
diff --git a/hieradata/org/lsst/role/ipareplica.yaml b/hieradata/org/lsst/role/ipareplica.yaml
index 0659f9ff87..0566753697 100644
--- a/hieradata/org/lsst/role/ipareplica.yaml
+++ b/hieradata/org/lsst/role/ipareplica.yaml
@@ -14,3 +14,5 @@ easy_ipa::install_epel: false
 easy_ipa::install_autofs: false
 easy_ipa::install_sssdtools: false
 easy_ipa::install_kstart: false
+easy_ipa::ipa_server_fqdn: "%{facts.fqdn}"
+easy_ipa::ip_address: "%{facts.networking.ip}"