diff --git a/metadata/com.bobek.compass.yml b/metadata/com.bobek.compass.yml
index fc5cab573b..d53f392752 100644
--- a/metadata/com.bobek.compass.yml
+++ b/metadata/com.bobek.compass.yml
@@ -38,6 +38,10 @@ Builds:
     versionCode: 6
     commit: 13cbda3b681899886883eb8668a93beb9f67d8ce
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.fabienli.dokuwiki.yml b/metadata/com.fabienli.dokuwiki.yml
index 130779bfbb..323e012a10 100644
--- a/metadata/com.fabienli.dokuwiki.yml
+++ b/metadata/com.fabienli.dokuwiki.yml
@@ -71,6 +71,10 @@ Builds:
     versionCode: 64
     commit: 48ce4a6566fd711bd9b194c1ad368252444ad596
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.neumorphic.calculator.yml b/metadata/com.neumorphic.calculator.yml
index fc1796b1df..fc0d9574d2 100644
--- a/metadata/com.neumorphic.calculator.yml
+++ b/metadata/com.neumorphic.calculator.yml
@@ -14,10 +14,6 @@ Builds:
   - versionName: 1.0.0
     versionCode: 1
     commit: b0ea287db768c146925b7df4853abe10286b8026
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
       - flutter@2.8.1
@@ -31,6 +27,10 @@ Builds:
   - versionName: 1.1.0
     versionCode: 2
     commit: 285d866603a58e1b733c988b020e50ce8d44e74e
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
       - flutter@2.8.1
diff --git a/metadata/cx.ring.yml b/metadata/cx.ring.yml
index 5a283e2791..02f388c8f6 100644
--- a/metadata/cx.ring.yml
+++ b/metadata/cx.ring.yml
@@ -1571,45 +1571,7 @@ Builds:
       - ./compile.sh --release --daemon
     ndk: r23
 
-  - versionName: 20220102-01
-    versionCode: 325
-    commit: android/release_325
-    timeout: 10800
-    subdir: client-android/ring-android/app
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - apt-get install -y -t testing swig
-      - apt-get install -y -t stretch-backports-sloppy libarchive13
-      - apt-get install -y -t stretch-backports cmake
-      - update-alternatives --auto java
-    gradle:
-      - noPush
-    rm:
-      - client-gnome
-      - client-ios
-      - client-macosx
-      - client-qt
-      - client-uwp
-      - lrc
-      - plugins
-      - docker
-      - docs
-      - guix
-      - packaging
-      - patches
-      - scripts
-    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'platforms;android-31' 'build-tools;31.0.0'
-    build:
-      - cd ../..
-      - export ANDROID_NDK_ROOT="$ANDROID_NDK"
-      - export ANDROID_ABI="armeabi-v7a arm64-v8a x86_64"
-      - ./compile.sh --release --daemon
-    ndk: r23
-
-  - versionName: 20220102-01
+  - versionName: 20220121-01
     versionCode: 326
     commit: android/release_326
     timeout: 10800
@@ -1657,5 +1619,5 @@ MaintainerNotes: |-
 AutoUpdateMode: Version android/release_%c
 UpdateCheckMode: HTTP
 UpdateCheckData: https://git.jami.net/savoirfairelinux/ring-project/-/tags?format=atom|<title>android/release_(\d+)|https://git.jami.net/savoirfairelinux/ring-client-android/-/raw/master/ring-android/app/build.gradle.kts|versionName\s=\s"([\d-]+)"
-CurrentVersion: 20220102-01
+CurrentVersion: 20220121-01
 CurrentVersionCode: 326
diff --git a/metadata/de.spiritcroc.riotx.yml b/metadata/de.spiritcroc.riotx.yml
index c9cd94b0cd..4d56ecbbd8 100644
--- a/metadata/de.spiritcroc.riotx.yml
+++ b/metadata/de.spiritcroc.riotx.yml
@@ -793,6 +793,8 @@ Builds:
         ../build.gradle
       - sed -i -e '/google()/amavenLocal()' ../build.gradle
       - sed -i -e '/gplayImplementation(.*) {/,/}/d; /gplayImplementation/d' build.gradle
+      - sed -i -e 's/org.matrix.android:olm:3.2.7/org.matrix.android:olm-sdk:3.2.10/'
+        ../matrix-sdk-android/build.gradle
     build:
       - cd $$jitsi-meet$$
       - export LIBRE_BUILD=true
diff --git a/metadata/fr.odrevet.bide_et_musique.yml b/metadata/fr.odrevet.bide_et_musique.yml
index 2bcfc3f3fa..fd39e9c20b 100644
--- a/metadata/fr.odrevet.bide_et_musique.yml
+++ b/metadata/fr.odrevet.bide_et_musique.yml
@@ -65,9 +65,13 @@ Builds:
   - versionName: 4.0.1
     versionCode: 51
     commit: 7851d0c90b5641ef88d68ea14ded6b9b94e635ed
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@2.5.3
+      - flutter@2.8.1
     rm:
       - ios
     build:
diff --git a/metadata/ltd.evilcorp.atox.yml b/metadata/ltd.evilcorp.atox.yml
index c902949211..45ddd35780 100644
--- a/metadata/ltd.evilcorp.atox.yml
+++ b/metadata/ltd.evilcorp.atox.yml
@@ -44,11 +44,12 @@ Builds:
       - cd ..
       - mkdir -p ndk
       - cd ndk
-      - curl -Lo ndk.zip https://dl.google.com/android/repository/android-ndk-r21e-linux.zip
+      - curl -Lo ndk.zip https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip
       - echo "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e ndk.zip"
         | sha256sum -c -
       - unzip -q ndk.zip
-      - export ANDROID_NDK_HOME=./ndk/android-ndk-r21e
+      - cd ..
+      - export ANDROID_NDK_HOME=$(pwd)/ndk/android-ndk-r21e
       - ./scripts/build-host -j$(nproc)
       - ./scripts/build-aarch64-linux-android -j$(nproc) release
       - ./scripts/build-arm-linux-androideabi -j$(nproc) release