diff --git a/pillar/id/aedir1.infra.opensuse.org.sls b/pillar/id/aedir1.infra.opensuse.org.sls
deleted file mode 100644
index 5253e27..0000000
--- a/pillar/id/aedir1.infra.opensuse.org.sls
+++ /dev/null
@@ -1,9 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  hostusage:
-    - AE-DIR test provider (writeable)
-    - not salt-managed because FreeIPA client config must not be installed
-  reboot_safe: yes
-  salt_cluster: opensuse
-  virt_cluster: atreju
diff --git a/pillar/id/aedir1_infra_opensuse_org.sls b/pillar/id/aedir1_infra_opensuse_org.sls
new file mode 100644
index 0000000..5253e27
--- /dev/null
+++ b/pillar/id/aedir1_infra_opensuse_org.sls
@@ -0,0 +1,9 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - AE-DIR test provider (writeable)
+    - not salt-managed because FreeIPA client config must not be installed
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/aedir2.infra.opensuse.org.sls b/pillar/id/aedir2.infra.opensuse.org.sls
deleted file mode 100644
index dd0ee4d..0000000
--- a/pillar/id/aedir2.infra.opensuse.org.sls
+++ /dev/null
@@ -1,9 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  hostusage:
-    - AE-DIR test consumer (read-only)
-    - not salt-managed because FreeIPA client config must not be installed
-  reboot_safe: yes
-  salt_cluster: opensuse
-  virt_cluster: atreju
diff --git a/pillar/id/aedir2_infra_opensuse_org.sls b/pillar/id/aedir2_infra_opensuse_org.sls
new file mode 100644
index 0000000..dd0ee4d
--- /dev/null
+++ b/pillar/id/aedir2_infra_opensuse_org.sls
@@ -0,0 +1,9 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - AE-DIR test consumer (read-only)
+    - not salt-managed because FreeIPA client config must not be installed
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/galera1.infra.opensuse.org.sls b/pillar/id/galera1.infra.opensuse.org.sls
deleted file mode 100644
index 8ca9174..0000000
--- a/pillar/id/galera1.infra.opensuse.org.sls
+++ /dev/null
@@ -1,18 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  hostusage:
-    - Galera node (MySQL)
-  reboot_safe: yes
-  salt_cluster: opensuse
-  virt_cluster: atreju
-
-  aliases: []
-  description: Node of the MySQL cluster based on Galera
-  documentation: []
-  responsible:
-    - kbabioch
-  partners:
-    - galera2.infra.opensuse.org
-    - galera3.infra.opensuse.org
-  weburls: []
diff --git a/pillar/id/galera1_infra_opensuse_org.sls b/pillar/id/galera1_infra_opensuse_org.sls
new file mode 100644
index 0000000..8ca9174
--- /dev/null
+++ b/pillar/id/galera1_infra_opensuse_org.sls
@@ -0,0 +1,18 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - Galera node (MySQL)
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: Node of the MySQL cluster based on Galera
+  documentation: []
+  responsible:
+    - kbabioch
+  partners:
+    - galera2.infra.opensuse.org
+    - galera3.infra.opensuse.org
+  weburls: []
diff --git a/pillar/id/galera2.infra.opensuse.org.sls b/pillar/id/galera2.infra.opensuse.org.sls
deleted file mode 100644
index 97d40e4..0000000
--- a/pillar/id/galera2.infra.opensuse.org.sls
+++ /dev/null
@@ -1,18 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  hostusage:
-    - Galera node (MySQL)
-  reboot_safe: yes
-  salt_cluster: opensuse
-  virt_cluster: atreju
-
-  aliases: []
-  description: Node of the MySQL cluster based on Galera
-  documentation: []
-  responsible:
-    - kbabioch
-  partners:
-    - galera1.infra.opensuse.org
-    - galera3.infra.opensuse.org
-  weburls: []
diff --git a/pillar/id/galera2_infra_opensuse_org.sls b/pillar/id/galera2_infra_opensuse_org.sls
new file mode 100644
index 0000000..97d40e4
--- /dev/null
+++ b/pillar/id/galera2_infra_opensuse_org.sls
@@ -0,0 +1,18 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - Galera node (MySQL)
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: Node of the MySQL cluster based on Galera
+  documentation: []
+  responsible:
+    - kbabioch
+  partners:
+    - galera1.infra.opensuse.org
+    - galera3.infra.opensuse.org
+  weburls: []
diff --git a/pillar/id/galera3.infra.opensuse.org.sls b/pillar/id/galera3.infra.opensuse.org.sls
deleted file mode 100644
index 8ca9174..0000000
--- a/pillar/id/galera3.infra.opensuse.org.sls
+++ /dev/null
@@ -1,18 +0,0 @@
-grains:
-  city: nuremberg
-  country: de
-  hostusage:
-    - Galera node (MySQL)
-  reboot_safe: yes
-  salt_cluster: opensuse
-  virt_cluster: atreju
-
-  aliases: []
-  description: Node of the MySQL cluster based on Galera
-  documentation: []
-  responsible:
-    - kbabioch
-  partners:
-    - galera2.infra.opensuse.org
-    - galera3.infra.opensuse.org
-  weburls: []
diff --git a/pillar/id/galera3_infra_opensuse_org.sls b/pillar/id/galera3_infra_opensuse_org.sls
new file mode 100644
index 0000000..8ca9174
--- /dev/null
+++ b/pillar/id/galera3_infra_opensuse_org.sls
@@ -0,0 +1,18 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - Galera node (MySQL)
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+
+  aliases: []
+  description: Node of the MySQL cluster based on Galera
+  documentation: []
+  responsible:
+    - kbabioch
+  partners:
+    - galera2.infra.opensuse.org
+    - galera3.infra.opensuse.org
+  weburls: []