diff --git a/defaults/main.yml b/defaults/main.yml
index c1c88c5..c5cacf1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,4 @@
 debian_installer_method: false
 debian_installer_directory: host_files/{{ inventory_hostname }}/debian-installer
+debian_installer_set_hostname: true
 debian_installer_nonfree_firmware: false
diff --git a/templates/preseed.cfg.j2 b/templates/preseed.cfg.j2
index 45fb6c2..f18ad98 100644
--- a/templates/preseed.cfg.j2
+++ b/templates/preseed.cfg.j2
@@ -18,7 +18,9 @@ d-i network-console/password-disabled boolean true
 {% endif %}
 
 ### Hostname
+{% if debian_installer_set_hostname %}
 d-i netcfg/hostname string {{inventory_hostname}}
+{% endif %}
 
 ### Mirror settings
 d-i mirror/country string manual