diff --git a/maketoolchain.sh b/maketoolchain.sh
index 2dc12b7..2a2e226 100755
--- a/maketoolchain.sh
+++ b/maketoolchain.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
-android-ndk-r10e/build/tools/make-standalone-toolchain.sh \
+$NDK_HOME/build/tools/make-standalone-toolchain.sh \
 	--arch=arm64 \
 	--platform=android-21 \
-	--install-dir=`pwd`/android-ndk-r10e/generated-toolchains/android-arm64-toolchain
-cp devkit.info.arm64 android-ndk-r10e/generated-toolchains/android-arm64-toolchain/
+	--install-dir=$NDK_HOME/generated-toolchains/android-arm64-toolchain
+cp devkit.info.arm64 $NDK_HOME/generated-toolchains/android-arm64-toolchain/
diff --git a/setdevkitpath.sh b/setdevkitpath.sh
index 612efe8..e5fc21a 100644
--- a/setdevkitpath.sh
+++ b/setdevkitpath.sh
@@ -1,8 +1,8 @@
-if [[ -z "$NDK_HOME" ]]; then
-  export NDK=`pwd`/android-ndk-r10e
-else
-  export NDK="$NDK_HOME"
-fi
+# Override GitHub Actions env vars
+
+# if [[ -z "$NDK_HOME" ]]; then
+  export NDK_HOME=`pwd`/android-ndk-r10e
+# fi
 
 export NDK=$NDK_HOME
 export ANDROID_DEVKIT=$NDK/generated-toolchains/android-arm64-toolchain