diff --git a/install.sh b/install.sh
index 705efb9..27bdc62 100755
--- a/install.sh
+++ b/install.sh
@@ -66,10 +66,6 @@ ufw enable
 sed -i 's/HOOKS=(base systemd autodetect microcode modconf kms keyboard keymap sd-vconsole block filesystems fsck)/HOOKS=(base systemd autodetect microcode modconf kms keyboard keymap sd-vconsole block sd-encrypt filesystems fsck)/' /etc/mkinitcpio.conf
 mkinitcpio -P
 
-printf "Configuring yay..."
-git clone https://aur.archlinux.org/yay.git /tmp/yay
-cd /tmp/yay && makepkg -si
-
 printf "Installing yay packages"
 yay -S ttf-ms-fonts
 
@@ -88,6 +84,10 @@ su - "$USERNAME" -c "git clone https://universe.0xinfinity.dev/0x221E/dotfiles.g
 su - "$USERNAME" -c "mkdir -p /home/$USERNAME/.config"
 su - "$USERNAME" -c "cp -sr /home/$USERNAME/dotfiles/* /home/$USERNAME/.config/"
 
+printf "Configuring yay..."
+su - "$USERNAME" -c "git clone https://aur.archlinux.org/yay.git"
+su - "$USERNAME" -c "cd yay && makepkg -si"
+
 echo "$USERNAME:$PASS" | chpasswd
 
 bootctl install