diff --git a/install_arch_solphyr.sh b/install_arch_solphyr.sh
index adc803a..cc4aaf5 100644
--- a/install_arch_solphyr.sh
+++ b/install_arch_solphyr.sh
@@ -162,8 +162,16 @@ systemctl enable NetworkManager
 
 # yay (AUR helper)
 if [[ "${INSTALL_YAY,,}" == "yes" ]]; then
-  pacman -Sy --noconfirm base-devel git
-  su - $USERNAME -c "cd /tmp && git clone https://aur.archlinux.org/yay.git && cd yay && makepkg -si --noconfirm && rm -rf /tmp/yay"
+  pacman -S --noconfirm base-devel git go
+  su - "$USERNAME" -c '
+    set -e
+    cd /tmp
+    git clone https://aur.archlinux.org/yay.git
+    cd yay
+    makepkg -si --noconfirm
+    cd
+    rm -rf /tmp/yay
+  '
 fi
 
 # Hardening