diff --git a/metadata/net.drawpile.yml b/metadata/net.drawpile.yml
index 0f627926ac..08122053f8 100644
--- a/metadata/net.drawpile.yml
+++ b/metadata/net.drawpile.yml
@@ -9,6 +9,8 @@ SourceCode: https://github.com/drawpile/Drawpile
 IssueTracker: https://github.com/drawpile/Drawpile/issues
 Translation: https://hosted.weblate.org/engage/drawpile/
 Changelog: https://drawpile.net/news/
+Donate: https://donate.drawpile.org/
+Liberapay: Drawpile
 
 RepoType: git
 Repo: https://github.com/drawpile/Drawpile.git
@@ -255,6 +257,84 @@ Builds:
       - QT_ANDROID_PACKAGE_MODE=release cmake --build buildandroid-x86_64-release
         --config Release
 
+  - versionName: 2.3.0-beta.1
+    versionCode: 2030001001
+    commit: 8eea3ebdde40abb90ef02f4af03ff6722c5a8cc3
+    sudo:
+      - apt-get update
+      - apt-get install -y build-essential cmake nasm ninja-build pkg-config yasm
+      - rm -rf /opt/android-sdk/{build-tools,ndk,platforms}
+      - sdkmanager 'build-tools;34.0.0-rc3' 'ndk;27.0.12077973' 'platforms;android-34'
+    output: buildandroid-armeabi-v7a-release/bin/Drawpile-$$VERSION$$-23-23-armeabi-v7a.apk
+    build:
+      - BUILD_TYPE=release ANDROID_ABI=armeabi-v7a ANDROID_BUILD_TOOLS_VERSION=34.0.0-rc3
+        ANDROID_NDK_VERSION=27.0.12077973 ANDROID_PLATFORM_VERSION=34 ANDROID_TARGET_VERSION=23
+        ANDROID_SDK_DIR=$$SDK$$ ANDROID_SDKMANAGER=sdkmanager bash -c 'pkg/android/build.bash
+        setup && pkg/android/build.bash configure -DBUILD_ANDROID_VERSION_CODE=$$VERCODE$$
+        -DBUILD_VERSION=$$VERSION$$ -DCLANG_TIDY=OFF -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+        -DDISABLE_UPDATE_CHECK_DEFAULT=ON -DDIST_BUILD=ON -DUSE_STRICT_ALIASING=ON
+        -DANDROID_MIN_SDK_VERSION=23'
+      - QT_ANDROID_PACKAGE_MODE=release cmake --build buildandroid-armeabi-v7a-release
+        --config Release
+
+  - versionName: 2.3.0-beta.1
+    versionCode: 2030001002
+    commit: 8eea3ebdde40abb90ef02f4af03ff6722c5a8cc3
+    sudo:
+      - apt-get update
+      - apt-get install -y build-essential cmake nasm ninja-build pkg-config yasm
+      - rm -rf /opt/android-sdk/{build-tools,ndk,platforms}
+      - sdkmanager 'build-tools;34.0.0-rc3' 'ndk;27.0.12077973' 'platforms;android-34'
+    output: buildandroid-arm64-v8a-release/bin/Drawpile-$$VERSION$$-30-34-arm64-v8a.apk
+    build:
+      - BUILD_TYPE=release ANDROID_ABI=arm64-v8a ANDROID_BUILD_TOOLS_VERSION=34.0.0-rc3
+        ANDROID_NDK_VERSION=27.0.12077973 ANDROID_PLATFORM_VERSION=34 ANDROID_SDK_DIR=$$SDK$$
+        ANDROID_SDKMANAGER=sdkmanager bash -c 'pkg/android/build.bash setup && pkg/android/build.bash
+        configure -DBUILD_ANDROID_VERSION_CODE=$$VERCODE$$ -DBUILD_VERSION=$$VERSION$$
+        -DCLANG_TIDY=OFF -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DDISABLE_UPDATE_CHECK_DEFAULT=ON
+        -DDIST_BUILD=ON -DUSE_STRICT_ALIASING=ON -DANDROID_MIN_SDK_VERSION=30'
+      - QT_ANDROID_PACKAGE_MODE=release cmake --build buildandroid-arm64-v8a-release
+        --config Release
+
+  - versionName: 2.3.0-beta.1
+    versionCode: 2030001003
+    commit: 8eea3ebdde40abb90ef02f4af03ff6722c5a8cc3
+    sudo:
+      - apt-get update
+      - apt-get install -y build-essential cmake nasm ninja-build pkg-config yasm
+      - rm -rf /opt/android-sdk/{build-tools,ndk,platforms}
+      - sdkmanager 'build-tools;34.0.0-rc3' 'ndk;27.0.12077973' 'platforms;android-34'
+    output: buildandroid-x86-release/bin/Drawpile-$$VERSION$$-23-23-x86.apk
+    build:
+      - BUILD_TYPE=release ANDROID_ABI=x86 ANDROID_BUILD_TOOLS_VERSION=34.0.0-rc3
+        ANDROID_NDK_VERSION=27.0.12077973 ANDROID_PLATFORM_VERSION=34 ANDROID_TARGET_VERSION=23
+        ANDROID_SDK_DIR=$$SDK$$ ANDROID_SDKMANAGER=sdkmanager bash -c 'pkg/android/build.bash
+        setup && pkg/android/build.bash configure -DBUILD_ANDROID_VERSION_CODE=$$VERCODE$$
+        -DBUILD_VERSION=$$VERSION$$ -DCLANG_TIDY=OFF -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+        -DDISABLE_UPDATE_CHECK_DEFAULT=ON -DDIST_BUILD=ON -DUSE_STRICT_ALIASING=ON
+        -DANDROID_MIN_SDK_VERSION=23'
+      - QT_ANDROID_PACKAGE_MODE=release cmake --build buildandroid-x86-release --config
+        Release
+
+  - versionName: 2.3.0-beta.1
+    versionCode: 2030001004
+    commit: 8eea3ebdde40abb90ef02f4af03ff6722c5a8cc3
+    sudo:
+      - apt-get update
+      - apt-get install -y build-essential cmake nasm ninja-build pkg-config yasm
+      - rm -rf /opt/android-sdk/{build-tools,ndk,platforms}
+      - sdkmanager 'build-tools;34.0.0-rc3' 'ndk;27.0.12077973' 'platforms;android-34'
+    output: buildandroid-x86_64-release/bin/Drawpile-$$VERSION$$-30-34-x86_64.apk
+    build:
+      - BUILD_TYPE=release ANDROID_ABI=x86_64 ANDROID_BUILD_TOOLS_VERSION=34.0.0-rc3
+        ANDROID_NDK_VERSION=27.0.12077973 ANDROID_PLATFORM_VERSION=34 ANDROID_SDK_DIR=$$SDK$$
+        ANDROID_SDKMANAGER=sdkmanager bash -c 'pkg/android/build.bash setup && pkg/android/build.bash
+        configure -DBUILD_ANDROID_VERSION_CODE=$$VERCODE$$ -DBUILD_VERSION=$$VERSION$$
+        -DCLANG_TIDY=OFF -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DDISABLE_UPDATE_CHECK_DEFAULT=ON
+        -DDIST_BUILD=ON -DUSE_STRICT_ALIASING=ON -DANDROID_MIN_SDK_VERSION=30'
+      - QT_ANDROID_PACKAGE_MODE=release cmake --build buildandroid-x86_64-release
+        --config Release
+
 MaintainerNotes: |-
   Qt's Android build process is extremely fragile and will fail by the mere
   presence of superfluous build-tools, ndk or platform versions, no matter how
@@ -269,8 +349,15 @@ MaintainerNotes: |-
   find the version for some reason. We just install it via sdkmanager directly,
   since we need to run that ourselves anyway due to the Qt issues above.
 
+  Regular versions look like "1.2.3" for stable versions and "1.2.3-beta.4" for
+  unstable versions. Versions that contain only fixes for F-Droid and don't
+  warrant tagging upstream (because that would pointlessly kick off the release
+  CI) look like "1.2.3-fix.4" or "1.2.3-beta.4-fix.5" respectively. Only stable
+  versions are picked up by the automatic update check, beta and
+  F-Droid-specific fix versions are submitted manually.
+
 AutoUpdateMode: Version
-UpdateCheckMode: Tags
+UpdateCheckMode: Tags ^[0-9]+\.[0-9]+\.[0-9]+$
 VercodeOperation:
   - 10 * %c + 1
   - 10 * %c + 2