diff --git a/metadata/com.yubico.yubioath.yml b/metadata/com.yubico.yubioath.yml
index 9036799e91..4bea2fa1b0 100644
--- a/metadata/com.yubico.yubioath.yml
+++ b/metadata/com.yubico.yubioath.yml
@@ -516,6 +516,84 @@ Builds:
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-x64"
 
+  - versionName: 6.4.0
+    versionCode: 604011
+    commit: c44d65eb6efc9e82b74eb44f228c3937bdc1e071
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
+    output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
+    srclibs:
+      - flutter@3.16.4
+    rm:
+      - linux
+      - macos
+      - test
+      - windows
+    prebuild:
+      - sed -i -e '/gms/d' android/{app/build.gradle,build.gradle}
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - $$flutter$$/bin/flutter config --no-analytics
+      - $$flutter$$/bin/flutter pub get
+    scandelete:
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-arm"
+
+  - versionName: 6.4.0
+    versionCode: 604012
+    commit: c44d65eb6efc9e82b74eb44f228c3937bdc1e071
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
+    output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
+    srclibs:
+      - flutter@3.16.4
+    rm:
+      - linux
+      - macos
+      - test
+      - windows
+    prebuild:
+      - sed -i -e '/gms/d' android/{app/build.gradle,build.gradle}
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - $$flutter$$/bin/flutter config --no-analytics
+      - $$flutter$$/bin/flutter pub get
+    scandelete:
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64"
+
+  - versionName: 6.4.0
+    versionCode: 604014
+    commit: c44d65eb6efc9e82b74eb44f228c3937bdc1e071
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
+    output: build/app/outputs/flutter-apk/app-x86_64-release.apk
+    srclibs:
+      - flutter@3.16.4
+    rm:
+      - linux
+      - macos
+      - test
+      - windows
+    prebuild:
+      - sed -i -e '/gms/d' android/{app/build.gradle,build.gradle}
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - $$flutter$$/bin/flutter config --no-analytics
+      - $$flutter$$/bin/flutter pub get
+    scandelete:
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-x64"
+
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^[\d.]+$
 VercodeOperation:
@@ -523,5 +601,5 @@ VercodeOperation:
   - '%c * 10 + 2'
   - '%c * 10 + 4'
 UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
-CurrentVersion: 6.3.1
-CurrentVersionCode: 603024
+CurrentVersion: 6.4.0
+CurrentVersionCode: 604014