diff --git a/install.sh b/install.sh
index 906336f..2336f6a 100644
--- a/install.sh
+++ b/install.sh
@@ -351,38 +351,32 @@ genfstab -Up "/mnt" > "/mnt/etc/fstab"
 echo "Done."
 echo
 
-# Set hardware clock
+# Set time and hardware clock
 # https://wiki.archlinux.org/title/Installation_guide#Time
-arch-chroot "/mnt" hwclock --systohc  # Set the Hardware Clock to the current System Time
+echo "Setting timezone and clock.."
+arch-chroot "/mnt" ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
+arch-chroot "/mnt" hwclock --systohc
+echo "Done."
+echo
 
-# Generate locale
+# Set hostname
+# https://wiki.archlinux.org/title/Installation_guide#Network_configuration
+echo "Setting hostname.."
+echo "${host}" > "/mnt/etc/hostname"
+echo "Done."
+echo
+
+# Set locale and keymap
 # https://wiki.archlinux.org/title/Installation_guide#Localization
+echo "Setting locale and keymap.."
 echo "en_US.UTF-8 UTF-8" >> "/mnt/etc/locale.gen"
 arch-chroot "/mnt" locale-gen
+echo "LANG=en_US.UTF-8" >> "/mnt/etc/locale.conf"
 
-# Set keymap, locale, timezone and hostname
-# https://wiki.archlinux.org/title/Systemd-firstboot
-service_dir="/mnt/etc/systemd/system/systemd-firstboot.service.d"
-mkdir "${service_dir}"
-
-rootdir="/mnt"
-keymap="de-latin1-nodeadkeys"
-locale="en_US.UTF-8"
-timezone="Europe/Berlin"
-
-cat << EOF > "${service_dir}/install.conf"
-[Unit]
-ConditionFirstBoot=
-
-[Service]
-ExecStart=
-ExecStart=/usr/bin/systemd-firstboot --root="${rootdir}" --keymap="${keymap}" --locale="${locale}" --timezone="${timezone}" --hostname="${host}" --force
-
-[Install]
-WantedBy=sysinit.target
-EOF
-
-arch-chroot "/mnt" systemctl enable systemd-firstboot.service
+echo "KEYMAP=de-latin1" > "/mnt/etc/vconsole.conf"
+arch-chroot /mnt localectl set-keymap --no-convert de-latin1-nodeadkeys
+echo "Done."
+echo
 
 ##########