diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2d0dd07cb..d701eb7ad 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,6 +43,7 @@ jobs:
     - name: download-deps
       working-directory: ./buildscripts
       run: |
+        export mpvarchoverride=armv7l
         chmod +x github-prepare.sh
         ./github-prepare.sh
     - name: build-apk
@@ -101,6 +102,7 @@ jobs:
       - name: download-deps
         working-directory: ./buildscripts
         run: |
+          export mpvarchoverride=x86_64
           chmod +x github-prepare.sh
           ./github-prepare.sh x86_64
       - name: build-apk
@@ -157,6 +159,7 @@ jobs:
       - name: download-deps
         working-directory: ./buildscripts
         run: |
+          export mpvarchoverride=arm64
           chmod +x github-prepare.sh
           ./github-prepare.sh arm64
       - name: build-apk
diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
index 102dd35e0..f71dd65ba 100644
--- a/app/src/main/jni/Android.mk
+++ b/app/src/main/jni/Android.mk
@@ -1,5 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
-
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+PREFIX = $(PREFIX32)
+endif
 ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
 PREFIX = $(PREFIX64)
 endif
diff --git a/app/src/main/jni/Application.mk b/app/src/main/jni/Application.mk
index fa5b0e51b..fcfa92c9d 100644
--- a/app/src/main/jni/Application.mk
+++ b/app/src/main/jni/Application.mk
@@ -1,4 +1,6 @@
+ifneq ($(PREFIX32),)
 APP_ABI := armeabi-v7a
+endif
 ifneq ($(PREFIX64),)
 APP_ABI += arm64-v8a
 endif
diff --git a/buildscripts/buildall.sh b/buildscripts/buildall.sh
index 8f34cde3f..97e9e892b 100755
--- a/buildscripts/buildall.sh
+++ b/buildscripts/buildall.sh
@@ -7,7 +7,13 @@ cleanbuild=0
 nodeps=0
 clang=1
 target=mpv-android
+
+if [ -z $mpvarchoverride ]
+then
 arch=armv7l
+else
+arch=$mpvarchoverride
+fi
 
 getdeps () {
 	varname="dep_${1//-/_}[*]"
@@ -118,6 +124,7 @@ usage () {
 	echo "--clean        Clean build dirs before compiling"
 	echo "--gcc          Use gcc compiler (unsupported!)"
 	echo "--arch <arch>  Build for specified architecture (default: $arch; supported: armv7l, arm64, x86_64)"
+	echo "--no32 <arch>	 Build only for specified architecture (supported: armv7l, arm64, x86_64)"
 	exit 0
 }
 
diff --git a/buildscripts/scripts/mpv-android.sh b/buildscripts/scripts/mpv-android.sh
index e7f849d79..a2ae4c3fb 100755
--- a/buildscripts/scripts/mpv-android.sh
+++ b/buildscripts/scripts/mpv-android.sh
@@ -24,11 +24,12 @@ nativeprefix () {
 	fi
 }
 
+prefix32=$(nativeprefix "armv7l")
 prefix64=$(nativeprefix "arm64")
 prefix_x64=$(nativeprefix "x86_64")
 prefix_x86=$(nativeprefix "x86")
 
-PREFIX=$BUILD/prefix/armv7l PREFIX64=$prefix64 PREFIX_X64=$prefix_x64 PREFIX_X86=$prefix_x86 \
+PREFIX=$BUILD/prefix/armv7l PREFIX64=$prefix64 PREFIX32=$prefix32 PREFIX_X64=$prefix_x64 PREFIX_X86=$prefix_x86 \
 ndk-build -C app/src/main -j$cores
 ./gradlew assembleDebug assembleRelease