diff --git a/metadata/com.adilhanney.saber.yml b/metadata/com.adilhanney.saber.yml
index 05db6e0a26..4573847aa0 100644
--- a/metadata/com.adilhanney.saber.yml
+++ b/metadata/com.adilhanney.saber.yml
@@ -4822,6 +4822,135 @@ Builds:
         --target-platform="android-x64"
     ndk: 25.2.9519653
 
+  - versionName: 0.18.4
+    versionCode: 180401
+    commit: e7f9d1314aeed36352225fa4b2e2ad60afc6295c
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y gcc libc-dev
+    output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
+    srclibs:
+      - rustup@1.25.2
+    rm:
+      - .github
+      - assets_raw
+      - flatpak
+      - installers
+      - ios
+      - linux
+      - macos
+      - packages/onyxsdk_pen
+      - snap
+      - windows
+    prebuild:
+      - ./patches/remove_proprietary_dependencies.sh
+      - ./patches/remove_request_install_packages_permission.sh
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - submodules/flutter/bin/flutter config --no-analytics
+      - submodules/flutter/bin/flutter pub get
+    scanignore:
+      - submodules/flutter/bin/cache
+    scandelete:
+      - submodules/flutter
+      - .pub-cache
+    build:
+      - $$rustup$$/rustup-init.sh -y
+      - source $HOME/.cargo/env
+      - export ANDROID_NDK_ROOT=$$NDK$$
+      - rustup target add armv7-linux-androideabi
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - submodules/flutter/bin/flutter build apk --split-per-abi --dart-define=FLAVOR="F-Droid"
+        --dart-define=APP_STORE="F-Droid" --dart-define=UPDATE_CHECK="false" --dart-define=OFFLINE_FONTS_ONLY="true"
+        --target-platform="android-arm"
+    ndk: 25.2.9519653
+
+  - versionName: 0.18.4
+    versionCode: 180402
+    commit: e7f9d1314aeed36352225fa4b2e2ad60afc6295c
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y gcc libc-dev
+    output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
+    srclibs:
+      - rustup@1.25.2
+    rm:
+      - .github
+      - assets_raw
+      - flatpak
+      - installers
+      - ios
+      - linux
+      - macos
+      - packages/onyxsdk_pen
+      - snap
+      - windows
+    prebuild:
+      - ./patches/remove_proprietary_dependencies.sh
+      - ./patches/remove_request_install_packages_permission.sh
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - submodules/flutter/bin/flutter config --no-analytics
+      - submodules/flutter/bin/flutter pub get
+    scanignore:
+      - submodules/flutter/bin/cache
+    scandelete:
+      - submodules/flutter
+      - .pub-cache
+    build:
+      - $$rustup$$/rustup-init.sh -y
+      - source $HOME/.cargo/env
+      - export ANDROID_NDK_ROOT=$$NDK$$
+      - rustup target add aarch64-linux-android
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - submodules/flutter/bin/flutter build apk --split-per-abi --dart-define=FLAVOR="F-Droid"
+        --dart-define=APP_STORE="F-Droid" --dart-define=UPDATE_CHECK="false" --dart-define=OFFLINE_FONTS_ONLY="true"
+        --target-platform="android-arm64"
+    ndk: 25.2.9519653
+
+  - versionName: 0.18.4
+    versionCode: 180403
+    commit: e7f9d1314aeed36352225fa4b2e2ad60afc6295c
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y gcc libc-dev
+    output: build/app/outputs/flutter-apk/app-x86_64-release.apk
+    srclibs:
+      - rustup@1.25.2
+    rm:
+      - .github
+      - assets_raw
+      - flatpak
+      - installers
+      - ios
+      - linux
+      - macos
+      - packages/onyxsdk_pen
+      - snap
+      - windows
+    prebuild:
+      - ./patches/remove_proprietary_dependencies.sh
+      - ./patches/remove_request_install_packages_permission.sh
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - submodules/flutter/bin/flutter config --no-analytics
+      - submodules/flutter/bin/flutter pub get
+    scanignore:
+      - submodules/flutter/bin/cache
+    scandelete:
+      - submodules/flutter
+      - .pub-cache
+    build:
+      - $$rustup$$/rustup-init.sh -y
+      - source $HOME/.cargo/env
+      - export ANDROID_NDK_ROOT=$$NDK$$
+      - rustup target add x86_64-linux-android
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - submodules/flutter/bin/flutter build apk --split-per-abi --dart-define=FLAVOR="F-Droid"
+        --dart-define=APP_STORE="F-Droid" --dart-define=UPDATE_CHECK="false" --dart-define=OFFLINE_FONTS_ONLY="true"
+        --target-platform="android-x64"
+    ndk: 25.2.9519653
+
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
 VercodeOperation:
@@ -4829,5 +4958,5 @@ VercodeOperation:
   - '%c * 10 + 2'
   - '%c * 10 + 3'
 UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
-CurrentVersion: 0.18.3
-CurrentVersionCode: 180303
+CurrentVersion: 0.18.4
+CurrentVersionCode: 180403