diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fdcec06bab94586bbdc06d05a7d9e09cf702e6f4..803924b13f18b08d12d643befbf3848eca1af4d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,15 +49,15 @@ build_Arch_Linux_package:
     - "pacman -Suy base-devel --noconfirm"
     - "useradd non_root"
     - "echo 'non_root ALL=NOPASSWD: ALL' >> /etc/sudoers"
-    - "mkdir /home/non_root"
-    - "cp -r Makefile ArchLinux/ /home/non_root"
+    - "mkdir -p /home/non_root/build"
+    - "cp -r . /home/non_root/build"
     - "chown -R non_root:non_root /home/non_root"
   script:
     # makepkg does not run as root, but it needs sudo to install dependencies
-    - "cd /home/non_root && sudo -u non_root make package_arch"
-    - "cd /home/non_root && pacman -U ArchLinux/*tar.zst --noconfirm"
+    - "cd /home/non_root/build && sudo -u non_root make package_arch"
+    - "cd /home/non_root/build && pacman -U ArchLinux/*tar.zst --noconfirm"
     # artifacts must be relative to the working directory (e.g. /builds/leap/bitmask-vpn)
-    - "cp /home/non_root/ArchLinux/*.tar.zst $CI_PROJECT_DIR"
+    - "cp /home/non_root/build/ArchLinux/*.tar.zst $CI_PROJECT_DIR"
   artifacts:
     paths:
       - '*.tar.zst'
diff --git a/ArchLinux/PKGBUILD b/ArchLinux/PKGBUILD
index bd8680a1111b5aa9404171eb1dd9b2e8edc420fb..782aa3d25b6ab28c69967518f0806dd4a1469f8a 100644
--- a/ArchLinux/PKGBUILD
+++ b/ArchLinux/PKGBUILD
@@ -9,7 +9,8 @@ license=("GPL-3.0-only")
 url="https://0xacab.org/leap/bitmask-vpn"
 conflicts=('riseup-vpn' 'riseup-vpn-git')
 
-source=("git+$url.git")
+#source=("git+$url.git")
+source=("bitmask-vpn::git+file://$(pwd)/../")
 sha256sums=('SKIP')
 
 # qt6-tools has /usr/lib/qt6/bin/lrelease
diff --git a/Makefile b/Makefile
index 13e8a63b0323da31acac27213b8eaefa5f175e74..740c983f817dfaeb79bd12ae562ed4e5e448610c 100644
--- a/Makefile
+++ b/Makefile
@@ -444,7 +444,7 @@ package_deb:
 	@${MAKE} -C build/${PROVIDER} pkg_deb
 
 package_arch:
-	grep -q "Arch Linux" /etc/issue || (echo "Arch Linux system is required to build the Arch Linux package" && exit 1)
+	grep -q "Arch Linux" /etc/os-release || (echo "Arch Linux system is required to build the Arch Linux package" && exit 1)
 	# at least the makepkg binary is mandatory, makepkg is part pacman package
 	(cd ArchLinux && makepkg --syncdeps --noconfirm)