diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index b6a5ae8..a277639 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -4,4 +4,4 @@ USER root
 COPY makepkg.sh /usr/local/bin/drone-makepkg
 USER builder
 
-ENTRYPOINT ["drone-makepkg"]
+ENTRYPOINT ["/usr/local/bin/drone-makepkg"]
diff --git a/Dockerfile.x86_64 b/Dockerfile.x86_64
index 055ab78..24f3899 100644
--- a/Dockerfile.x86_64
+++ b/Dockerfile.x86_64
@@ -4,4 +4,4 @@ USER root
 COPY makepkg.sh /usr/local/bin/drone-makepkg
 USER builder
 
-ENTRYPOINT ["drone-makepkg"]
+ENTRYPOINT ["/usr/local/bin/drone-makepkg"]
diff --git a/makepkg.sh b/makepkg.sh
old mode 100644
new mode 100755
index fbc9f86..86519b2
--- a/makepkg.sh
+++ b/makepkg.sh
@@ -6,7 +6,14 @@ echo "Building on: $DRONE_STAGE_MACHINE"
 
 AUR_URL="https://aur.archlinux.org"
 OUTDIR="$DRONE_WORKSPACE_BASE/out"
-mkdir -p "$OUTDIR"
+sudo mkdir -p "$OUTDIR"
+sudo chown -R builder:builder "$OUTDIR"
+
+export PKGDEST="$OUTDIR"
+export SRCDEST="$HOME/sources"
+export BUILDDIR="$HOME/builddir"
+mkdir -p "$SRCDEST"
+mkdir -p "$BUILDDIR"
 
 if [ "$PLUGIN_AUTO_MAKEFLAGS" != "no" ]; then
   echo "MAKEFLAGS='-j$(nproc)'" | sudo tee -a /etc/makepkg.conf
@@ -14,35 +21,30 @@ fi
 
 if [ "$PLUGIN_INSTALL" != "" ]; then
   echo "Installing packages before build: $PLUGIN_INSTALL"
-  pikaur -Syu --noprogressbar --noconfirm $(echo "$PLUGIN_INSTALL" | tr ',' ' ')
+  yay -Syu --noprogressbar --noconfirm --mflags=-A $(echo "$PLUGIN_INSTALL" | tr ',' ' ')
 fi
 
 if [ "$PLUGIN_INSTALL_OUTPUTS" != "no" ] && [ -n "$(ls -A "$OUTDIR")" ]; then
   echo "Installing previous build outputs"
-  pikaur -U --noprogressbar --noconfirm "$OUTDIR"/*
+  yay -U --noprogressbar --noconfirm "$OUTDIR"/*
 fi
 
 # Clone package repo
 if [ "$PLUGIN_AUR" != "" ]; then
-  echo "Building AUR package $PLUGIN_AUR"
+  echo "Building AUR package: $PLUGIN_AUR"
+  cd ~
   git clone "$AUR_URL/$PLUGIN_AUR.git" package
   cd package
 elif [ "$PLUGIN_GIT" != "" ]; then
   echo "Building package from git repository: $PLUGIN_GIT"
+  cd ~
   git clone "$PLUGIN_GIT" package
   cd package
 else
   echo "Building source repository"
 fi
 
-PKGBUILD="PKGBUILD"
-if [ "$PLUGIN_PKGBUILD" != "" ]; then
-  echo "Using PKGBUILD: $PLUGIN_PKGBUILD"
-  PKGBUILD="$PLUGIN_PKGBUILD"
-fi
-
 echo "Running build"
-pikaur --noprogressbar --noconfirm -P "$PKGBUILD"
+makepkg -sAc --skippgpcheck --noconfirm --noprogressbar
 
-echo "Moving packages to output directory: $OUTDIR"
-mv *.pkg.* "$OUTDIR/"
+sudo chown -R root:root "$OUTDIR"