diff --git a/pillar/id/identification2_infra_opensuse_org.sls b/pillar/id/identification2_infra_opensuse_org.sls
new file mode 100644
index 0000000..6d66ad1
--- /dev/null
+++ b/pillar/id/identification2_infra_opensuse_org.sls
@@ -0,0 +1,16 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - freeIPA
+  reboot_safe: yes
+  salt_cluster: opensuse
+  virt_cluster: atreju
+  aliases: []
+  documentation:
+    - https://www.freeipa.org/page/Documentation
+  responsible:
+    - hellcp
+  partners: []
+  weburls: []
+  roles: []
diff --git a/pillar/id/identification_infra_opensuse_org.sls b/pillar/id/identification_infra_opensuse_org.sls
index 93c2371..6d66ad1 100644
--- a/pillar/id/identification_infra_opensuse_org.sls
+++ b/pillar/id/identification_infra_opensuse_org.sls
@@ -2,23 +2,15 @@ grains:
   city: nuremberg
   country: de
   hostusage:
-    - ipsilon
-    - noggin
-  roles:
-    - ipsilon
+    - freeIPA
   reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju
-
   aliases: []
-  description: User accounts and single sign-on
   documentation:
-    - https://ipsilon-project.org/
-    - https://noggin-aaa.readthedocs.io/
+    - https://www.freeipa.org/page/Documentation
   responsible:
     - hellcp
-    - Pharaoh_Atem
   partners: []
-  weburls:
-    - sso.opensuse.org
-    - accounts.opensuse.org
+  weburls: []
+  roles: []
diff --git a/pillar/role/ipsilon.sls b/pillar/role/ipsilon.sls
deleted file mode 100644
index 8d84a5e..0000000
--- a/pillar/role/ipsilon.sls
+++ /dev/null
@@ -1,24 +0,0 @@
-{% if salt['grains.get']('include_secrets', True) %}
-include:
-  - secrets.role.identification
-{% endif %}
-
-
-profile:
-  identification:
-    database_user: identification
-    database_host: postgresql.infra.opensuse.org
-
-sudoers:
-  included_files:
-    /etc/sudoers.d/group_ipsilon-admins:
-      groups:
-        ipsilon-admins:
-          - 'ALL=(ALL) ALL'
-
-zypper:
-  repositories:
-    openSUSE:infrastructure:ipsilon:
-      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/ipsilon/$releasever/
-      priority: 100
-      refresh: True
diff --git a/salt/profile/postgresql/files/postgresql/pg_hba.conf b/salt/profile/postgresql/files/postgresql/pg_hba.conf
index cc678db..0839e2e 100644
--- a/salt/profile/postgresql/files/postgresql/pg_hba.conf
+++ b/salt/profile/postgresql/files/postgresql/pg_hba.conf
@@ -150,10 +150,6 @@ host    telegram_bridge    matrix             192.168.47.102/32 md5
 host    dimension          matrix             192.168.47.4/32   md5
 host    dimension          matrix             192.168.47.101/32 md5
 host    dimension          matrix             192.168.47.102/32 md5
-# identification.infra.opensuse.org
-host    identification     identification     192.168.47.4/32   md5
-host    identification     identification     192.168.47.101/32 md5
-host    identification     identification     192.168.47.102/32 md5
 # tsp.infra.opensuse.org
 host    tsp                web_tsp            192.168.47.4/32   md5
 host    tsp                web_tsp            192.168.47.101/32 md5
diff --git a/salt/role/ipsilon.sls b/salt/role/ipsilon.sls
deleted file mode 100644
index 9c98eac..0000000
--- a/salt/role/ipsilon.sls
+++ /dev/null
@@ -1,5 +0,0 @@
-include:
-  - profile.identification.ipsilon
-  - profile.identification.config
-  - profile.identification.apache
-  - profile.identification.init