diff --git a/metadata/com.gokadzev.musify.fdroid.yml b/metadata/com.gokadzev.musify.fdroid.yml
index f53f5004e4..b0a1a10af2 100644
--- a/metadata/com.gokadzev.musify.fdroid.yml
+++ b/metadata/com.gokadzev.musify.fdroid.yml
@@ -2642,6 +2642,10 @@ Builds:
       - apt-get install -y yq
       - mkdir -p /home/runner/
       - chown vagrant /home/runner/
+      - export CPUS_MAX=4
+      - export CPUS=$(getconf _NPROCESSORS_ONLN)
+      - for (( c=$CPUS_MAX; c<$CPUS; c++ )) ; do echo 0 > /sys/devices/system/cpu/cpu$c/online
+        ; done
     output: build/app/outputs/flutter-apk/app-fdroid-release.apk
     srclibs:
       - flutter@stable
@@ -2653,7 +2657,7 @@ Builds:
       - pushd $HOME/work/Musify/Musify/
       - export PUB_CACHE=$(pwd)/.pub-cache
       - export flutterVersion="$(yq -r .environment.flutter pubspec.yaml | sed 's/\^//g')"
-      - '[[ $flutterVersion ]] || exit 1'
+      - '[[ $flutterVersion ]]'
       - git -C $$flutter$$ checkout -f $flutterVersion
       - rm $$flutter$$/engine/src/.gn
       - $$flutter$$/bin/flutter config --no-analytics
diff --git a/metadata/com.streetwriters.notesnook.yml b/metadata/com.streetwriters.notesnook.yml
index ceba56f786..105814b5b4 100644
--- a/metadata/com.streetwriters.notesnook.yml
+++ b/metadata/com.streetwriters.notesnook.yml
@@ -12003,6 +12003,7 @@ Builds:
 
   - versionName: 3.3.6
     versionCode: 15376
+    disable: build failed on old server
     commit: 8cd8e93487aeb54f83a6ac7b35e0708ec8eceb1d
     subdir: apps/mobile/native/android/app
     sudo:
@@ -12074,6 +12075,7 @@ Builds:
 
   - versionName: 3.3.6
     versionCode: 15377
+    disable: build failed on old server
     commit: 8cd8e93487aeb54f83a6ac7b35e0708ec8eceb1d
     subdir: apps/mobile/native/android/app
     sudo:
@@ -12145,6 +12147,7 @@ Builds:
 
   - versionName: 3.3.6
     versionCode: 15378
+    disable: build failed on old server
     commit: 8cd8e93487aeb54f83a6ac7b35e0708ec8eceb1d
     subdir: apps/mobile/native/android/app
     sudo:
@@ -12216,6 +12219,7 @@ Builds:
 
   - versionName: 3.3.6
     versionCode: 15379
+    disable: build failed on old server
     commit: 8cd8e93487aeb54f83a6ac7b35e0708ec8eceb1d
     subdir: apps/mobile/native/android/app
     sudo: