diff --git a/metadata/com.iven.musicplayergo.yml b/metadata/com.iven.musicplayergo.yml
index 202717a353..f1d7a83330 100644
--- a/metadata/com.iven.musicplayergo.yml
+++ b/metadata/com.iven.musicplayergo.yml
@@ -579,6 +579,10 @@ Builds:
     versionCode: 174
     commit: 393a19435cb84b848c464e1abcba19a840fbf213
     subdir: project/app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     rm:
diff --git a/metadata/com.maltaisn.notes.sync.yml b/metadata/com.maltaisn.notes.sync.yml
index 758e01a18b..94e0cc16f1 100644
--- a/metadata/com.maltaisn.notes.sync.yml
+++ b/metadata/com.maltaisn.notes.sync.yml
@@ -45,6 +45,7 @@ Builds:
 
   - versionName: 1.4.2
     versionCode: 10402
+    disable: https://github.com/maltaisn/another-notes-app/issues/58
     commit: 1a343ef826d212de2d29bd52fe33f6007cb55360
     subdir: app
     sudo:
diff --git a/metadata/com.nathanatos.Cuppa.yml b/metadata/com.nathanatos.Cuppa.yml
index 5a3e78740e..e2fe7e9480 100644
--- a/metadata/com.nathanatos.Cuppa.yml
+++ b/metadata/com.nathanatos.Cuppa.yml
@@ -90,7 +90,7 @@ Builds:
     commit: 31e8b29145f53694b4dfb4a0d0d9f57f97aedd92
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
-      - flutter@2.5.3
+      - flutter@2.8.1
     rm:
       - ios
     build:
diff --git a/metadata/com.tailscale.ipn.yml b/metadata/com.tailscale.ipn.yml
index 0d3943e6ce..e2a519b50e 100644
--- a/metadata/com.tailscale.ipn.yml
+++ b/metadata/com.tailscale.ipn.yml
@@ -646,6 +646,10 @@ Builds:
     sudo:
       - apt-get update || apt-get update
       - apt-get install -y git -t stretch-backports
+      - curl -Lso go.tar.gz https://golang.org/dl/go1.17.6.linux-amd64.tar.gz
+      - echo "231654bbf2dab3d86c1619ce799e77b03d96f9b50770297c8f4dff8836fc8ca2 go.tar.gz"
+        | sha256sum -c -
+      - tar xzf go.tar.gz --strip-components=1 -C /usr/local/
     gradle:
       - fdroid
     prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3'
diff --git a/metadata/se.manyver.yml b/metadata/se.manyver.yml
index 73a0a727b3..fea54e8fca 100644
--- a/metadata/se.manyver.yml
+++ b/metadata/se.manyver.yml
@@ -1949,7 +1949,6 @@ Builds:
     rm:
       - node_modules/react-native/ReactAndroid/src/main/third-party/java/buck-android-support/buck-android-support.jar
       - node_modules/react-native/template/
-      - benchmark
       - desktop
       - ios
     prebuild: sed -i -e '/lifecycle/d' ../build.gradle