diff --git a/pillar/id/metrics_infra_opensuse_org.sls b/pillar/id/metrics_infra_opensuse_org.sls
new file mode 100644
index 0000000..944e52b
--- /dev/null
+++ b/pillar/id/metrics_infra_opensuse_org.sls
@@ -0,0 +1,7 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - metrics.o.o
+  salt_cluster: opensuse
+  virt_cluster: atreju
diff --git a/pillar/id/pontifex_infra_opensuse_org.sls b/pillar/id/pontifex_infra_opensuse_org.sls
new file mode 100644
index 0000000..dd3b292
--- /dev/null
+++ b/pillar/id/pontifex_infra_opensuse_org.sls
@@ -0,0 +1,7 @@
+grains:
+  city: nuremberg
+  country: de
+  hostusage:
+    - download.o.o
+  salt_cluster: opensuse
+  virt_cluster: atreju