diff --git a/.github/workflows/android_release.yml b/.github/workflows/android_32_release.yml
similarity index 97%
rename from .github/workflows/android_release.yml
rename to .github/workflows/android_32_release.yml
index e998db531ff..abfcfe7c77c 100644
--- a/.github/workflows/android_release.yml
+++ b/.github/workflows/android_32_release.yml
@@ -1,4 +1,4 @@
-name: Android Release
+name: Android 32-bit Release
 
 on:
   push:
@@ -15,7 +15,7 @@ defaults:
 env:
   SOURCE_DIR:   ${{ github.workspace }}
   QT_VERSION:   5.15.2
-  ARTIFACT:     QGroundControl.aab
+  ARTIFACT:     QGroundControl32.apk
 
 jobs:
   build:
@@ -101,7 +101,7 @@ jobs:
               echo "Daily build" &&
               export STABLE_OR_DAILY=DailyBuild;
             fi
-            qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=${STABLE_OR_DAILY} CONFIG+=installer ANDROID_ABIS="armeabi-v7a arm64-v8a"
+            qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=${STABLE_OR_DAILY} CONFIG+=installer ANDROID_ABIS="armeabi-v7a"
             make -j2
 
       - name: ccache post-run
diff --git a/.github/workflows/android_64_release.yml b/.github/workflows/android_64_release.yml
new file mode 100644
index 00000000000..5a38ba386f1
--- /dev/null
+++ b/.github/workflows/android_64_release.yml
@@ -0,0 +1,122 @@
+name: Android 64-bit Release
+
+on:
+  push:
+    branches:
+    - 'master'
+  pull_request:
+    branches:
+    - '*'
+
+defaults:
+  run:
+    shell: bash
+
+env:
+  SOURCE_DIR:   ${{ github.workspace }}
+  QT_VERSION:   5.15.2
+  ARTIFACT:     QGroundControl64.apk
+
+jobs:
+  build:
+    runs-on:  ubuntu-20.04
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Get all tags for correct version determination
+        working-directory:  ${{ github.workspace }}
+        run: |
+          git fetch --unshallow
+          git fetch --all --tags
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v2
+        with:
+          version:      ${{ env.QT_VERSION }}
+          host:         linux
+          target:       android
+          dir:          ${{ runner.temp }}
+          modules:      qtcharts
+          setup-python: true
+
+      - name: Install ccache
+        run:  sudo apt-get install ccache
+
+      - name: Prepare ccache timestamp
+        id: ccache_cache_timestamp
+        shell: cmake -P {0}
+        run: |
+          string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+          message("::set-output name=timestamp::${current_date}")
+
+      - name: ccache cache files
+        uses: actions/cache@v2
+        with:
+          path:         ~/.ccache
+          key:          ${{ runner.os }}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+          restore-keys: ${{ runner.os }}-ccache-
+
+      - name: Setup ccache
+        run: |
+            mkdir -p ~/.ccache
+            echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
+            echo "compression = true" >> ~/.ccache/ccache.conf
+            echo "compression_level = 5" >> ~/.ccache/ccache.conf
+            ccache -s
+            ccache -z
+
+      - name: Create build directory
+        run:  mkdir ${{ runner.temp }}/shadow_build_dir
+
+      - name:               Install gstreamer
+        working-directory:  ${{ github.workspace }}
+        run: |
+            wget --quiet https://gstreamer.freedesktop.org/data/pkg/android/1.18.5/gstreamer-1.0-android-universal-1.18.5.tar.xz
+            mkdir gstreamer-1.0-android-universal-1.18.5
+            tar xf gstreamer-1.0-android-universal-1.18.5.tar.xz -C gstreamer-1.0-android-universal-1.18.5
+
+      - name: Git branch name
+        id:   git-branch-name
+        uses: EthanSK/git-branch-name-action@v1
+
+      - name: Update android manifest
+        run: |
+          if [ $GIT_BRANCH_NAME != "Stable*" ]; then
+            ${SOURCE_DIR}/tools/update_android_manifest_package.sh ${GIT_BRANCH_NAME}
+          fi
+
+      - name: Build
+        working-directory: ${{ runner.temp }}/shadow_build_dir
+        env:
+          ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+        run:  |
+            if [ $GIT_BRANCH_NAME == "Stable*" ]; then
+              echo "Stable build" &&
+              export STABLE_OR_DAILY=StableBuild;
+            else
+              echo "Daily build" &&
+              export STABLE_OR_DAILY=DailyBuild;
+            fi
+            qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=${STABLE_OR_DAILY} CONFIG+=installer ANDROID_ABIS="arm64-v8a"
+            make -j2
+
+      - name: ccache post-run
+        run:  ccache -s
+
+      - name: Save artifact
+        uses: actions/upload-artifact@master
+        with:
+          name: ${{ env.ARTIFACT }}
+          path: ${{ runner.temp }}/shadow_build_dir/package/${{ env.ARTIFACT }}
+
+      - name: Upload to S3 Bucket
+        if:   github.event_name == 'push'
+        working-directory:  ${{ runner.temp }}/shadow_build_dir/package
+        run: |
+              aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
+              aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+              aws s3 cp ${ARTIFACT} s3://qgroundcontrol/builds/master/${ARTIFACT} --region us-west-2 --acl public-read
diff --git a/.github/workflows/android_build.yml.save b/.github/workflows/android_build.yml.save
deleted file mode 100644
index cbefd8e0c8d..00000000000
--- a/.github/workflows/android_build.yml.save
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Android build
-
-on: [push, pull_request]
-
-defaults:
-  run:
-    shell: bash
-jobs:
-  build:
-    runs-on:  ubuntu-latest
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v2
-        with:
-          submodules: recursive
-
-      - name: Build
-        run: |
-          mkdir build
-          sudo docker run -t --mount type=bind,source=$PWD,target=/home/user/qgroundcontrol --user root williangalvani/qgc-android-build
-
-      - name: Save artifact
-        uses: actions/upload-artifact@master
-        with:
-          name: QGroundControl.apk
-          path: build/dist/build/outputs/apk/dist-release-unsigned.apk
\ No newline at end of file
diff --git a/QGCCommon.pri b/QGCCommon.pri
index 4ed68beedd6..89f3ee37201 100644
--- a/QGCCommon.pri
+++ b/QGCCommon.pri
@@ -258,9 +258,6 @@ installer {
     CONFIG -= debug
     CONFIG -= debug_and_release
     CONFIG += release
-    AndroidBuild {
-        #ANDROID_ABIS = "armeabi-v7a arm64-v8a"
-    }
     message(Build Installer)
 }
 
