diff --git a/metadata/org.xbmc.kodi.yml b/metadata/org.xbmc.kodi.yml
index 8c677115ec..6fd661a5b0 100644
--- a/metadata/org.xbmc.kodi.yml
+++ b/metadata/org.xbmc.kodi.yml
@@ -409,6 +409,7 @@ Builds:
 
   - versionName: 20.0-ALPHA1
     versionCode: 1990701
+    disable: outdated pre-release version
     commit: 59d6be57497667de7d40aacf066be7875a6a94b4
     timeout: 28000
     sudo:
@@ -447,6 +448,7 @@ Builds:
 
   - versionName: 20.0-ALPHA3
     versionCode: 1990710
+    disable: outdated pre-release version
     commit: 8d5ffc55b6688a9320905a052999b510f77d2b3a
     timeout: 28000
     sudo:
@@ -485,6 +487,7 @@ Builds:
 
   - versionName: 20.0-ALPHA3
     versionCode: 1990711
+    disable: outdated pre-release version
     commit: 8d5ffc55b6688a9320905a052999b510f77d2b3a
     timeout: 28000
     sudo:
@@ -615,6 +618,100 @@ Builds:
       - make -C build apk
     ndk: r21e
 
+  - versionName: '20.3'
+    versionCode: 2003000
+    commit: 6fb2bfc7ff210748a116d5b7018ee8ae222bf580
+    timeout: 28000
+    sudo:
+      - apt-get update
+      - apt-get install -y build-essential gawk lib32stdc++6 lib32z1 lib32z1-dev libcurl4-openssl-dev
+        zlib1g-dev libcommons-lang-java python-dev openjdk-11-jdk-headless openjdk-17-jdk-headless
+        m4
+    output: build/tools/android/packaging/xbmc/build/outputs/apk/release/xbmc-release-unsigned.apk
+    srclibs:
+      - groovy@GROOVY_4_0_6
+    rm:
+      - tools/codegenerator/groovy/*
+    prebuild:
+      - echo 'org.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64' >> $$groovy$$/gradle.properties
+      - echo 'org.gradle.java.home=/usr/lib/jvm/java-11-openjdk-amd64' >> tools/android/packaging/gradle.properties
+      - sed -i -e '/gradlew/d' -e '/gradle-wrapper.jar/d' cmake/scripts/android/Install.cmake
+      - sed -i -e 's#./gradlew#gradle#' -e '\!@cp xbmc/build!d' tools/android/packaging/Makefile.in
+      - sed -i -e '/signingConfigs {/,+11d' -e '/signingConfig/d' tools/android/packaging/xbmc/build.gradle.in
+      - sed -i -e 's#${GROOVY_DIR}/commons-lang-${COMMONS_VER}.jar#/usr/share/java/commons-lang.jar#'
+        xbmc/interfaces/swig/CMakeLists.txt
+    scanignore:
+      - addons/webinterface.default/lib/soundmanager/swf/soundmanager2_flash_xdomain.zip
+    scandelete:
+      - lib/
+      - project/
+      - tools/
+      - xbmc/filesystem/test
+    build:
+      - pushd $$groovy$$
+      - gradle :jarjar :groovy-templates:jarjar :groovy-xml:jarjar
+      - popd
+      - mv $$groovy$$/build/libs/groovy-?.?.?.jar $$groovy$$/subprojects/groovy-templates/build/libs/groovy-templates-?.?.?.jar
+        $$groovy$$/subprojects/groovy-xml/build/libs/groovy-xml-?.?.?.jar tools/codegenerator/groovy/
+      - pushd tools/depends/
+      - ./bootstrap
+      - ./configure --host=arm-linux-androideabi --with-sdk-path=$$SDK$$ --with-ndk-path=$$NDK$$
+        --prefix=$PWD/output --disable-debug
+      - make -j $(nproc)
+      - popd
+      - make -C tools/depends/target/binary-addons -j $(nproc)
+      - make -C tools/depends/target/cmakebuildsys
+      - make -C build -j $(nproc)
+      - make -C build apk
+    ndk: r21e
+
+  - versionName: '20.3'
+    versionCode: 2003001
+    commit: 6fb2bfc7ff210748a116d5b7018ee8ae222bf580
+    timeout: 28000
+    sudo:
+      - apt-get update
+      - apt-get install -y build-essential gawk lib32stdc++6 lib32z1 lib32z1-dev libcurl4-openssl-dev
+        zlib1g-dev libcommons-lang-java python-dev openjdk-11-jdk-headless openjdk-17-jdk-headless
+        m4
+    output: build/tools/android/packaging/xbmc/build/outputs/apk/release/xbmc-release-unsigned.apk
+    srclibs:
+      - groovy@GROOVY_4_0_6
+    rm:
+      - tools/codegenerator/groovy/*
+    prebuild:
+      - echo 'org.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64' >> $$groovy$$/gradle.properties
+      - echo 'org.gradle.java.home=/usr/lib/jvm/java-11-openjdk-amd64' >> tools/android/packaging/gradle.properties
+      - sed -i -e '/gradlew/d' -e '/gradle-wrapper.jar/d' cmake/scripts/android/Install.cmake
+      - sed -i -e 's#./gradlew#gradle#' -e '\!@cp xbmc/build!d' tools/android/packaging/Makefile.in
+      - sed -i -e '/signingConfigs {/,+11d' -e '/signingConfig/d' tools/android/packaging/xbmc/build.gradle.in
+      - sed -i -e 's#${GROOVY_DIR}/commons-lang-${COMMONS_VER}.jar#/usr/share/java/commons-lang.jar#'
+        xbmc/interfaces/swig/CMakeLists.txt
+    scanignore:
+      - addons/webinterface.default/lib/soundmanager/swf/soundmanager2_flash_xdomain.zip
+    scandelete:
+      - lib/
+      - project/
+      - tools/
+      - xbmc/filesystem/test
+    build:
+      - pushd $$groovy$$
+      - gradle :jarjar :groovy-templates:jarjar :groovy-xml:jarjar
+      - popd
+      - mv $$groovy$$/build/libs/groovy-?.?.?.jar $$groovy$$/subprojects/groovy-templates/build/libs/groovy-templates-?.?.?.jar
+        $$groovy$$/subprojects/groovy-xml/build/libs/groovy-xml-?.?.?.jar tools/codegenerator/groovy/
+      - pushd tools/depends/
+      - ./bootstrap
+      - ./configure --host=aarch64-linux-android --with-sdk-path=$$SDK$$ --with-ndk-path=$$NDK$$
+        --prefix=$PWD/output --disable-debug
+      - make -j $(nproc)
+      - popd
+      - make -C tools/depends/target/binary-addons -j $(nproc)
+      - make -C tools/depends/target/cmakebuildsys
+      - make -C build -j $(nproc)
+      - make -C build apk
+    ndk: r21e
+
 MaintainerNotes: |-
   18.0-groovy.patch was <a href="https://github.com/xbmc/xbmc/issues/6860#issuecomment-461122155">provided by upstream</a>; it makes the build use the Debian groovy package instead of a prebuilt JAR.
 
@@ -624,7 +721,8 @@ MaintainerNotes: |-
 
   checkupdates will fail for this app, so that's why UpdateCheckMode is None. Please keep up-to-date manually.
 
+ArchivePolicy: 4
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '20.2'
-CurrentVersionCode: 2002001
+CurrentVersion: '20.3'
+CurrentVersionCode: 2003001