diff --git a/roles/fai/templates/etc/fai/nfsroot.conf.j2 b/roles/fai/templates/etc/fai/nfsroot.conf.j2
index cbf94f5..5d978ed 100644
--- a/roles/fai/templates/etc/fai/nfsroot.conf.j2
+++ b/roles/fai/templates/etc/fai/nfsroot.conf.j2
@@ -6,7 +6,8 @@
 # The third parameter is the name of the bootstrap script variant to use.
 # Example:
 # FAI_DEBOOTSTRAP="bullseye http://deb.debian.org/debian"
-FAI_DEBOOTSTRAP="{{ debian_release_nfsroot }} http://localhost:3142/debian"
+FAI_DEBOOTSTRAP="{{ debian_release_nfsroot +
+	'http://' + server_name + ':3142/debian' }}"
 
 # Options that will be passed to debootstrap(8).
 # Used for excluding packages and for specifying a different architecture.
@@ -23,8 +24,8 @@ FAI_DEBOOTSTRAP_OPTS="--exclude=wget"
 # 
 # echo "yoursecrectpassword" | mkpasswd -m md5 -s
 
-#FAI_ROOTPW="{{ fai_hw4f_rootpw_fai |password_hash("sha512") }}"
-FAI_ROOTPW='$y$j9T$9Gpl96oNFKz9us5aM5iCb.$v/JHwnHRfaxMCPK/nsxu.DAmoGB1hlgRQBDIxTeMd9/'
+FAI_ROOTPW="{{ fai_hw4f_rootpw_fai | password_hash("sha512") }}"
+#FAI_ROOTPW='$y$j9T$9Gpl96oNFKz9us5aM5iCb.$v/JHwnHRfaxMCPK/nsxu.DAmoGB1hlgRQBDIxTeMd9/'
 
 # Directory on the install server where the nfsroot is created.
 NFSROOT="{{ fai_dir_nfsroot }}"
@@ -41,7 +42,7 @@ NFSROOT_HOOKS="{{ fai_etc_dir }}/nfsroot-hooks"
 # This multiline variable is added to /etc/hosts inside the nfsroot.
 # You can use this when DNS is not available on the clients.
 # Example:
-# NFSROOT_ETC_HOSTS="192.168.33.250 faiserver"
+# NFSROOT_ETC_HOSTS="{{ server_address}} {{ server_name }}"
 
 # Directory on the install server for the tftp data, used by PXE network boot.
 TFTPROOT="{{ tftp_dir }}"