diff --git a/metadata/cityfreqs.com.pilfershushjammer.yml b/metadata/cityfreqs.com.pilfershushjammer.yml
index c59c808742..b6928c568b 100644
--- a/metadata/cityfreqs.com.pilfershushjammer.yml
+++ b/metadata/cityfreqs.com.pilfershushjammer.yml
@@ -270,6 +270,10 @@ Builds:
     versionCode: 42
     commit: ae2b2c53e06aeddbf0bf7b7ded0c232500867e46
     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.dkanada.gramophone.yml b/metadata/com.dkanada.gramophone.yml
index 6a7b2e2765..34c7ee0366 100644
--- a/metadata/com.dkanada.gramophone.yml
+++ b/metadata/com.dkanada.gramophone.yml
@@ -105,6 +105,10 @@ Builds:
     versionCode: 16
     commit: 4c17c5ecd5479b5787d7944bf276d2f35aee1fae
     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.jairaj.janglegmail.motioneye.yml b/metadata/com.jairaj.janglegmail.motioneye.yml
index 24657c1353..6423ec8b90 100644
--- a/metadata/com.jairaj.janglegmail.motioneye.yml
+++ b/metadata/com.jairaj.janglegmail.motioneye.yml
@@ -22,6 +22,10 @@ Builds:
     versionCode: 91
     commit: 4bdcc53b1205a7519ce264b40d21b366b788c83d
     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.podverse.fdroid.yml b/metadata/com.podverse.fdroid.yml
index 1dbd8012eb..270ba284a1 100644
--- a/metadata/com.podverse.fdroid.yml
+++ b/metadata/com.podverse.fdroid.yml
@@ -1415,11 +1415,11 @@ Builds:
     commit: 4.5.4
     subdir: android/app
     sudo:
+      - sysctl fs.inotify.max_user_watches=524288
       - curl -Lo node.tar.xz https://nodejs.org/download/release/v14.17.6/node-v14.17.6-linux-x64.tar.xz
       - echo "3bbe4faf356738d88b45be222bf5e858330541ff16bd0d4cfad36540c331461b node.tar.xz"
         | sha256sum -c -
-      - tar xJf node.tar.xz
-      - cp -a node-v14.17.6-linux-x64/. /usr/local/
+      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
       - npm -g install yarn
     init:
       - yarn install