diff --git a/metadata/org.videolan.vlc.yml b/metadata/org.videolan.vlc.yml
index a12b8ca9f9..f6e765a66b 100644
--- a/metadata/org.videolan.vlc.yml
+++ b/metadata/org.videolan.vlc.yml
@@ -5646,51 +5646,81 @@ Builds:
       - sed -i -e '/signingConfig/d' build.gradle
     ndk: r25c
 
-MaintainerNotes: |-
-  Instructions and dependencies: https://wiki.videolan.org/AndroidCompile
+  - versionName: 3.6.3
+    versionCode: 13060305
+    commit: 13b29e86218b37dd567378e8874d1146642a02f5
+    subdir: application/app
+    gradle:
+      - yes
+    prebuild:
+      - GRADLE_VERSION=$(sed -n -E 's/.*GRADLE_VERSION=(.*)/\1/p' ../../buildsystem/compile.sh)
+      - mkdir -p ./gradle/wrapper
+      - echo "distributionUrl=https\://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip"
+        > ./gradle/wrapper/gradle-wrapper.properties
+      - cp -r gradle ../..
+      - sed -i -e 's/include .*/include "armeabi-v7a"/' build.gradle
+      - sed -i -e '/println/d' ../vlc-android/build.gradle
+      - sed -i -e '/signingConfig/d' build.gradle
+    ndk: r27c
 
-  The VLCjni srclib commit can be found out from LIBVLCJNI_TESTED_HASH value
-  in compile.sh, but sometimes it's different in official builds:
+  - versionName: 3.6.3
+    versionCode: 13060306
+    commit: 13b29e86218b37dd567378e8874d1146642a02f5
+    subdir: application/app
+    gradle:
+      - yes
+    prebuild:
+      - GRADLE_VERSION=$(sed -n -E 's/.*GRADLE_VERSION=(.*)/\1/p' ../../buildsystem/compile.sh)
+      - mkdir -p ./gradle/wrapper
+      - echo "distributionUrl=https\://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip"
+        > ./gradle/wrapper/gradle-wrapper.properties
+      - cp -r gradle ../..
+      - sed -i -e 's/include .*/include "arm64-v8a"/' build.gradle
+      - sed -i -e '/println/d' ../vlc-android/build.gradle
+      - sed -i -e '/signingConfig/d' build.gradle
+    ndk: r27c
 
-  * https://code.videolan.org/videolan/vlc-android/-/blob/<TAG>/buildsystem/compile.sh
+  - versionName: 3.6.3
+    versionCode: 13060307
+    commit: 13b29e86218b37dd567378e8874d1146642a02f5
+    subdir: application/app
+    gradle:
+      - yes
+    prebuild:
+      - GRADLE_VERSION=$(sed -n -E 's/.*GRADLE_VERSION=(.*)/\1/p' ../../buildsystem/compile.sh)
+      - mkdir -p ./gradle/wrapper
+      - echo "distributionUrl=https\://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip"
+        > ./gradle/wrapper/gradle-wrapper.properties
+      - cp -r gradle ../..
+      - sed -i -e 's/include .*/include "x86"/' build.gradle
+      - sed -i -e '/println/d' ../vlc-android/build.gradle
+      - sed -i -e '/signingConfig/d' build.gradle
+    ndk: r27c
 
-  The VLCmedialibrary srclib commit can be found out from MEDIALIBRARY_HASH in
-  compile-medialibrary.sh:
+  - versionName: 3.6.3
+    versionCode: 13060308
+    commit: 13b29e86218b37dd567378e8874d1146642a02f5
+    subdir: application/app
+    gradle:
+      - yes
+    prebuild:
+      - GRADLE_VERSION=$(sed -n -E 's/.*GRADLE_VERSION=(.*)/\1/p' ../../buildsystem/compile.sh)
+      - mkdir -p ./gradle/wrapper
+      - echo "distributionUrl=https\://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip"
+        > ./gradle/wrapper/gradle-wrapper.properties
+      - cp -r gradle ../..
+      - sed -i -e 's/include .*/include "x86_64"/' build.gradle
+      - sed -i -e '/println/d' ../vlc-android/build.gradle
+      - sed -i -e '/signingConfig/d' build.gradle
+    ndk: r27c
 
-  * https://code.videolan.org/videolan/vlc-android/-/blob/<TAG>/buildsystem/compile-medialibrary.sh
-
-  The VLC srclib commit can be found out from VLC_TESTED_HASH in get-vlc.sh:
-
-  * https://code.videolan.org/videolan/libvlcjni/-/blob/<LIBVLCJNI_TESTED_HASH>/buildsystem/get-vlc.sh
-
-  For recommended versions of the build tools, see:
-
-  * https://git.videolan.org/?p=vlc.git;a=blob;f=extras/tools/bootstrap#l130
-  * https://code.videolan.org/videolan/docker-images/raw/master/vlc-debian-android/Dockerfile
-
-  Note that compilation of VLC 3.5.5 fails with Meson 0.55.1, so we patch
-  build scripts to use Bookworms apt installed one.
-
-  Actual versioncodes since 3.5.5 are:
-
-  * Build:3.5.5,13050505 armv7
-  * Build:3.5.5,13050506 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.
-
-  * armeabi-v7a: arm-linux-androideabi
-  * arm64-v8a: aarch64-linux-android
-  * x86: x86-linux-android
-  * x86_64: x86_64-linux-android
-
-ArchivePolicy: 16
-AutoUpdateMode: None
+AutoUpdateMode: Version
 UpdateCheckMode: Tags ^[\d.]+$
 VercodeOperation:
+  - 10000005+%c
+  - 10000006+%c
+  - 10000007+%c
   - 10000008+%c
-UpdateCheckData: build.gradle|versionCode\s=\s(\d+)|.|versionName\s=\s'(.*)'
-CurrentVersion: 3.5.7
-CurrentVersionCode: 13050708
+UpdateCheckData: build.gradle|versionCode\s=\s(\d+)|.|versionName\s=.*\s'(.*)'
+CurrentVersion: 3.6.3
+CurrentVersionCode: 13060308