diff --git a/action.yml b/action.yml
index bb5d8b2..83af441 100644
--- a/action.yml
+++ b/action.yml
@@ -18,7 +18,14 @@ runs:
       with:
         entrypoint: bash
         args: |
-          -c 'useradd -m user && echo "user ALL=(ALL:ALL) NOPASSWD: ALL" >/etc/sudoers.d/user && chmod 777 . && pacman -Syu --noconfirm && sudo -u user -- makepkg -s'
+          -euo pipefail -c '
+            pacman -Syu --noconfirm git
+            (cd ~; git clone https://aur.archlinux.org/yay.git; cd yay; makepkg -si --noconfirm)
+            useradd -m user
+            echo "user ALL=(ALL:ALL) NOPASSWD: ALL" >/etc/sudoers.d/user
+            chmod 777 .
+            sudo -u user -- PACMAN=yay makepkg -s --noconfirm
+          '
     
     - name: Ensure .SRCINFO is up to date
       uses: docker://docker.io/library/archlinux:base-devel