diff --git a/defaults/main.yml b/defaults/main.yml
index a0a3a8b..3569ff6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,12 +2,17 @@ debian_mirror: http://deb.debian.org/debian
 debian_security_mirror: http://security.debian.org/debian-security
 
 live_build_serial_console: false
-live_build_bootappend_live: boot=live components quiet {{ live_build_serial_console | ternary('console=ttyS0','') }} hostname={{ live_build_hostname }} locales=de_DE.UTF-8 timezone=Europe/Berlin keyboard-layouts=de
-live_build_hostname: "{{ inventory_hostname }}"
+live_build_bootappend_live:
+  boot=live
+  components
+  quiet
+  locales=de_DE.UTF-8
+  timezone=Europe/Berlin
+  keyboard-layouts=de
 
 live_build_distribution: stretch
 
 debian_nonfree_firmware: true
 
-debian_live_debian_installer: live
+debian_live_debian_installer: netinst
 live_build_directory: /opt/live