diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml
index ffc6cf82..8af6cb47 100644
--- a/.github/workflows/flutter-build.yml
+++ b/.github/workflows/flutter-build.yml
@@ -28,8 +28,8 @@ jobs:
       - run: pip3 install appimage-builder
       - run: make appimage
       # Building Android Application
-      - run: flutter build apk
-      - run: mv build/app/outputs/apk/release/app-release.apk build/Spotube-android-arm64-v8a.apk
+      - run: flutter build apk --split-per-abi
+      - run: make apk
       - uses: actions/upload-artifact@v2
         with:
           name: Spotube-Linux-Bundle
@@ -38,6 +38,8 @@ jobs:
             build/Spotube-linux-x86_64.tar.xz
             build/Spotube-*-x86_64.AppImage
             build/Spotube-android-arm64-v8a.apk
+            build/Spotube-android-armeabi-v7a.apk
+            build/Spotube-android-x86_64.apk
   build_windows:
     runs-on: windows-latest
     steps:
diff --git a/Makefile b/Makefile
index 4e101560..5e0647aa 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ INNO_VERSION=6.2.0
 TEMP_DIR=/tmp/spotube-tar
 USR_SHARE=deb-struct/usr/share
 BUNDLE_DIR=build/linux/x64/release/bundle
+ANDROID_OUTPUT_DIR=build/app/outputs/apk/release
 MIRRORLIST=${PWD}/build/mirrorlist
 deb: 
 		mkdir -p ${USR_SHARE}/spotube\
@@ -50,5 +51,10 @@ choco:
 			powershell cp build\installer\Spotube-windows-x86_64-setup.exe choco-struct\tools
 			powershell choco pack .\choco-struct\spotube.nuspec  --outputdirectory build
 
+apk:
+				mv ${ANDROID_OUTPUT_DIR}/app-arm64-v8a-release.apk build/Spotube-android-arm64-v8a.apk\
+				&& mv ${ANDROID_OUTPUT_DIR}/app-armeabi-v7a-release.apk build/Spotube-android-armeabi-v7a.apk\
+				&& mv ${ANDROID_OUTPUT_DIR}/app-x86_64-release.apk build/Spotube-android-x86_64.apk
+
 gensums:
 				sh -c scripts/gensums.sh