diff --git a/waterfox/build.sh b/waterfox/build.sh
index b853c23..7faa77d 100755
--- a/waterfox/build.sh
+++ b/waterfox/build.sh
@@ -26,11 +26,11 @@ export NASM=/usr/lib/nasm-mozilla/bin/nasm
 fi
 
 # For successfull LTO build, we need to use matching LLVM version
-if test "$(lsb_release -sc)" = "focal" || test "$(lsb_release -sc)" = "jammy" || test "$(lsb_release -sc)" = "buster" || test "$(lsb_release -sc)" = "bullseye" || test "$(lsb_release -sc)" = "bookworm"; then
+if test `lsb_release -sc` = "focal" || test `lsb_release -sc`  = "jammy" || test `lsb_release -sc`  = "buster" || test `lsb_release -sc` = "bullseye" || test `lsb_release -sc`  = "bookworm"; then
 export PATH=/usr/lib/llvm-19/bin/:$PATH
 fi
 
-export MOZBUILD_STATE_PATH="$pwd/debian/.mozbuild"
+export MOZBUILD_STATE_PATH="$(pwd)"/debian/.mozbuild
 
 export CC=clang
 export CXX=clang++
@@ -38,7 +38,7 @@ export AR=llvm-ar
 export NM=llvm-nm
 export RANLIB=llvm-ranlib
 export LLVM_PROFDATA=llvm-profdata
-export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
+export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none
 export GEN_PGO=1
 if [ -z "$XDG_RUNTIME_DIR" ]; then
     XDG_RUNTIME_DIR=/run/user/$(id -u)
diff --git a/waterfox/rules b/waterfox/rules
index 6fd6de3..be01296 100755
--- a/waterfox/rules
+++ b/waterfox/rules
@@ -10,8 +10,8 @@ export WF_VERSION=$(shell awk -F ': ' '/^version:/ {print $$2; exit}' ../SOURCES
 export TODAY_DATE=$(shell date +%Y-%m-%d)
 export LC_ALL=C.UTF-8
 export JOBS=$(shell echo $(shell grep -c ^processor /proc/cpuinfo)\/2 | bc)
-export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
-export MOZBUILD_STATE_PATH=$(shell pwd)/debian/.mozbuild
+export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none
+export MOZBUILD_STATE_PATH="$(shell pwd)"/debian/.mozbuild
 export DEB_BUILD_MAINT_OPTIONS = optimize=-lto
 include /usr/share/dpkg/buildflags.mk
 export CXXFLAGS CFLAGS LDFLAGS