diff --git a/host_vars/emma.ccchb.de b/host_vars/emma.ccchb.de
index 81c6566..1661ea1 100644
--- a/host_vars/emma.ccchb.de
+++ b/host_vars/emma.ccchb.de
@@ -173,7 +173,6 @@ bhyve_guests:
     image: debian-10.5.0-amd64-netinst.iso
     password: foobar
     order:
-      - ISO
       - DISKS
     disks:
       - name: disk
diff --git a/host_vars/jabber.emma.ccchb.de.yml b/host_vars/jabber.emma.ccchb.de.yml
new file mode 100644
index 0000000..e73c38e
--- /dev/null
+++ b/host_vars/jabber.emma.ccchb.de.yml
@@ -0,0 +1,12 @@
+vm_index: 7
+
+user_mgmt:
+  crest:
+    state: present
+    groups: sudo
+  genofire:
+    state: present
+    groups: sudo
+  fritz:
+    state: present
+    groups: sudo
diff --git a/host_vars/wiki.emma.ccchb.de.yml b/host_vars/wiki.emma.ccchb.de.yml
new file mode 100644
index 0000000..5ee9594
--- /dev/null
+++ b/host_vars/wiki.emma.ccchb.de.yml
@@ -0,0 +1,12 @@
+vm_index: 6
+
+user_mgmt:
+  crest:
+    state: present
+    groups: sudo
+  genofire:
+    state: present
+    groups: sudo
+  fritz:
+    state: present
+    groups: sudo
diff --git a/hosts/10_jabber b/hosts/10_jabber
new file mode 100644
index 0000000..73eab1f
--- /dev/null
+++ b/hosts/10_jabber
@@ -0,0 +1,2 @@
+[jabber]
+jabber.emma.ccchb.de
diff --git a/hosts/10_wiki b/hosts/10_wiki
new file mode 100644
index 0000000..a05cdf0
--- /dev/null
+++ b/hosts/10_wiki
@@ -0,0 +1,2 @@
+[wiki]
+wiki.emma.ccchb.de
diff --git a/hosts/50_debian b/hosts/50_debian
index e8490fa..f14dd0c 100644
--- a/hosts/50_debian
+++ b/hosts/50_debian
@@ -4,3 +4,5 @@ dn42.emma.ccchb.de
 [debian:children]
 nextcloud
 gitea
+wiki
+jabber