diff --git a/roles/fai/defaults/main.yml b/roles/fai/defaults/main.yml
index 89782ad..cb6b22e 100644
--- a/roles/fai/defaults/main.yml
+++ b/roles/fai/defaults/main.yml
@@ -39,6 +39,7 @@ fai_flags:
   - sshd
   - createvt
   - menu
+fai_install_hostname: "user-pc"
 
 fai_hw4f_password_salt: "toXu6kiez1haetan"
 fai_hw4f_rootpw_fai: "fai"
diff --git a/roles/fai/templates/srv/fai/config/class/HW4F_DESKTOP.var.j2 b/roles/fai/templates/srv/fai/config/class/HW4F_DESKTOP.var.j2
index 90a2fbb..21fa88a 100644
--- a/roles/fai/templates/srv/fai/config/class/HW4F_DESKTOP.var.j2
+++ b/roles/fai/templates/srv/fai/config/class/HW4F_DESKTOP.var.j2
@@ -6,7 +6,7 @@ TIMEZONE="Europe/Berlin"
 STOP_ON_ERROR=700
 MAXPACKAGES=800
 
-HOSTNAME="user-pc"
+INSTALL_HOSTNAME="{{ fai_install_hostname }}"
 KEYMAP="de-latin1-nodeadkeys"
 
 
diff --git a/roles/fai/templates/srv/fai/config/scripts/01-hostname.j2 b/roles/fai/templates/srv/fai/config/scripts/01-hostname.j2
new file mode 100755
index 0000000..383efba
--- /dev/null
+++ b/roles/fai/templates/srv/fai/config/scripts/01-hostname.j2
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+error=0; trap 'error=$(($?>$error?$?:$error))'
+
+if [ -n "$INSTALL_HOSTNAME" ]; then
+	echo "Setting HOSTNAME to '$INSTALL_HOSTNAME'"
+	echo "$INSTALL_HOSTNAME" > "$target/etc/hostname"
+else
+	echo "Variable HOSTNAME is empty. Not setting HOSTNAME."
+fi
+
+echo "Removing FAI server from /etc/hosts"
+sed -ri -e '/{{ server_name }}/d' "$target/etc/hosts"
+
+exit $error