diff --git a/base/arch/Dockerfile b/base/arch/Dockerfile
index aee1a93..417d2dc 100644
--- a/base/arch/Dockerfile
+++ b/base/arch/Dockerfile
@@ -1,3 +1,16 @@
+FROM archlinux:latest as YAYBUILD
+
+
+RUN pacman -Sy
+RUN echo "y" | pacman -Syu
+RUN echo "y" | pacman -S base-devel git gcc cmake nasm curl tar zip unzip sqlite3 bzip2 cabextract gnu-netcat
+
+WORKDIR /tmp
+RUN git clone https://aur.archlinux.org/yay.git
+WORKDIR /tmp/yay
+RUN make
+
+
 FROM archlinux:latest
 
 LABEL author="Tara Piccari" maintainer="tarapiccari@gmail.com"
@@ -5,7 +18,17 @@ LABEL upstream="https://github.com/pelican-eggs/yolks"
 
 RUN pacman -Sy
 RUN echo "y" | pacman -Syu
-RUN echo "y" | pacman -S base-devel git gcc cmake nasm curl tar zip unzip sqlite3 bzip2 cabextract gnu-netcat tini
+RUN echo "y" | pacman -S base-devel git gcc cmake nasm curl tar zip unzip sqlite3 bzip2 cabextract gnu-netcat
+
+# Install Yay from the builder
+WORKDIR /tmp
+RUN git clone https://aur.archlinux.org/yay.git
+WORKDIR /tmp/yay
+RUN echo "y" | makepkg -si
+WORKDIR /
+RUN rm -rf /tmp/yay
+RUN echo "y" | yay -S tini-git
+
 
 RUN          useradd -m -d /home/container -s /bin/bash container