diff --git a/stage1/01-sys-tweaks/00-run.sh b/stage1/01-sys-tweaks/00-run.sh
index ac7c428..f6f118e 100755
--- a/stage1/01-sys-tweaks/00-run.sh
+++ b/stage1/01-sys-tweaks/00-run.sh
@@ -6,10 +6,10 @@ install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/policy-rc.d
 install -v -m 644 files/fstab ${ROOTFS_DIR}/etc/fstab
 
 on_chroot sh -e - <<EOF
-if ! id -u pi >/dev/null 2>&1; then
-	adduser --disabled-password --gecos "" pi
+if ! id -u ${USER_NAME} >/dev/null 2>&1; then
+	adduser --disabled-password --gecos "" ${USER_NAME}
 fi
-echo "pi:raspberry" | chpasswd
+echo "${USER_NAME}:${PASS_WORD}" | chpasswd
 echo "root:root" | chpasswd
 EOF
 
diff --git a/stage1/02-net-tweaks/00-patches/01-hosts.diff b/stage1/02-net-tweaks/00-patches/01-hosts.diff
deleted file mode 100644
index ad07ae5..0000000
--- a/stage1/02-net-tweaks/00-patches/01-hosts.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: jessie-stage1/rootfs/etc/hosts
-===================================================================
---- jessie-stage1.orig/rootfs/etc/hosts
-+++ jessie-stage1/rootfs/etc/hosts
-@@ -3,3 +3,4 @@
- ff02::1		ip6-allnodes
- ff02::2		ip6-allrouters
- 
-+127.0.1.1	raspberrypi
diff --git a/stage1/02-net-tweaks/00-run.sh b/stage1/02-net-tweaks/00-run.sh
index fd6609a..3649d7b 100755
--- a/stage1/02-net-tweaks/00-run.sh
+++ b/stage1/02-net-tweaks/00-run.sh
@@ -2,8 +2,17 @@
 
 install -m 644 files/ipv6.conf ${ROOTFS_DIR}/etc/modprobe.d/ipv6.conf
 install -m 644 files/interfaces ${ROOTFS_DIR}/etc/network/interfaces
-install -m 644 files/hostname ${ROOTFS_DIR}/etc/hostname
 
-on_chroot sh -e - << EOF
+cat <<EOF > ${ROOTFS_DIR}/etc/hostname
+${HOST_NAME}
+EOF
+
+# Append hostname
+cat <<EOF >> ${ROOTFS_DIR}/etc/hosts
+
+127.0.1.1	${HOST_NAME}
+EOF
+
+on_chroot sh -e - <<EOF
 dpkg-divert --add --local /lib/udev/rules.d/75-persistent-net-generator.rules
 EOF
diff --git a/stage1/02-net-tweaks/files/hostname b/stage1/02-net-tweaks/files/hostname
deleted file mode 100644
index 41757af..0000000
--- a/stage1/02-net-tweaks/files/hostname
+++ /dev/null
@@ -1 +0,0 @@
-raspberrypi
diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh
index b034521..5107558 100755
--- a/stage2/01-sys-tweaks/01-run.sh
+++ b/stage2/01-sys-tweaks/01-run.sh
@@ -26,13 +26,13 @@ systemctl enable apply_noobs_os_config
 systemctl enable resize2fs_once
 EOF
 
-on_chroot sh -e - << \EOF
-for GRP in input spi i2c gpio; do
-	groupadd -f -r $GRP
-done
-for GRP in adm dialout cdrom audio users sudo video games plugdev input gpio spi i2c netdev; do
-  adduser pi $GRP
-done
+on_chroot sh -e - <<\EOF
+	for GRP in input spi i2c gpio; do
+		groupadd -f -r $GRP
+	done
+	for GRP in adm dialout cdrom audio users sudo video games plugdev input gpio spi i2c netdev; do
+	adduser ${USER_NAME} $GRP
+	done
 EOF
 
 on_chroot sh -e - <<EOF