diff --git a/dkms-make.sh b/dkms-make.sh
index cecac5c..151adc4 100755
--- a/dkms-make.sh
+++ b/dkms-make.sh
@@ -22,5 +22,6 @@ if [ "$sproc" -gt 1 ]; then
 	fi
 fi
 
-kernelver=${kernelver:-$(uname -r)}
-make "-j$sproc" "KVER=$kernelver" "KSRC=/lib/modules/$kernelver/build"
+KVER="${KVER:-$(uname -r)}"
+KSRC="/lib/modules/$KVER/build"
+make "-j$sproc" "KVER=$KVER" "KSRC=$KSRC"
diff --git a/install-driver.sh b/install-driver.sh
index 8d33010..90a239a 100755
--- a/install-driver.sh
+++ b/install-driver.sh
@@ -32,8 +32,9 @@ SCRIPT_VERSION="20230628"
 MODULE_NAME="88x2bu"
 DRV_VERSION="5.13.1"
 
-KARCH="$(uname -m)"
-KVER="$(uname -r)"
+KARCH="${KARCH:-$(uname -m)}"
+KVER="${KVER:-$(uname -r)}"
+KSRC="/lib/modules/$KVER/build"
 MODDESTDIR="/lib/modules/${KVER}/kernel/drivers/net/wireless/"
 
 DRV_NAME="rtl${MODULE_NAME}"
@@ -95,7 +96,7 @@ if ! command -v make >/dev/null 2>&1; then
 fi
 
 # check to see if the correct header files are installed
-if [ ! -d "/lib/modules/$(uname -r)/build" ]; then
+if [ ! -d "$KSRC" ]; then
 	echo "Your kernel header files aren't properly installed."
 	echo "Please consult your distro documentation or user support forums."
 	echo "Once the header files are properly installed, please run \"sudo ./${SCRIPT_NAME}\""
@@ -349,9 +350,9 @@ else
 	fi
 
 	if command -v /usr/bin/time >/dev/null 2>&1; then
-		/usr/bin/time -f "Compile time: %U seconds" dkms build -m ${DRV_NAME} -v ${DRV_VERSION}
+		/usr/bin/time -f "Compile time: %U seconds" dkms build -m ${DRV_NAME} -v ${DRV_VERSION} -k "$KVER" --kernelsourcedir "$KSRC"
 	else
-		dkms build -m ${DRV_NAME} -v ${DRV_VERSION}
+		dkms build -m ${DRV_NAME} -v ${DRV_VERSION} -k "$KVER" --kernelsourcedir "$KSRC"
 	fi
 	RESULT=$?
 
@@ -367,7 +368,7 @@ else
 		echo ": ---------------------------"
 	fi
 
-	dkms install -m ${DRV_NAME} -v ${DRV_VERSION}
+	dkms install -m ${DRV_NAME} -v ${DRV_VERSION} -k "$KVER" --kernelsourcedir "$KSRC"
 	RESULT=$?
 
 	if [ "$RESULT" != "0" ]; then
diff --git a/remove-driver.sh b/remove-driver.sh
index 275ee7d..dd6685a 100755
--- a/remove-driver.sh
+++ b/remove-driver.sh
@@ -32,8 +32,9 @@ SCRIPT_VERSION="20230226"
 MODULE_NAME="88x2bu"
 DRV_VERSION="5.13.1"
 
-KARCH="$(uname -m)"
-KVER="$(uname -r)"
+KARCH="${KARCH:-$(uname -m)}"
+KVER="${KVER:-$(uname -r)}"
+KSRC="/lib/modules/$KVER/build"
 MODDESTDIR="/lib/modules/${KVER}/kernel/drivers/net/wireless/"
 
 DRV_NAME="rtl${MODULE_NAME}"
@@ -109,7 +110,7 @@ fi
 if command -v dkms >/dev/null 2>&1; then
 	echo "Removing a dkms installation."
 	#  2>/dev/null suppresses the output of dkms
-	dkms remove -m ${DRV_NAME} -v ${DRV_VERSION} --all 2>/dev/null
+	dkms remove -m ${DRV_NAME} -v ${DRV_VERSION} -k "$KVER" --kernelsourcedir "$KSRC" --all 2>/dev/null
 	RESULT=$?
 	#echo "Result=${RESULT}"