diff --git a/metadata/com.github.axet.maps.yml b/metadata/com.github.axet.maps.yml
index 7fef4bda07..f5823b405d 100644
--- a/metadata/com.github.axet.maps.yml
+++ b/metadata/com.github.axet.maps.yml
@@ -294,10 +294,40 @@ Builds:
       - 3party
     ndk: r19c
 
-MaintainerNotes: Maps downloading is broken, see https://gitlab.com/axet/omim/issues/107.
+  - versionName: 9.1.8-7
+    versionCode: 1061
+    commit: omim-9.1.8-7
+    timeout: 14400
+    subdir: android
+    submodules: true
+    sudo:
+      - apt update || apt update
+      - apt install -y g++
+    gradle:
+      - google
+    rm:
+      - 3party/Alohalytics/examples
+      - iphone
+      - tools/shaders_compiler
+    prebuild:
+      - sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle
+      - sed -i -e '/versionName = /d' build.gradle
+      - sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml
+      - sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java
+      - sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/analytics/PushWooshEventLogger.java
+      - sed -i -e 's/enabled_ = true/enabled_ = false/' ../3party/Alohalytics/src/{alohalytics.h,cpp/alohalytics.cc}
+      - sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
+      - cd ../3party/boost
+      - ./bootstrap.sh
+      - ./b2 headers
+    scanignore:
+      - data/*.bin
+      - data/ugc_migration/*.bin
+    scandelete:
+      - 3party
+    ndk: r19c
 
-ArchivePolicy: 0 versions
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 9.1.6
-CurrentVersionCode: 1053
+CurrentVersion: 9.1.8-7
+CurrentVersionCode: 1061