diff --git a/etc/archboot/defaults b/etc/archboot/defaults
index 3138f78be..b00bbf8d5 100644
--- a/etc/archboot/defaults
+++ b/etc/archboot/defaults
@@ -47,11 +47,11 @@ _SERVER_IMAGE_DIR="${_SERVER_PUBLIC}/archboot-images"
 _SERVER_SOURCE_DIR="${_SERVER_PUBLIC}/archboot-sources"
 _PACMAN_AARCH64="pacman-aarch64-chroot"
 _PACMAN_AARCH64_CHROOT="${_PACMAN_AARCH64}-latest.tar.zst"
-_SERVER_PACMAN_AARCH64="${_SERVER_PUBLIC}/archboot-helper/${_PACMAN_AARCH64}"
+_SERVER_PACMAN_AARCH64="${_SERVER_SOURCE_DIR}/${_PACMAN_AARCH64}"
 # public download paths
 _ARCHBOOT_PUBLIC="https://pkgbuild.com/~tpowa"
 _ARCHBOOT_SOURCE="${_ARCHBOOT_PUBLIC}/archboot-sources"
-_ARCHBOOT_AARCH64_CHROOT_PUBLIC="${_ARCHBOOT_PUBLIC}/archboot-helper/${_PACMAN_AARCH64}"
+_ARCHBOOT_AARCH64_CHROOT_PUBLIC="${_ARCHBOOT_SOURCE}/${_PACMAN_AARCH64}"
 # local user and group
 _USER="tobias"
 _GROUP="users"
diff --git a/usr/lib/archboot/bootloader.sh b/usr/lib/archboot/bootloader.sh
index a9b7bc8e3..4681cba5e 100644
--- a/usr/lib/archboot/bootloader.sh
+++ b/usr/lib/archboot/bootloader.sh
@@ -8,7 +8,7 @@ _SHIM_URL="https://kojipkgs.fedoraproject.org/packages/shim/${_SHIM_VERSION}/${_
 _SHIM_RPM="x86_64/shim-x64-${_SHIM_VERSION}-${_SHIM_RELEASE}.x86_64.rpm"
 _SHIM32_RPM="x86_64/shim-ia32-${_SHIM_VERSION}-${_SHIM_RELEASE}.x86_64.rpm"
 _SHIM_AA64_RPM="aarch64/shim-aa64-${_SHIM_VERSION}-${_SHIM_RELEASE}.aarch64.rpm"
-_ARCH_SERVERDIR="/home/tpowa/public_html/archboot-helper/bootloader"
+_ARCH_SERVERDIR="/home/tpowa/public_html/archboot-bootloader-sources"
 _GRUB_ISO="/usr/share/archboot/grub/archboot-iso-grub.cfg"
 
 _prepare_shim_files () {