diff --git a/metadata/org.mozilla.fennec_fdroid.yml b/metadata/org.mozilla.fennec_fdroid.yml
index a5f53f47fb..c83cbfb9b0 100644
--- a/metadata/org.mozilla.fennec_fdroid.yml
+++ b/metadata/org.mozilla.fennec_fdroid.yml
@@ -15568,12 +15568,12 @@ Builds:
     commit: 7b2763f2e96116b0a712b5f075ff97637506c9fc
     timeout: 18000
     sudo:
+      - apt-get update
+      - apt-get install -y cmake make m4 pkg-config python-is-python3 python3-venv
+        tcl gyp ninja-build bzip2 libffi-dev libsqlite3-dev binutils-dev
       - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
       - apt-get update
       - apt-get install -y -t trixie clang-18 llvm-18 lld-18 libssl-dev
-      - apt-get install -y -t bookworm cmake make m4 g++ pkg-config python-is-python3
-        python3-distutils python3-venv tcl gyp ninja-build bzip2 libz-dev libffi-dev
-        libsqlite3-dev binutils-dev
     output: ../srclib/MozFennec/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-*-release-unsigned.apk
     srclibs:
       - MozFennec@FIREFOX_132_0_BUILD1
@@ -15594,12 +15594,12 @@ Builds:
     commit: 7b2763f2e96116b0a712b5f075ff97637506c9fc
     timeout: 18000
     sudo:
+      - apt-get update
+      - apt-get install -y cmake make m4 pkg-config python-is-python3 python3-venv
+        tcl gyp ninja-build bzip2 libffi-dev libsqlite3-dev binutils-dev
       - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
       - apt-get update
       - apt-get install -y -t trixie clang-18 llvm-18 lld-18 libssl-dev
-      - apt-get install -y -t bookworm cmake make m4 g++ pkg-config python-is-python3
-        python3-distutils python3-venv tcl gyp ninja-build bzip2 libz-dev libffi-dev
-        libsqlite3-dev binutils-dev
     output: ../srclib/MozFennec/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-*-release-unsigned.apk
     srclibs:
       - MozFennec@FIREFOX_132_0_BUILD1
diff --git a/metadata/us.spotco.fennec_dos.yml b/metadata/us.spotco.fennec_dos.yml
index 40a0bff746..a6b32d8580 100644
--- a/metadata/us.spotco.fennec_dos.yml
+++ b/metadata/us.spotco.fennec_dos.yml
@@ -3960,12 +3960,12 @@ Builds:
     commit: v132.0.0
     timeout: 18000
     sudo:
+      - apt-get update
+      - apt-get install -y cmake make m4 pkg-config python-is-python3 python3-venv
+        tcl gyp ninja-build bzip2 libffi-dev libsqlite3-dev binutils-dev
       - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
       - apt-get update
       - apt-get install -y -t trixie clang-18 llvm-18 lld-18 libssl-dev
-      - apt-get install -y -t bookworm cmake make m4 g++ pkg-config python-is-python3
-        python3-distutils python3-venv tcl gyp ninja-build bzip2 libz-dev libffi-dev
-        libsqlite3-dev binutils-dev
     output: ../srclib/MozFennec/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-*-release-unsigned.apk
     srclibs:
       - MozFennec@FIREFOX_132_0_BUILD1
@@ -3986,12 +3986,12 @@ Builds:
     commit: v132.0.0
     timeout: 18000
     sudo:
+      - apt-get update
+      - apt-get install -y cmake make m4 pkg-config python-is-python3 python3-venv
+        tcl gyp ninja-build bzip2 libffi-dev libsqlite3-dev binutils-dev
       - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
       - apt-get update
       - apt-get install -y -t trixie clang-18 llvm-18 lld-18 libssl-dev
-      - apt-get install -y -t bookworm cmake make m4 g++ pkg-config python-is-python3
-        python3-distutils python3-venv tcl gyp ninja-build bzip2 libz-dev libffi-dev
-        libsqlite3-dev binutils-dev
     output: ../srclib/MozFennec/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-*-release-unsigned.apk
     srclibs:
       - MozFennec@FIREFOX_132_0_BUILD1