diff --git a/.drone.yml b/.drone.yml
index fc5bc7e4..1fdf60e6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -33,7 +33,7 @@ pipeline:
       - tar -czf $FILENAME cwtch
       - sha256sum $FILENAME > $FILENAME.sha256
       - rm -r cwtch
-  build-android:
+  build-android-arm-v7a:
     mem_limit: 3G
     image: therecipe/qt:android
     secrets: [upload_jks_file,upload_jks_pass]
@@ -66,7 +66,45 @@ pipeline:
       - ANDROID_MODULES_INCLUDE="Core,Gui,Svg,QuickWidgets,Xml"  qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build android
       - mv android/assets assets
       - cd deploy
-      - export FILENAME=cwtch-android-$BUILDDATE.apk
+      - export FILENAME=cwtch-android-arm-v7a-$BUILDDATE.apk
+      - cp android/build-release-signed.apk $FILENAME
+      - sha256sum $FILENAME > $FILENAME.sha256
+      - rm -r android
+  build-android-arm64-v8a:
+    mem_limit: 3G
+    image: therecipe/qt:android
+    secrets: [upload_jks_file,upload_jks_pass]
+    when: 
+      repo: cwtch.im/ui
+      branch: master
+      event: push
+    environment:
+      - QT_DIR=/opt/Qt
+      - QT_DOCKER='true'
+      - QT_API=5.13.0
+      - ANDROID_NDK_DIR=/home/user/android-ndk-r18b
+      - ANDROID_SDK_DIR=/home/user/android-sdk-linux
+      - GO111MODULE=on
+    commands:
+      - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin
+      - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git
+      - rm -r vendor/
+      - make clean
+      - echo "cwtch-upload" > android/jks_alias
+      - echo $UPLOAD_JKS_PASS > android/jks_pass
+      - echo $UPLOAD_JKS_FILE | tr -d '\n ' > android/ui.jks.b64
+      - base64 --decode android/ui.jks.b64 > android/ui.jks
+      - go mod download
+      - export VERSION=`git describe --tags`
+      - export BUILDDATE=`date +%G-%m-%d-%H-%M`
+      - go mod vendor
+      - qtsetup generate android 
+      - mv assets android/
+      - export GOARCH=arm64
+      - ANDROID_MODULES_INCLUDE="Core,Gui,Svg,QuickWidgets,Xml"  qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build android_arm64
+      - mv android/assets assets
+      - cd deploy
+      - export FILENAME=cwtch-android-arm64-v8a-$BUILDDATE.apk
       - cp android/build-release-signed.apk $FILENAME
       - sha256sum $FILENAME > $FILENAME.sha256
       - rm -r android