diff --git a/host_vars/mewimeet.de.yml b/host_vars/mewimeet.de.yml
index 8ee79ea..8488bf6 100644
--- a/host_vars/mewimeet.de.yml
+++ b/host_vars/mewimeet.de.yml
@@ -14,7 +14,7 @@ raspberry_pi: false
 preinstalled: true
 
 # server
-set_hosts: false
+set_hosts: true
 unattended_upgrades: true
 web_server: true
 netdata: true
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 7406f8c..38aac73 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -14,7 +14,6 @@
   - import_tasks: software/packages_utilities.yml
 
   # Perform remaining tasks:
-  - import_tasks: system_setup/hosts.yml
   - import_tasks: system_setup/clock.yml
   # - import_tasks: system_setup/cron.yml
   - import_tasks: system_setup/locale.yml
diff --git a/roles/server/tasks/main.yml b/roles/server/tasks/main.yml
index bca07ea..2e9f70e 100644
--- a/roles/server/tasks/main.yml
+++ b/roles/server/tasks/main.yml
@@ -4,6 +4,7 @@
   tags: always
 
 - block:
+  - import_tasks: system_setup/hosts.yml
   - include_tasks: utilities/netdata.yml
     when: netdata is defined and netdata == true
   - include_tasks: utilities/snmpd.yml
diff --git a/roles/base/tasks/system_setup/hosts.yml b/roles/server/tasks/system_setup/hosts.yml
similarity index 100%
rename from roles/base/tasks/system_setup/hosts.yml
rename to roles/server/tasks/system_setup/hosts.yml