diff --git a/metadata/com.robertmengual.toberquizz.yml b/metadata/com.robertmengual.toberquizz.yml
index 3b61e5cbf5..f6b9b03a73 100644
--- a/metadata/com.robertmengual.toberquizz.yml
+++ b/metadata/com.robertmengual.toberquizz.yml
@@ -109,9 +109,11 @@ Builds:
       - curl -Lo node.tar.xz https://nodejs.org/download/release/v16.3.0/node-v16.3.0-linux-x64.tar.xz
       - echo "5347ece975747e4d9768d4ed3f8b2220c955ac01f8a695347cd7f71ff5efa318 node.tar.xz"
         | sha256sum -c -
-      - tar xJf node.tar.xz
-      - cp -a node-v16.3.0-linux-x64/. /usr/local/
+      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
       - npm install -g yarn
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     prebuild:
diff --git a/metadata/de.rmrf.partygames.yml b/metadata/de.rmrf.partygames.yml
index 9e165b19e5..4ca13eaeb4 100644
--- a/metadata/de.rmrf.partygames.yml
+++ b/metadata/de.rmrf.partygames.yml
@@ -78,17 +78,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 1.6.0
-    versionCode: 10600
-    commit: 217adaa4871e4bbcac733296714ea78594f370c8
-    subdir: PartyGames
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-
   - versionName: 1.6.1
     versionCode: 10601
     commit: 3d83e2e56148dcdba7f4fe100a7f9d810794e1e6
@@ -99,6 +88,7 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
+    prebuild: sed -i -e '/dv8tion/d' ../build.gradle
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/souch.smp.yml b/metadata/souch.smp.yml
index ba69026241..af7148c229 100644
--- a/metadata/souch.smp.yml
+++ b/metadata/souch.smp.yml
@@ -213,6 +213,7 @@ Builds:
 
   - versionName: '2.0'
     versionCode: 25
+    disable: https://gitlab.com/souch/SMP/-/issues/88
     commit: c1319cbdb42de04e269772ca7006823f1351af93
     subdir: app
     sudo: