diff --git a/.gitlab/ci/jobs/build/docker_amd64_release.yml b/.gitlab/ci/jobs/build/docker_amd64_release.yml
index f3a5fe66e3ef1153f360ecea2014fb21bc4e1af3..dc669c5cec3ed7d680ebec0b7dec7186b4d460c3 100644
--- a/.gitlab/ci/jobs/build/docker_amd64_release.yml
+++ b/.gitlab/ci/jobs/build/docker_amd64_release.yml
@@ -7,5 +7,3 @@ docker:amd64:
     IMAGE_ARCH_PREFIX: "amd64_"
     CI_DOCKER_HUB: "true"
   stage: build
-  tags:
-    - build_dedicated
diff --git a/.gitlab/ci/jobs/build/get_contracts.yml b/.gitlab/ci/jobs/build/get_contracts.yml
index 2350e417e8d841bf205f2b43d70e5e5f33e2131e..2d029b09fe4bcca0df1a61c405521a1a7d328ce8 100644
--- a/.gitlab/ci/jobs/build/get_contracts.yml
+++ b/.gitlab/ci/jobs/build/get_contracts.yml
@@ -5,5 +5,3 @@ build_get_contracts:
     - .build_template
   script:
     - dune build @devtools/get_contracts/check
-  tags:
-    - build_dedicated
diff --git a/.gitlab/ci/jobs/build/static_x86_64_experimental.yml b/.gitlab/ci/jobs/build/static_x86_64_experimental.yml
index b88d3c0492741486f08d87457d840218446df2cd..475930848e82613f5956104d9647cd70aaacc4a7 100644
--- a/.gitlab/ci/jobs/build/static_x86_64_experimental.yml
+++ b/.gitlab/ci/jobs/build/static_x86_64_experimental.yml
@@ -20,5 +20,3 @@ build:static-x86_64-linux-binaries:
   variables:
     ARCH: "x86_64"
     EXECUTABLE_FILES: "script-inputs/released-executables script-inputs/experimental-executables"
-  tags:
-    - build_dedicated
diff --git a/.gitlab/ci/jobs/build/static_x86_64_release.yml b/.gitlab/ci/jobs/build/static_x86_64_release.yml
index 2a37903cd72dc4db4c8347cf5dbc5bae765f9b46..181fde40509694058a50f9b0aff64c40caeb626f 100644
--- a/.gitlab/ci/jobs/build/static_x86_64_release.yml
+++ b/.gitlab/ci/jobs/build/static_x86_64_release.yml
@@ -8,5 +8,3 @@ build:static-x86_64-linux-binaries:
   variables:
     ARCH: "x86_64"
     EXECUTABLE_FILES: "script-inputs/released-executables"
-  tags:
-    - build_dedicated
diff --git a/.gitlab/ci/jobs/build/x86_64.yml b/.gitlab/ci/jobs/build/x86_64.yml
index d472507c88a42d8835e14d107f07d6cd5a0077bb..70918fd9280d117cd13dcce68f84ea8486d552ce 100644
--- a/.gitlab/ci/jobs/build/x86_64.yml
+++ b/.gitlab/ci/jobs/build/x86_64.yml
@@ -8,5 +8,3 @@ build_x86_64:
   needs: [trigger]
   variables:
     ARCH: "x86_64"
-  tags:
-    - build_dedicated
diff --git a/scripts/ci/build_full_unreleased.sh b/scripts/ci/build_full_unreleased.sh
index f67e4d5a7a5634705a0c6e4ba4969c186c2959d0..0cc81049a49414545773f69274a397e186d6bc86 100755
--- a/scripts/ci/build_full_unreleased.sh
+++ b/scripts/ci/build_full_unreleased.sh
@@ -27,5 +27,5 @@ make build-unreleased
 # shellcheck disable=SC2086
 dune build ${COVERAGE_OPTIONS} src/bin_tps_evaluation
 
-# Trim the dune cache, if used.
-dune cache trim --size=250GB
+# 4. clean-up caches before uploading the cache
+opam clean
\ No newline at end of file
diff --git a/scripts/ci/build_static_binaries.sh b/scripts/ci/build_static_binaries.sh
index 6a235a18afb830af09a878da405094d95f14c437..c264344ebd26f8ab26c9238d3e18e0bf0bfd7a0b 100755
--- a/scripts/ci/build_static_binaries.sh
+++ b/scripts/ci/build_static_binaries.sh
@@ -22,9 +22,6 @@ mkdir -pv "octez-binaries/$ARCH"
 echo "Build and install static binaries"
 make static
 
-# Trim the dune cache, if used.
-dune cache trim --size=250GB
-
 echo "Check executables and move them to the destination directory"
 # Disable https://www.shellcheck.net/wiki/SC2086 because:
 # - it's meant to prevent word splitting and we actually want to split words