diff --git a/metadata/app.organicmaps.yml b/metadata/app.organicmaps.yml
index bc050863eb..7349c86f5a 100644
--- a/metadata/app.organicmaps.yml
+++ b/metadata/app.organicmaps.yml
@@ -1794,7 +1794,7 @@ Builds:
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y g++ ninja-build cmake
+      - apt-get install -y g++ ninja-build
     gradle:
       - fdroid
     rm:
@@ -1803,6 +1803,7 @@ Builds:
       - tools/shaders_compiler
       - xcode
     prebuild:
+      - sdkmanager 'cmake;3.30.3'
       - sed -i -e '/com.google.firebase/d; /gms/d' build.gradle
       - touch secure.properties
       - echo '<?xml version="1.0" encoding="utf-8"?><network-security-config/>' >
diff --git a/metadata/org.videolan.vlc.yml b/metadata/org.videolan.vlc.yml
index e3274b2d43..17a07a04ad 100644
--- a/metadata/org.videolan.vlc.yml
+++ b/metadata/org.videolan.vlc.yml
@@ -5179,14 +5179,14 @@ MaintainerNotes: |-
 
   * Build:3.5.5,13050505 armv7
   * Build:3.5.5,13050506 armv8
-  * Build:3.5.5,13050507 armv8
+  * Build:3.5.5,13050507 x86
   * Build:3.5.5,13050508 x86_64
 
   Variables FD_TARGET_TUPLE, FD_TARGET_ARCH and abi in output apk name needs
   to be changed per build.
 
-  * arm64-v7a: aarch64-linux-android
   * armeabi-v7a: arm-linux-androideabi
+  * arm64-v8a: aarch64-linux-android
   * x86: x86-linux-android
   * x86_64: x86_64-linux-android
 
diff --git a/metadata/rocks.mm_dev.BendyStraw.yml b/metadata/rocks.mm_dev.BendyStraw.yml
index 08b85b14d2..a3c358fcbf 100644
--- a/metadata/rocks.mm_dev.BendyStraw.yml
+++ b/metadata/rocks.mm_dev.BendyStraw.yml
@@ -157,20 +157,23 @@ Builds:
       - apt-get update
       - apt install sqlite3 libsqlite3-dev
     output: build/app/outputs/flutter-apk/app-x86_64-release.apk
+    srclibs:
+      - flutter@stable
     rm:
       - linux
     prebuild:
+      - sed -i -e '/applicationId/s/bendystraw/BendyStraw/' android/app/build.gradle
+      - flutterVersion=$(sed -n -E 's/^  revision:\ "(.*)"/\1/p' .metadata)
+      - '[[ $flutterVersion ]] || exit 1'
+      - git -C $$flutter$$ checkout -f $flutterVersion
       - export PUB_CACHE=$(pwd)/.pub-cache
-      - ./flutterw config --no-analytics
-      - ./flutterw pub get
-    scanignore:
-      - .flutter/bin/cache
+      - $$flutter$$/bin/flutter config --no-analytics
+      - $$flutter$$/bin/flutter pub get
     scandelete:
-      - .flutter
       - .pub-cache
     build:
       - export PUB_CACHE=$(pwd)/.pub-cache
-      - ./flutterw build apk --release --split-per-abi --target-platform="android-x64"
+      - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-x64"
 
   - versionName: 1.2.0
     versionCode: 32
@@ -180,20 +183,23 @@ Builds:
       - apt-get update
       - apt install sqlite3 libsqlite3-dev
     output: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
+    srclibs:
+      - flutter@stable
     rm:
       - linux
     prebuild:
+      - sed -i -e '/applicationId/s/bendystraw/BendyStraw/' android/app/build.gradle
+      - flutterVersion=$(sed -n -E 's/^  revision:\ "(.*)"/\1/p' .metadata)
+      - '[[ $flutterVersion ]] || exit 1'
+      - git -C $$flutter$$ checkout -f $flutterVersion
       - export PUB_CACHE=$(pwd)/.pub-cache
-      - ./flutterw config --no-analytics
-      - ./flutterw pub get
-    scanignore:
-      - .flutter/bin/cache
+      - $$flutter$$/bin/flutter config --no-analytics
+      - $$flutter$$/bin/flutter pub get
     scandelete:
-      - .flutter
       - .pub-cache
     build:
       - export PUB_CACHE=$(pwd)/.pub-cache
-      - ./flutterw build apk --release --split-per-abi --target-platform="android-arm"
+      - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-arm"
 
   - versionName: 1.2.0
     versionCode: 33
@@ -203,20 +209,23 @@ Builds:
       - apt-get update
       - apt install sqlite3 libsqlite3-dev
     output: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
+    srclibs:
+      - flutter@stable
     rm:
       - linux
     prebuild:
+      - sed -i -e '/applicationId/s/bendystraw/BendyStraw/' android/app/build.gradle
+      - flutterVersion=$(sed -n -E 's/^  revision:\ "(.*)"/\1/p' .metadata)
+      - '[[ $flutterVersion ]] || exit 1'
+      - git -C $$flutter$$ checkout -f $flutterVersion
       - export PUB_CACHE=$(pwd)/.pub-cache
-      - ./flutterw config --no-analytics
-      - ./flutterw pub get
-    scanignore:
-      - .flutter/bin/cache
+      - $$flutter$$/bin/flutter config --no-analytics
+      - $$flutter$$/bin/flutter pub get
     scandelete:
-      - .flutter
       - .pub-cache
     build:
       - export PUB_CACHE=$(pwd)/.pub-cache
-      - ./flutterw build apk --release --split-per-abi --target-platform="android-arm64"
+      - $$flutter$$/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64"
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags