diff --git a/metadata/com.ghostsq.commander.yml b/metadata/com.ghostsq.commander.yml
index d6f0fea860..3a0790f93e 100644
--- a/metadata/com.ghostsq.commander.yml
+++ b/metadata/com.ghostsq.commander.yml
@@ -581,17 +581,15 @@ Builds:
     scanignore:
       - src/main/java/com/ghostsq/commander/adapters/CA.java
 
-  - versionName: 1.60.7b1
-    versionCode: 428
-    disable: Could not find method checkReleaseBuilds() for arguments [false] on task
-        ':lint'
-    commit: '79'
+  - versionName: 1.60.7b2
+    versionCode: 429
+    commit: '80'
     gradle:
       - free
     prebuild:
-      - sed -i -e '/task clean/,/^}/d' build.gradle.root
       - cat build.gradle >> build.gradle.root
       - mv build.gradle.root build.gradle
+      - sed -i -e '/task clean/,/^}/d' -e 's/lint/lintOptions/' build.gradle
     scanignore:
       - src/main/java/com/ghostsq/commander/adapters/CA.java
 
diff --git a/metadata/com.neumorphic.calculator.yml b/metadata/com.neumorphic.calculator.yml
index acf0715f8e..fc1796b1df 100644
--- a/metadata/com.neumorphic.calculator.yml
+++ b/metadata/com.neumorphic.calculator.yml
@@ -14,6 +14,10 @@ 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
diff --git a/metadata/de.spiritcroc.riotx.yml b/metadata/de.spiritcroc.riotx.yml
index 9c9655c014..c9cd94b0cd 100644
--- a/metadata/de.spiritcroc.riotx.yml
+++ b/metadata/de.spiritcroc.riotx.yml
@@ -777,7 +777,8 @@ Builds:
     subdir: vector
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y -t stretch-backports npm jq openjdk-11-jdk-headless openjdk-11-jre-headless
+      - apt-get install -y openjdk-11-jdk-headless
+      - apt-get install -y -t stretch-backports npm jq
       - update-alternatives --auto java
       - sysctl fs.inotify.max_user_watches=524288
       - sysctl -p
@@ -788,8 +789,9 @@ Builds:
     prebuild:
       - sed -i -e '/com.google.gms.google-services/d' build.gradle ../build.gradle
       - sed -i -e 's/enable true/enable false/g' build.gradle
-      - sed -i -e '/Jitsi repo/,/}/d' ../build.gradle
-      - sed -i -e '/google()/a\        mavenLocal()' ../build.gradle
+      - sed -i -e 's|"https://github.com/vector-im.*"|"https://jitpack.io/"|' -e "s|'https://gitlab.matrix.org.*'|'https://jitpack.io/'|"
+        ../build.gradle
+      - sed -i -e '/google()/amavenLocal()' ../build.gradle
       - sed -i -e '/gplayImplementation(.*) {/,/}/d; /gplayImplementation/d' build.gradle
     build:
       - cd $$jitsi-meet$$
diff --git a/metadata/ltd.evilcorp.atox.yml b/metadata/ltd.evilcorp.atox.yml
index dfa7de8de6..c902949211 100644
--- a/metadata/ltd.evilcorp.atox.yml
+++ b/metadata/ltd.evilcorp.atox.yml
@@ -25,30 +25,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 0.7.1
-    versionCode: 11
-    commit: c6d95765865cc88e449401918cb607d8623d3097
-    subdir: atox
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y g++ yasm
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-      - curl -Lo sbt.tgz https://github.com/sbt/sbt/releases/download/v1.6.1/sbt-1.6.1.tgz
-      - echo "60286bf1b875b31e2955f8a699888cd2612e9afd94d03cde0a2e71efd7492ffc sbt.tgz"
-        | sha256sum -c -
-      - tar xzf sbt.tgz --strip-components=1 -C /usr/local/
-    gradle:
-      - yes
-    build:
-      - cd ..
-      - ./scripts/build-host -j$(nproc)
-      - ./scripts/build-aarch64-linux-android -j$(nproc) release
-      - ./scripts/build-arm-linux-androideabi -j$(nproc) release
-      - ./scripts/build-i686-linux-android -j$(nproc) release
-      - ./scripts/build-x86_64-linux-android -j$(nproc) release
-    ndk: r21e
-
   - versionName: 0.7.2
     versionCode: 12
     commit: 3771c8e10d3e2cc25c3a466522ddd6cbdbaa4c0e
@@ -66,12 +42,18 @@ Builds:
       - yes
     build:
       - cd ..
+      - mkdir -p ndk
+      - cd ndk
+      - curl -Lo ndk.zip https://dl.google.com/android/repository/android-ndk-r21e-linux.zip
+      - echo "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e ndk.zip"
+        | sha256sum -c -
+      - unzip -q ndk.zip
+      - export ANDROID_NDK_HOME=./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
       - ./scripts/build-i686-linux-android -j$(nproc) release
       - ./scripts/build-x86_64-linux-android -j$(nproc) release
-    ndk: r21e
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags