diff --git a/metadata/nekox.messenger.yml b/metadata/nekox.messenger.yml
index 71c9213e17..b454f11480 100644
--- a/metadata/nekox.messenger.yml
+++ b/metadata/nekox.messenger.yml
@@ -685,9 +685,9 @@ Builds:
         == null/def disableCMakeRelWithDebInfo = false/' TMessagesProj/build.gradle
     ndk: r21e
 
-  - versionName: 8.2.7
-    versionCode: 485
-    commit: a6f4408cd7047dcffa8c146fe78c62e76463a7cd
+  - versionName: 8.2.7-rc06-arm
+    versionCode: 489
+    commit: 5dcfafeca474ad6a887034975093d9b943a81ce2
     timeout: 10800
     subdir: TMessagesProj
     submodules: true
@@ -696,7 +696,7 @@ Builds:
       - apt-get install -y ninja-build openjdk-11-jdk-headless
       - update-alternatives --auto java
     gradle:
-      - miniFdroidArm64
+      - miniFdroidArm
     output: build/outputs/apk/mini/*/*.apk
     prebuild:
       - echo -e "\norg.gradle.jvmargs=-Xms1024m -Xmx4096m -XX:MaxPermSize=4096m" >>
@@ -717,7 +717,7 @@ Builds:
         == null/def disableCMakeRelWithDebInfo = false/' TMessagesProj/build.gradle
     ndk: r21e
 
-  - versionName: 8.2.7
+  - versionName: 8.2.7-rc06-arm64
     versionCode: 490
     commit: 5dcfafeca474ad6a887034975093d9b943a81ce2
     timeout: 10800
@@ -754,9 +754,14 @@ MaintainerNotes: |
 
     According to https://github.com/NekoX-Dev/NekoX/pull/681#issuecomment-980631578, we have to force enable the native libs compilation.
 
+    To convert an arm64 receipe to an arm one:
+      - Change versionName suffix from `-arm64` to `-arm`
+      - -1 to versionCode
+      - Change gradle task to miniFdroidArm
+
 ArchivePolicy: 6 versions
-AutoUpdateMode: Version %v-arm64
+AutoUpdateMode: Version +-arm64 %v
 UpdateCheckMode: Tags
-UpdateCheckData: TMessagesProj/build.gradle|verCode\s=\s(\d+)||v([\d.]+)
-CurrentVersion: 8.2.7
+UpdateCheckData: TMessagesProj/build.gradle|verCode\s=\s(\d+)|.|verName\s=\s"(.+)"
+CurrentVersion: 8.2.7-rc06-arm64
 CurrentVersionCode: 490