diff --git a/playbooks/host_hatoria.banananet.work.yml b/playbooks/host_hatoria.banananet.work.yml
index 53ba528..fbcf4a2 100644
--- a/playbooks/host_hatoria.banananet.work.yml
+++ b/playbooks/host_hatoria.banananet.work.yml
@@ -16,6 +16,23 @@
         - banananet.work
       domain: www.banananet.work
       dest: banananet.work
+    # SpotMe Server
+    - role: server/spotme
+      tags:
+        - spotme.banananet.work
+      domain: spotme.banananet.work
+      bind_port: 12820
+    # Firefox Sync Server
+    - role: server/firefox-sync
+      tags:
+        - firefox.banananet.work
+      domain: firefox.banananet.work
+    # RSS Server
+    # TODO Manual initialization of database required
+    - role: server/tt-rss
+      tags:
+        - rss.banananet.work
+      domain: rss.banananet.work
     # Linx Server
     - role: server/linx
       tags:
diff --git a/playbooks/host_nvak.banananet.work.yml b/playbooks/host_nvak.banananet.work.yml
index e5229ad..854e4fe 100644
--- a/playbooks/host_nvak.banananet.work.yml
+++ b/playbooks/host_nvak.banananet.work.yml
@@ -9,26 +9,6 @@
       domain: git.banananet.work
       gitea_system_user: git
       database_user: gitea
-    # SpotMe Server
-    - role: server/spotme
-      tags:
-        - spotme.banananet.work
-      domain: spotme.banananet.work
-      bind_port: 12820
-      spotme_system_user: spotme
-    # Firefox Sync Server
-    - role: server/firefox-sync
-      tags:
-        - firefox.banananet.work
-      domain: firefox.banananet.work
-      system_user: firefox-banananet-work
-    # RSS Server
-    # TODO Manual initialization of database required
-    - role: server/tt-rss
-      tags:
-        - rss.banananet.work
-      domain: rss.banananet.work
-      system_user: rss-banananet-work
     # DSA Seite
 #    - role: server/node
 #      domain: dsa.banananet.work