diff --git a/0-preinstall.sh b/0-preinstall.sh
index 1dc8e5e..a4afd5a 100755
--- a/0-preinstall.sh
+++ b/0-preinstall.sh
@@ -143,7 +143,6 @@ echo -ne "
 -------------------------------------------------------------------------
 "
 pacstrap /mnt base base-devel linux linux-firmware vim nano sudo archlinux-keyring wget libnewt --noconfirm --needed
-genfstab -U /mnt >> /mnt/etc/fstab
 echo "keyserver hkp://keyserver.ubuntu.com" >> /mnt/etc/pacman.d/gnupg/gpg.conf
 cp -R ${SCRIPT_DIR} /mnt/root/ArchTitus
 cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist
diff --git a/1-setup.sh b/1-setup.sh
index a7bbd92..67123d5 100755
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -52,7 +52,7 @@ locale-gen
 timedatectl --no-ask-password set-timezone ${TIMEZONE}
 timedatectl --no-ask-password set-ntp 1
 localectl --no-ask-password set-locale LANG="en_US.UTF-8" LC_TIME="en_US.UTF-8"
-
+ln -s /usr/share/zoneinfo/${TIMEZONE} /etc/localtime
 # Set keymaps
 localectl --no-ask-password set-keymap ${KEYMAP}
 
diff --git a/3-post-setup.sh b/3-post-setup.sh
index efd3788..1fecd6c 100755
--- a/3-post-setup.sh
+++ b/3-post-setup.sh
@@ -16,6 +16,7 @@ Final Setup and Configurations
 GRUB EFI Bootloader Install & Check
 "
 source /root/ArchTitus/setup.conf
+genfstab -U /mnt >> /mnt/etc/fstab
 if [[ -d "/sys/firmware/efi" ]]; then
     grub-install --efi-directory=/boot ${DISK}
 fi