diff --git a/metadata/org.xbmc.kodi.yml b/metadata/org.xbmc.kodi.yml
index 6fd661a5b0..a41da900c2 100644
--- a/metadata/org.xbmc.kodi.yml
+++ b/metadata/org.xbmc.kodi.yml
@@ -278,43 +278,6 @@ Builds:
       - make -C build apk-unsigned
     ndk: r20b
 
-  - versionName: '19.3'
-    versionCode: 1903000
-    disable: build failed
-    commit: 19.3-Matrix
-    timeout: 7200
-    sudo:
-      - apt-get update
-      - apt-get install -y build-essential default-jdk gawk lib32stdc++6 lib32z1 lib32z1-dev
-        libcurl4-openssl-dev zlib1g-dev groovy libcommons-lang-java python-dev
-    patch:
-      - 19.3-groovy.patch
-    output: build/tools/android/packaging/xbmc/build/outputs/apk/releaseUnsigned/xbmc-releaseUnsigned-unsigned.apk
-    rm:
-      - tools/codegenerator/groovy/
-    prebuild:
-      - sed -i -e '/gradlew/d' -e '/gradle-wrapper.jar/d' cmake/scripts/android/Install.cmake
-      - sed -i -e 's#./gradlew#gradle#' tools/android/packaging/Makefile.in
-    scanignore:
-      - addons/webinterface.default/lib/soundmanager/swf/soundmanager2_flash_xdomain.zip
-    scandelete:
-      - lib/
-      - project/
-      - tools/
-      - xbmc/filesystem/test
-    build:
-      - 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-unsigned
-    ndk: r20b
-
   - versionName: '19.4'
     versionCode: 1904000
     commit: 19.4-Matrix
@@ -407,123 +370,6 @@ Builds:
       - make -C build apk-unsigned
     ndk: r21
 
-  - versionName: 20.0-ALPHA1
-    versionCode: 1990701
-    disable: outdated pre-release version
-    commit: 59d6be57497667de7d40aacf066be7875a6a94b4
-    timeout: 28000
-    sudo:
-      - apt-get update
-      - apt-get install -y build-essential default-jdk gawk lib32stdc++6 lib32z1 lib32z1-dev
-        libcurl4-openssl-dev zlib1g-dev groovy libcommons-lang-java python-dev openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    patch:
-      - 19.3-groovy.patch
-    output: build/tools/android/packaging/xbmc/build/outputs/apk/release/xbmc-release-unsigned.apk
-    rm:
-      - tools/codegenerator/groovy/
-    prebuild:
-      - 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
-    scanignore:
-      - addons/webinterface.default/lib/soundmanager/swf/soundmanager2_flash_xdomain.zip
-    scandelete:
-      - lib/
-      - project/
-      - tools/
-      - xbmc/filesystem/test
-    build:
-      - 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.0-ALPHA3
-    versionCode: 1990710
-    disable: outdated pre-release version
-    commit: 8d5ffc55b6688a9320905a052999b510f77d2b3a
-    timeout: 28000
-    sudo:
-      - apt-get update
-      - apt-get install -y build-essential default-jdk gawk lib32stdc++6 lib32z1 lib32z1-dev
-        libcurl4-openssl-dev zlib1g-dev groovy libcommons-lang-java python-dev openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    patch:
-      - 19.3-groovy.patch
-    output: build/tools/android/packaging/xbmc/build/outputs/apk/release/xbmc-release-unsigned.apk
-    rm:
-      - tools/codegenerator/groovy/
-    prebuild:
-      - 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
-    scanignore:
-      - addons/webinterface.default/lib/soundmanager/swf/soundmanager2_flash_xdomain.zip
-    scandelete:
-      - lib/
-      - project/
-      - tools/
-      - xbmc/filesystem/test
-    build:
-      - 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.0-ALPHA3
-    versionCode: 1990711
-    disable: outdated pre-release version
-    commit: 8d5ffc55b6688a9320905a052999b510f77d2b3a
-    timeout: 28000
-    sudo:
-      - rm -fr /opt/android-sdk/build-tools/*
-      - apt-get update
-      - apt-get install -y automake build-essential cmake file gawk gperf groovy lib32stdc++6
-        lib32z1-dev libcommons-lang-java libcurl4-openssl-dev python-dev
-    patch:
-      - 19.3-groovy.patch
-    output: build/tools/android/packaging/xbmc/build/outputs/apk/release/xbmc-release-unsigned.apk
-    rm:
-      - tools/codegenerator/groovy/
-    prebuild:
-      - 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
-    scanignore:
-      - addons/webinterface.default/lib/soundmanager/swf/soundmanager2_flash_xdomain.zip
-    scandelete:
-      - lib/
-      - project/
-      - tools/
-      - xbmc/filesystem/test
-    build:
-      - 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
-
   - versionName: '20.2'
     versionCode: 2002000
     commit: 5f418d0b133535c6675154688ac7144e34f4d436
@@ -712,6 +558,100 @@ Builds:
       - make -C build apk
     ndk: r21e
 
+  - versionName: '20.4'
+    versionCode: 2004000
+    commit: 4868e9c709bf9ccaa6e301b18acb9c5b7adaa1d9
+    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.4'
+    versionCode: 2004001
+    commit: 4868e9c709bf9ccaa6e301b18acb9c5b7adaa1d9
+    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.
 
@@ -724,5 +664,5 @@ MaintainerNotes: |-
 ArchivePolicy: 4
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '20.3'
-CurrentVersionCode: 2003001
+CurrentVersion: '20.4'
+CurrentVersionCode: 2004001