diff --git a/metadata/nekox.messenger.yml b/metadata/nekox.messenger.yml
index 7a396357cf..6e54846e02 100644
--- a/metadata/nekox.messenger.yml
+++ b/metadata/nekox.messenger.yml
@@ -982,9 +982,38 @@ Builds:
       - git gc --prune=now
     ndk: r21e
 
+  - versionName: 8.5.4-rc01
+    versionCode: 580
+    commit: f406f07718c225f62348fe5a6bbaac841ee91865
+    timeout: 10800
+    subdir: TMessagesProj
+    submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y ninja-build yasm
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - miniFdroid
+    output: build/outputs/apk/mini/*/*.apk
+    prebuild:
+      - echo -e "\norg.gradle.jvmargs=-Xms1024m -Xmx4096m -XX:MaxPermSize=4096m" >>
+        ../gradle.properties
+      - pushd ..
+      - ./run fdroid prebuild
+    build:
+      - export NINJA_PATH=/usr/bin/ninja
+      - pushd ..
+      - ./run fdroid build
+      - source bin/init/env.sh
+      - go clean -cache
+      - git rev-parse HEAD
+      - git gc --prune=now
+    ndk: r21e
+
 ArchivePolicy: 6 versions
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
 UpdateCheckData: TMessagesProj/build.gradle|verCode\s=\s(\d+)|.|verName\s=\s"(.+)"
-CurrentVersion: 8.5.1
-CurrentVersionCode: 570
+CurrentVersion: 8.5.4-rc01
+CurrentVersionCode: 580