diff --git a/build-alpine.sh b/build-alpine.sh
index 94019df..c1195b5 100644
--- a/build-alpine.sh
+++ b/build-alpine.sh
@@ -122,6 +122,9 @@ if [ "$(id -u)" = "0" ]; then
     # Run abuild as builduser in /home/builduser where APKBUILD exists
     su - builduser -c "cd /home/builduser && abuild checksum && abuild -d -F"
     
+    # Install public key to fix UNTRUSTED signature error
+    cp /home/builduser/.abuild/*.rsa.pub /etc/apk/keys/ 2>/dev/null || true
+    
     # Copy APK from builduser packages to releases
     mkdir -p releases
     cp /home/builduser/packages/x86_64/*.apk releases/ 2>/dev/null || cp /home/builduser/packages/*.apk releases/ 2>/dev/null || find /home/builduser/packages -name "*.apk" -exec cp {} releases/ \; 2>/dev/null || true
diff --git a/build-arch.sh b/build-arch.sh
index 78fa2ca..d99ab64 100644
--- a/build-arch.sh
+++ b/build-arch.sh
@@ -25,8 +25,8 @@ else
     echo "Skipping cargo build (SKIP_CARGO_BUILD is set)"
 fi
 
-# Create package directory
-PKGDIR=$(pwd)/arch-package
+# Create package directory in /home/builduser/repo (accessible by builduser)
+PKGDIR=/home/builduser/repo/arch-package
 mkdir -p "$PKGDIR"/usr/bin
 mkdir -p "$PKGDIR"/etc/linux_patch_api
 mkdir -p "$PKGDIR"/usr/lib/systemd/system
@@ -38,8 +38,8 @@ cp configs/linux-patch-api.service "$PKGDIR"/usr/lib/systemd/system/
 cp configs/config.yaml.example "$PKGDIR"/etc/linux_patch_api/config.yaml
 cp configs/whitelist.yaml.example "$PKGDIR"/etc/linux_patch_api/whitelist.yaml
 
-# Determine workspace path for PKGBUILD
-WORKSPACE_DIR=$(pwd)
+# Use /home/builduser/repo as workspace for PKGBUILD
+WORKSPACE_DIR=/home/builduser/repo
 
 # Create PKGBUILD
 echo "Creating PKGBUILD..."
diff --git a/debian/rules b/debian/rules
index 30a276d..c2841e4 100644
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ export DEB_CARGO_BUILD_FLAGS=--release
 	dh $@
 
 override_dh_auto_build:
-	. "$HOME/.cargo/env"
+	. "$$HOME/.cargo/env"
 	cargo build --release --target x86_64-unknown-linux-gnu
 
 override_dh_auto_install: