diff --git a/metadata/net.osmand.plus.yml b/metadata/net.osmand.plus.yml
index af690717a4..6a9ef44b51 100644
--- a/metadata/net.osmand.plus.yml
+++ b/metadata/net.osmand.plus.yml
@@ -6142,6 +6142,156 @@ Builds:
     antifeatures:
       - Tracking
 
+  - versionName: 4.7.17
+    versionCode: 471701
+    commit: v4.7.17
+    timeout: 20000
+    subdir: android/OsmAnd
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y ant g++ clang build-essential
+      - apt-get install -y cmake automake zip
+      - apt-get install -y byacc libpcre2-dev
+      - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
+      - apt-get update
+      - apt-get install -y -t bullseye python-is-python2
+    gradle:
+      - android
+      - full
+      - opengl
+      - armv7
+    srclibs:
+      - swig@v4.1.1
+    rm:
+      - android/OsmAnd-java/libs/*.jar
+      - android/OsmAnd/libs/*.jar
+      - android/OsmAnd-telegram/
+      - help/website/images/features.zip
+      - resources/icons/tools/SVGtoXML/vd-tool
+    prebuild: ../../prebuild.sh $$VERSION$$ $$VERCODE$$ armv7
+    scanignore:
+      - help/website/fonts/*.woff
+      - help/website/fonts/*.eot
+      - help/website/fonts/*.ttf
+      - resources/voice/tr/voice/*.ogg
+      - icu-release-50-2-1-patched-mirror/icu4j/main/shared/data/icudata.jar
+      - icu-release-50-2-1-patched-mirror/icu4j/main/shared/data/icutzdata.jar
+    scandelete:
+      - resources/test-resources
+    build:
+      - pushd $$swig$$
+      - ./autogen.sh
+      - ./configure --prefix=$$swig$$
+      - make -j`nproc`
+      - make install
+      - popd
+      - export PATH=$$swig$$/bin:$PATH
+      - ../../build.sh armv7
+    ndk: r23c
+    antifeatures:
+      - Tracking
+
+  - versionName: 4.7.17
+    versionCode: 471702
+    commit: v4.7.17
+    timeout: 20000
+    subdir: android/OsmAnd
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y ant g++ clang build-essential
+      - apt-get install -y cmake automake zip
+      - apt-get install -y byacc libpcre2-dev
+      - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
+      - apt-get update
+      - apt-get install -y -t bullseye python-is-python2
+    gradle:
+      - android
+      - full
+      - opengl
+      - x86
+    srclibs:
+      - swig@v4.1.1
+    rm:
+      - android/OsmAnd-java/libs/*.jar
+      - android/OsmAnd/libs/*.jar
+      - android/OsmAnd-telegram/
+      - help/website/images/features.zip
+      - resources/icons/tools/SVGtoXML/vd-tool
+    prebuild: ../../prebuild.sh $$VERSION$$ $$VERCODE$$ x86
+    scanignore:
+      - help/website/fonts/*.woff
+      - help/website/fonts/*.eot
+      - help/website/fonts/*.ttf
+      - resources/voice/tr/voice/*.ogg
+      - icu-release-50-2-1-patched-mirror/icu4j/main/shared/data/icudata.jar
+      - icu-release-50-2-1-patched-mirror/icu4j/main/shared/data/icutzdata.jar
+    scandelete:
+      - resources/test-resources
+    build:
+      - pushd $$swig$$
+      - ./autogen.sh
+      - ./configure --prefix=$$swig$$
+      - make -j`nproc`
+      - make install
+      - popd
+      - export PATH=$$swig$$/bin:$PATH
+      - ../../build.sh x86
+    ndk: r23c
+    antifeatures:
+      - Tracking
+
+  - versionName: 4.7.17
+    versionCode: 471703
+    commit: v4.7.17
+    timeout: 20000
+    subdir: android/OsmAnd
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y ant g++ clang build-essential
+      - apt-get install -y cmake automake zip
+      - apt-get install -y byacc libpcre2-dev
+      - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
+      - apt-get update
+      - apt-get install -y -t bullseye python-is-python2
+    gradle:
+      - android
+      - full
+      - opengl
+      - arm64
+    srclibs:
+      - swig@v4.1.1
+    rm:
+      - android/OsmAnd-java/libs/*.jar
+      - android/OsmAnd/libs/*.jar
+      - android/OsmAnd-telegram/
+      - help/website/images/features.zip
+      - resources/icons/tools/SVGtoXML/vd-tool
+    prebuild: ../../prebuild.sh $$VERSION$$ $$VERCODE$$ arm64
+    scanignore:
+      - help/website/fonts/*.woff
+      - help/website/fonts/*.eot
+      - help/website/fonts/*.ttf
+      - resources/voice/tr/voice/*.ogg
+      - icu-release-50-2-1-patched-mirror/icu4j/main/shared/data/icudata.jar
+      - icu-release-50-2-1-patched-mirror/icu4j/main/shared/data/icutzdata.jar
+    scandelete:
+      - resources/test-resources
+    build:
+      - pushd $$swig$$
+      - ./autogen.sh
+      - ./configure --prefix=$$swig$$
+      - make -j`nproc`
+      - make install
+      - popd
+      - export PATH=$$swig$$/bin:$PATH
+      - ../../build.sh arm64
+    ndk: r23c
+    antifeatures:
+      - Tracking
+
 MaintainerNotes: |-
   Update CV only after sucessfully built and tested.
 
@@ -6154,5 +6304,5 @@ MaintainerNotes: |-
 ArchivePolicy: 9
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 4.6.14
-CurrentVersionCode: 461403
+CurrentVersion: 4.7.10
+CurrentVersionCode: 471003