diff --git a/metadata/com.github.axet.maps.txt b/metadata/com.github.axet.maps.txt
index 690fcd6b0d..f9537700aa 100644
--- a/metadata/com.github.axet.maps.txt
+++ b/metadata/com.github.axet.maps.txt
@@ -108,7 +108,26 @@ Build:8.3.5-3-Google,1041
     scandelete=3party
     ndk=r16b
 
+Build:8.3.6-2-Google,1043
+    commit=omim-8.3.6-2
+    timeout=10800
+    subdir=android
+    submodules=yes
+    gradle=google
+    rm=3party/Alohalytics/examples,iphone,tools/shaders_compiler
+    prebuild=sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle && \
+        sed -i -e '/com.appsflyer/d' -e '/com.pushwoosh/d' build.gradle && \
+        sed -i -e '/com.pushwoosh/d' -e '/pushManager/d' src/com/mapswithme/maps/MwmApplication.java && \
+        sed -i -e '/com.pushwoosh/d' -e 's/ implements SendPushTagsCallBack//' -e '/PushManager/d' -e '/^  @Override/d' src/com/mapswithme/util/statistics/PushwooshHelper.java && \
+        sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml && \
+        sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/MwmApplication.java && \
+        sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/MwmApplication.java && \
+        sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
+    scanignore=data/*.bin,data/ugc_migration/*.bin
+    scandelete=3party
+    ndk=r16b
+
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:8.3.5-3-Google
-Current Version Code:1041
+Current Version:8.3.6-2-Google
+Current Version Code:1043