diff --git a/hosts b/hosts
index f31ec70..e99202c 100644
--- a/hosts
+++ b/hosts
@@ -4,6 +4,7 @@ dhcpserver
 fileserver
 jitsimeet
 mailserver
+mastodon
 nameserver
 printspooler
 proxyserver
@@ -11,7 +12,6 @@ webserver
 
 [database]
 coruscant.universe.local
-mewitoot.de
 
 [development]
 endor.universe.local
@@ -25,20 +25,20 @@ coruscant.universe.local
 coruscant.universe.local
 
 [jitsimeet]
-#ubuntu-test jitsi_fqdn=mewimeet.de
 mewimeet.de jitsi_fqdn=mewimeet.de
 
 [mailserver]
 coruscant.universe.local
-mewitoot.de
 mail.mewissen.site
 
+[mastodon]
+ubuntu-test
+
 [mobile]
 tuxedo-book-xp1511.universe.local
 
 [nameserver]
 coruscant.universe.local
-ubuntu-test
 
 [photo_editing]
 endor.universe.local
@@ -58,7 +58,6 @@ tuxedo-book-xp1511.universe.local
 
 [webserver]
 coruscant.universe.local
-mewitoot.de
 
 [workstation:children]
 development