diff --git a/metadata/org.forkgram.messenger.yml b/metadata/org.forkgram.messenger.yml
index 22d3ee361b..0a2b000ff7 100644
--- a/metadata/org.forkgram.messenger.yml
+++ b/metadata/org.forkgram.messenger.yml
@@ -1,7 +1,6 @@
 AntiFeatures:
   - NonFreeNet
   - UpstreamNonFree
-  - Tracking
 Categories:
   - Internet
 License: GPL-2.0-or-later
@@ -31,6 +30,8 @@ Builds:
     scandelete:
       - TMessagesProj/jni
     ndk: r21e
+    antifeatures:
+      - Tracking
 
   - versionName: 8.4.4.0
     versionCode: 253809
@@ -48,6 +49,8 @@ Builds:
     scandelete:
       - TMessagesProj/jni
     ndk: r21e
+    antifeatures:
+      - Tracking
 
   - versionName: 8.5.0.0
     versionCode: 254709
@@ -65,6 +68,8 @@ Builds:
     scandelete:
       - TMessagesProj/jni
     ndk: r21e
+    antifeatures:
+      - Tracking
 
   - versionName: 8.5.1.0
     versionCode: 255109
@@ -82,6 +87,8 @@ Builds:
     scandelete:
       - TMessagesProj/jni
     ndk: r21e
+    antifeatures:
+      - Tracking
 
   - versionName: 8.5.2.0
     versionCode: 256309
@@ -99,6 +106,8 @@ Builds:
     scandelete:
       - TMessagesProj/jni
     ndk: r21e
+    antifeatures:
+      - Tracking
 
   - versionName: 8.5.4.0
     versionCode: 256609
@@ -116,8 +125,27 @@ Builds:
     scandelete:
       - TMessagesProj/jni
     ndk: r21e
+    antifeatures:
+      - Tracking
+
+  - versionName: 8.6.0.0
+    versionCode: 258709
+    commit: 8.6.0.0
+    timeout: 18000
+    subdir: TMessagesProj
+    submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk ninja-build golang-go
+      - update-alternatives --auto java
+    gradle:
+      - afat
+    prebuild: ./jni/prebuild_fdroid.sh 0 14577864 54d3ae230fd8f985ce9adccf08fbd9d6
+    scandelete:
+      - TMessagesProj/jni
+    ndk: r21e
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 8.5.4.0
-CurrentVersionCode: 256609
+CurrentVersion: 8.6.0.0
+CurrentVersionCode: 258709