diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index 0439523e..097bfddb 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -19,8 +19,38 @@ jobs:
     - name: Build
       run: |
         ./gradlew assembleDebug
-    - name: Store generated APK file
+    - name: Store generated universal APK file
       uses: actions/upload-artifact@v2
       with:
-        name: termux-app
-        path: ./app/build/outputs/apk/debug
+        name: termux-app-universal
+        path: |
+            ./app/build/outputs/apk/debug/app-universal-debug.apk
+            ./app/build/outputs/apk/debug/output-metadata.json
+    - name: Store generated arm64-v8a APK file
+      uses: actions/upload-artifact@v2
+      with:
+        name: termux-app-arm64-v8a
+        path: |
+          ./app/build/outputs/apk/debug/app-arm64-v8a-debug.apk
+          ./app/build/outputs/apk/debug/output-metadata.json
+    - name: Store generated armeabi-v7a APK file
+      uses: actions/upload-artifact@v2
+      with:
+        name: termux-app-armeabi-v7a
+        path: |
+          ./app/build/outputs/apk/debug/app-armeabi-v7a-debug
+          ./app/build/outputs/apk/debug/output-metadata.json
+    - name: Store generated x86_64 APK file
+      uses: actions/upload-artifact@v2
+      with:
+        name: termux-app-x86_64
+        path: |
+          ./app/build/outputs/apk/debug/app-x86_64-debug.apk
+          ./app/build/outputs/apk/debug/output-metadata.json
+    - name: Store generated x86 APK file
+      uses: actions/upload-artifact@v2
+      with:
+        name: termux-app-x86
+        path: |
+          ./app/build/outputs/apk/debug/app-x86-debug.apk
+          ./app/build/outputs/apk/debug/output-metadata.json
diff --git a/app/build.gradle b/app/build.gradle
index ecee202c..540419b1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,10 +44,14 @@ android {
             }
         }
 
-        ndk {
-            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+        splits {
+            abi {
+                enable gradle.startParameter.taskNames.any { it.contains("Debug") }
+                reset ()
+                include 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
+                universalApk true
+            }
         }
-
     }
 
     signingConfigs {