diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml.save
similarity index 100%
rename from .github/workflows/android_build.yml
rename to .github/workflows/android_build.yml.save
diff --git a/.github/workflows/android_release.yml b/.github/workflows/android_release.yml
new file mode 100644
index 0000000..84252c2
--- /dev/null
+++ b/.github/workflows/android_release.yml
@@ -0,0 +1,108 @@
+name: Android Release
+
+on:
+  push:
+    branches:
+    - 'master'
+  pull_request:
+    branches:
+    - '*'
+
+defaults:
+  run:
+    shell: bash
+
+env:
+  SOURCE_DIR:   ${{ github.workspace }}
+  QT_VERSION:   5.15.2
+
+jobs:
+  build:
+    runs-on:  ubuntu-20.04
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - 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
+        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} ANDROID_ABIS="armeabi-v7a arm64-v8a"
+            make -j2 apk
+
+      - name: ccache post-run
+        run:  ccache -s
+
+      # Currently disabled since credentials are not working correctly
+      - name: Upload to S3 Bucket
+        if:                 ${{ false }}
+        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://groundcontrol/master --region us-west-2 --acl public-read
diff --git a/tools/update_android_manifest_package.sh b/tools/update_android_manifest_package.sh
new file mode 100755
index 0000000..10041f1
--- /dev/null
+++ b/tools/update_android_manifest_package.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+MANIFEST_FILE=android/AndroidManifest.xml
+
+echo "Adjusting package name for daily build"
+QGC_PKG_NAME="org.mavlink.qgroundcontrolbeta"
+sed -i -e 's/package *= *"[^"]*"/package="'$QGC_PKG_NAME'"/' $MANIFEST_FILE