diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh
index d2569911e4..3613ade4d5 100644
--- a/scripts/build/termux_step_setup_toolchain.sh
+++ b/scripts/build/termux_step_setup_toolchain.sh
@@ -6,10 +6,10 @@ termux_step_setup_toolchain() {
 	# toolchain setup to ensure that everyone gets an updated
 	# toolchain
 	if [ "${TERMUX_NDK_VERSION}" = 25 ]; then
-		TERMUX_STANDALONE_TOOLCHAIN+="-v0"
+		TERMUX_STANDALONE_TOOLCHAIN+="-v1"
 		termux_step_setup_toolchain_25
 	elif [ "${TERMUX_NDK_VERSION}" = 23c ]; then
-		TERMUX_STANDALONE_TOOLCHAIN+="-v1"
+		TERMUX_STANDALONE_TOOLCHAIN+="-v2"
 		termux_step_setup_toolchain_23c
 	else
 		termux_error_exit "We do not have a setup_toolchain function for NDK version $TERMUX_NDK_VERSION"
diff --git a/scripts/build/toolchain/termux_step_setup_toolchain_23c.sh b/scripts/build/toolchain/termux_step_setup_toolchain_23c.sh
index f37994959a..9f052e6aad 100644
--- a/scripts/build/toolchain/termux_step_setup_toolchain_23c.sh
+++ b/scripts/build/toolchain/termux_step_setup_toolchain_23c.sh
@@ -205,7 +205,7 @@ termux_step_setup_toolchain_23c() {
 	sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \
 		usr/include/android/api-level.h
 
-	$TERMUX_ELF_CLEANER usr/lib/*/*/*.so
+	$TERMUX_ELF_CLEANER --api-level=$TERMUX_PKG_API_LEVEL usr/lib/*/*/*.so
 	for dir in usr/lib/*; do
 		# This seem to be needed when building rust
 		# packages
diff --git a/scripts/build/toolchain/termux_step_setup_toolchain_25.sh b/scripts/build/toolchain/termux_step_setup_toolchain_25.sh
index 471949b811..6f8ed2fa59 100644
--- a/scripts/build/toolchain/termux_step_setup_toolchain_25.sh
+++ b/scripts/build/toolchain/termux_step_setup_toolchain_25.sh
@@ -198,7 +198,7 @@ termux_step_setup_toolchain_25() {
 	sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \
 		usr/include/android/api-level.h
 
-	$TERMUX_ELF_CLEANER usr/lib/*/*/*.so
+	$TERMUX_ELF_CLEANER --api-level=$TERMUX_PKG_API_LEVEL usr/lib/*/*/*.so
 	for dir in usr/lib/*; do
 		# This seem to be needed when building rust
 		# packages