diff --git a/metadata/app.organicmaps.yml b/metadata/app.organicmaps.yml
index 2a033461dc..822ce9e755 100644
--- a/metadata/app.organicmaps.yml
+++ b/metadata/app.organicmaps.yml
@@ -146,6 +146,38 @@ Builds:
       - ./b2 headers
     ndk: r21e
 
+  - versionName: 2021.06.23-9-gc3f05a1646-FDroid
+    versionCode: 21062309
+    commit: '2021-06-23'
+    subdir: android
+    submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y g++
+    gradle:
+      - fdroid
+    rm:
+      - iphone
+      - qt
+      - tools/shaders_compiler
+      - xcode
+    prebuild:
+      - sed -i -e '/com.google.firebase/d; /com.google.gms/d; /com.google.android.gms/d'
+        build.gradle
+      - touch secure.properties
+      - echo '<?xml version="1.0" encoding="utf-8"?><network-security-config/>' >
+        res/xml/network_security_config.xml
+      - cp ../private_default.h ../private.h
+    scanignore:
+      - data/*.bin
+    scandelete:
+      - 3party
+    build:
+      - cd ../3party/boost
+      - ./bootstrap.sh
+      - ./b2 headers
+    ndk: r21e
+
 MaintainerNotes: |-
     Version name and version code are generated dynamically from the head
     commit date:
@@ -155,5 +187,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 2021.06.20-6-g04b447e390-FDroid
-CurrentVersionCode: 21062006
+CurrentVersion: 2021.06.23-9-gc3f05a1646-FDroid
+CurrentVersionCode: 21062309