diff --git a/QGCPostLinkInstaller.pri b/QGCPostLinkInstaller.pri
index e67797d5022..5f478e50488 100644
--- a/QGCPostLinkInstaller.pri
+++ b/QGCPostLinkInstaller.pri
@@ -62,8 +62,8 @@ installer {
         } else {
             QMAKE_POST_LINK += && mkdir -p package
             QMAKE_POST_LINK += && make apk_install_target INSTALL_ROOT=android-build/
-            QMAKE_POST_LINK += && androiddeployqt --verbose --input android-QGroundControl-deployment-settings.json --output android-build --release --aab --sign $${SOURCE_DIR}/android/android_release.keystore QGCAndroidKeyStore --storepass $$(ANDROID_KEYSTORE_PASSWORD)
-            QMAKE_POST_LINK += && cp android-build/build/outputs/bundle/release/android-build-release.aab package/QGroundControl.aab
+            QMAKE_POST_LINK += && androiddeployqt --verbose --input android-QGroundControl-deployment-settings.json --output android-build --release --sign $${SOURCE_DIR}/android/android_release.keystore QGCAndroidKeyStore --storepass $$(ANDROID_KEYSTORE_PASSWORD)
+            QMAKE_POST_LINK += && cp android-build/build/outputs/apk/release/android-build-release-signed.apk package/QGroundControl.apk
         }
     }
 }