diff --git a/playbooks/dns.yml b/playbooks/dns.yml
index aa5da8e..2da9249 100644
--- a/playbooks/dns.yml
+++ b/playbooks/dns.yml
@@ -45,6 +45,7 @@
         git IN CNAME nvak
         keys IN CNAME rurapenthe
         rss IN CNAME nvak
+        spotme IN CNAME nvak
         wg IN CNAME nvak
         _minecraft._tcp.wg IN SRV 10 10 {{ project_wg_minecraft_port }} mc.wg
         mc.wg IN CNAME nvak
@@ -72,23 +73,6 @@
         ; Mail
         @ IN MX 10 nvak
         @ IN TXT "v=spf1 +mx -all"
-    - role: dns/master
-      domain: spotme.fun
-      main_nameserver_domain: ns1.banananet.work.
-      responsible_mail_name: admin.banananet.work.
-      slaves: "{{ nvak_dns_slaves }}"
-      entries: |
-        ; Name Servers
-        @ IN NS ns1.banananet.work.
-        @ IN NS ns2.banananet.work.
-        ; Web Page
-        @ IN A {{ ansible_default_ipv4.address }}
-        @ IN AAAA {{ ansible_default_ipv6.address }}
-        www IN A {{ ansible_default_ipv4.address }}
-        www IN AAAA {{ ansible_default_ipv6.address }}
-        ; Mail
-        @ IN MX 10 nvak
-        @ IN TXT "v=spf1 +mx -all"
     - role: dns/master
       domain: stadtpiraten-karlsruhe.de
       main_nameserver_domain: ns1.banananet.work.
diff --git a/site.yml b/site.yml
index ab8ecfb..b15701e 100644
--- a/site.yml
+++ b/site.yml
@@ -75,11 +75,8 @@
       site_name: "BananaNetwork Drop Server"
     # SpotMe Server
     - role: server/spotme
-      domain: spotme.fun
+      domain: spotme.banananet.work
       spotme_system_user: spotme
-    - role: nginx/forward
-      domain: www.spotme.fun
-      dest: spotme.fun
 #    # Admin Panel
 #    - role: server/php
 #      domain: nvak.banananet.work