diff --git a/metadata/deckers.thibault.aves.libre.yml b/metadata/deckers.thibault.aves.libre.yml
index 64ac8a6429..a73f923137 100644
--- a/metadata/deckers.thibault.aves.libre.yml
+++ b/metadata/deckers.thibault.aves.libre.yml
@@ -247,10 +247,12 @@ Builds:
 
   - versionName: 1.8.0
     versionCode: 9101
+    disable: https://github.com/deckerst/aves/issues/532
     commit: 52984168192b65ef9bf7b5da37f9a79a3e2d7499
     submodules: true
     output: build/app/outputs/flutter-apk/app-*-libre-release.apk
     prebuild:
+      - export PUB_CACHE=$(pwd)/.pub-cache
       - ./flutterw config --no-analytics
       - scripts/update_flutter_version.sh
       - scripts/apply_flavor_libre.sh
@@ -261,15 +263,20 @@ Builds:
       - android/build.gradle
     scandelete:
       - .flutter/dev/integration_tests
-    build: ./flutterw build apk -t lib/main_libre.dart --flavor libre --split-per-abi
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - ./flutterw build apk -t lib/main_libre.dart --flavor libre --split-per-abi
         --target-platform="android-arm"
 
   - versionName: 1.8.0
     versionCode: 9102
+    disable: https://github.com/deckerst/aves/issues/532
     commit: 52984168192b65ef9bf7b5da37f9a79a3e2d7499
     submodules: true
     output: build/app/outputs/flutter-apk/app-*-libre-release.apk
     prebuild:
+      - export PUB_CACHE=$(pwd)/.pub-cache
       - ./flutterw config --no-analytics
       - scripts/update_flutter_version.sh
       - scripts/apply_flavor_libre.sh
@@ -280,15 +287,20 @@ Builds:
       - android/build.gradle
     scandelete:
       - .flutter/dev/integration_tests
-    build: ./flutterw build apk -t lib/main_libre.dart --flavor libre --split-per-abi
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - ./flutterw build apk -t lib/main_libre.dart --flavor libre --split-per-abi
         --target-platform="android-arm64"
 
   - versionName: 1.8.0
     versionCode: 9104
+    disable: https://github.com/deckerst/aves/issues/532
     commit: 52984168192b65ef9bf7b5da37f9a79a3e2d7499
     submodules: true
     output: build/app/outputs/flutter-apk/app-*-libre-release.apk
     prebuild:
+      - export PUB_CACHE=$(pwd)/.pub-cache
       - ./flutterw config --no-analytics
       - scripts/update_flutter_version.sh
       - scripts/apply_flavor_libre.sh
@@ -299,7 +311,10 @@ Builds:
       - android/build.gradle
     scandelete:
       - .flutter/dev/integration_tests
-    build: ./flutterw build apk -t lib/main_libre.dart --flavor libre --split-per-abi
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
+      - ./flutterw build apk -t lib/main_libre.dart --flavor libre --split-per-abi
         --target-platform="android-x64"
 
 MaintainerNotes: scanignore is used to skip lint false positives triggered by Google/Huawei