diff --git a/metadata/net.osmand.plus.yml b/metadata/net.osmand.plus.yml
index 560aa749e7..113f0ce81b 100644
--- a/metadata/net.osmand.plus.yml
+++ b/metadata/net.osmand.plus.yml
@@ -5403,6 +5403,114 @@ Builds:
     antifeatures:
       - Tracking
 
+  - versionName: 4.5.8
+    versionCode: 450801
+    commit: v4.5.8
+    timeout: 20000
+    subdir: android/OsmAnd
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y ant g++ clang build-essential python-is-python2 swig
+      - apt-get install -y -t bullseye-backports cmake
+    gradle:
+      - android
+      - full
+      - opengl
+      - armv7
+    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$$
+    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: ../../build.sh
+    ndk: r23c
+    antifeatures:
+      - Tracking
+
+  - versionName: 4.5.8
+    versionCode: 450802
+    commit: v4.5.8
+    timeout: 20000
+    subdir: android/OsmAnd
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y ant g++ clang build-essential python-is-python2 swig
+      - apt-get install -y -t bullseye-backports cmake
+    gradle:
+      - android
+      - full
+      - opengl
+      - x86
+    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$$
+    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: ../../build.sh
+    ndk: r23c
+    antifeatures:
+      - Tracking
+
+  - versionName: 4.5.8
+    versionCode: 450803
+    commit: v4.5.8
+    timeout: 20000
+    subdir: android/OsmAnd
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y ant g++ clang build-essential python-is-python2 swig
+      - apt-get install -y -t bullseye-backports cmake
+    gradle:
+      - android
+      - full
+      - opengl
+      - arm64
+    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$$
+    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: ../../build.sh
+    ndk: r23c
+    antifeatures:
+      - Tracking
+
 MaintainerNotes: |-
     Update CV only after sucessfully built and tested.
 
@@ -5413,5 +5521,5 @@ MaintainerNotes: |-
 ArchivePolicy: 9
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 4.3.12
-CurrentVersionCode: 431203
+CurrentVersion: 4.4.7
+CurrentVersionCode: 440703