diff --git a/pillar/id/anna_infra_opensuse_org.sls b/pillar/id/anna_infra_opensuse_org.sls
index c50c6c1..7748bb0 100644
--- a/pillar/id/anna_infra_opensuse_org.sls
+++ b/pillar/id/anna_infra_opensuse_org.sls
@@ -15,3 +15,13 @@ grains:
   salt_cluster: opensuse
   virt_cluster: atreju
   subrole_ntp: ntp2
+
+  aliases:
+    - proxy-nue1.infra.opensuse.org
+  description: HAproxy and PgBouncer
+  documention: []
+  responsible: []
+  partners:
+    - elsa.infra.opensuse.org
+  weburls:
+    - https://anna.opensuse.org
diff --git a/pillar/id/daffy1_infra_opensuse_org.sls b/pillar/id/daffy1_infra_opensuse_org.sls
index 52eb584..aa5428f 100644
--- a/pillar/id/daffy1_infra_opensuse_org.sls
+++ b/pillar/id/daffy1_infra_opensuse_org.sls
@@ -10,3 +10,14 @@ grains:
   reboot_safe: unknown
   salt_cluster: opensuse
   virt_cluster: atreju
+
+  aliases: []
+  description: Login proxy for servers with authentication
+  documention:
+    # should/will be moved to a "loginproxy" page (or to the login role ;-)
+    - https://progress.opensuse.org/projects/opensuse-admin-wiki/wiki/Daffy1infraopensuseorg
+  responsible: []
+  partners:
+    - daffy2.infra.opensuse.org
+  weburls:
+    - https://login2.opensuse.org
diff --git a/pillar/id/riesling_infra_opensuse_org.sls b/pillar/id/riesling_infra_opensuse_org.sls
index f4c71ff..3a0b5b0 100644
--- a/pillar/id/riesling_infra_opensuse_org.sls
+++ b/pillar/id/riesling_infra_opensuse_org.sls
@@ -8,3 +8,18 @@ grains:
   reboot_safe: yes
   salt_cluster: opensuse
   virt_cluster: atreju
+
+  aliases:
+    - wiki.infra.opensuse.org
+  description: $lang.opensuse.org wiki pages
+  documention: []
+  responsible:
+    - cboltz
+  partners: []
+  weburls:
+    - https://en.opensuse.org
+    - https://de.opensuse.org
+    # instead of the full list... ;-)
+    - https://$lang.opensuse.org
+    - https://languages.opensuse.org
+    - https://files.opensuse.org