diff --git a/contrib/README.md b/contrib/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..97e39b7019da1eb25f66beb3e86131fbc360a868
--- /dev/null
+++ b/contrib/README.md
@@ -0,0 +1,16 @@
+# Contributed Software
+
+This directory is meant to host the source code of tools which can be
+useful for users and developers of Octez and the Tezos protocol but
+which don't deserve as much care as the components which are critical
+for the security of Tezos and Octez users.
+
+Putting these non-critical pieces of code in a distinct directory
+serves the following purposes:
+- preventing accidental call of this code from the critical components;
+- the mere presence of a tool in this directory indicates that it is
+  considered non-critical;
+- locating these tools under some directory eases the definition of
+  approval rules lowering the quality requirements for non-critical
+  code.
+
diff --git a/manifest/manifest.ml b/manifest/manifest.ml
index e99a2aa3604b67e1d930b6e3015730a797f1ab0e..714e28c11fb38b33dd501b23652fb9f8093541e8 100644
--- a/manifest/manifest.ml
+++ b/manifest/manifest.ml
@@ -2740,7 +2740,10 @@ let generate_opam ?release for_package (internals : Target.internal list) :
       |> String_set.of_list |> String_set.elements
       |> List.concat_map make_runtest
     in
-    {Opam.command = [S "rm"; S "-r"; S "vendors"]; with_test = Never}
+    {
+      Opam.command = [S "rm"; S "-r"; S "vendors"; S "contrib"];
+      with_test = Never;
+    }
     :: build :: runtests
   in
   let licenses =
diff --git a/opam/internal-devtools.opam b/opam/internal-devtools.opam
index bbfbfcbae98d13996df520655800a2bb5370277d..3a46bd717e90e7076a5e93bb6a831fde5024be66 100644
--- a/opam/internal-devtools.opam
+++ b/opam/internal-devtools.opam
@@ -22,7 +22,7 @@ conflicts: [
   "utop" { < "2.8" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-accuser-PtMumbai.opam b/opam/octez-accuser-PtMumbai.opam
index 5cc6f6bcb3eaf39d93e379f85ec2a594a6fece95..84316b58dc016f63f293ac9746e21e5c37bbdfc6 100644
--- a/opam/octez-accuser-PtMumbai.opam
+++ b/opam/octez-accuser-PtMumbai.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-client-base-unix"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-accuser-PtNairob.opam b/opam/octez-accuser-PtNairob.opam
index 079a7c550325f337b8b4f68c0fb50489dc69cb54..27222e7977b55da05d808baf65059e4ca91f046c 100644
--- a/opam/octez-accuser-PtNairob.opam
+++ b/opam/octez-accuser-PtNairob.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-client-base-unix"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-accuser-alpha.opam b/opam/octez-accuser-alpha.opam
index 1287560e77ba25a122adabf27f33e291b3850691..547db13989a7c3653ea610ebbbd12e67920eeba9 100644
--- a/opam/octez-accuser-alpha.opam
+++ b/opam/octez-accuser-alpha.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-client-base-unix"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-alcotezt.opam b/opam/octez-alcotezt.opam
index 62d9538082b39746003ef40858c6a51f58e3ac51..25d9043a0726077d93d3033104f380942f7a0918 100644
--- a/opam/octez-alcotezt.opam
+++ b/opam/octez-alcotezt.opam
@@ -13,7 +13,7 @@ depends: [
   "tezt" { >= "3.1.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-aplonk.opam b/opam/octez-aplonk.opam
index 42747a6722aa5ac22e2f213feda4527ac93dddd2..5837ccbbb040999648dc4f88167a1bf4243e481d 100644
--- a/opam/octez-aplonk.opam
+++ b/opam/octez-aplonk.opam
@@ -14,7 +14,7 @@ depends: [
   "octez-plonk"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-baker-PtMumbai.opam b/opam/octez-baker-PtMumbai.opam
index a28919ebb272341667fd95ad1c1d9db9b8170517..48a9d1bc7a9d2d5e72264bbafc686f16201af04e 100644
--- a/opam/octez-baker-PtMumbai.opam
+++ b/opam/octez-baker-PtMumbai.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-client-base-unix"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-baker-PtNairob.opam b/opam/octez-baker-PtNairob.opam
index 3b24d99d31c929788b693c8bcffc04defb3fce5f..798da530c1ab695b1199cff248cc1fc32c330ce7 100644
--- a/opam/octez-baker-PtNairob.opam
+++ b/opam/octez-baker-PtNairob.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-client-base-unix"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-baker-alpha.opam b/opam/octez-baker-alpha.opam
index 758737cb5af8d75954e4e07a7ed5db5eb1053fe7..5e6bb665ecbc3a1d2cc80e6a927272d1e12e752e 100644
--- a/opam/octez-baker-alpha.opam
+++ b/opam/octez-baker-alpha.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-client-base-unix"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-bls12-381-hash.opam b/opam/octez-bls12-381-hash.opam
index ea009cd23a598c9933953e99dc48f248d7d7e84a..e3753e90584681f712de425e6350f3e708d8d932 100644
--- a/opam/octez-bls12-381-hash.opam
+++ b/opam/octez-bls12-381-hash.opam
@@ -16,7 +16,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-bls12-381-polynomial.opam b/opam/octez-bls12-381-polynomial.opam
index 0130813c0668a58ac769122167a4a910e104206c..a7a90f6c3a3900230979c29ebb29528e1c41acfd 100644
--- a/opam/octez-bls12-381-polynomial.opam
+++ b/opam/octez-bls12-381-polynomial.opam
@@ -20,7 +20,7 @@ depends: [
   "bisect_ppx" { with-test & >= "2.7.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-bls12-381-signature.opam b/opam/octez-bls12-381-signature.opam
index 3134fabfdc3203d53656f35e3d6e0e5462d445d5..064020de2304c4cf3bc3cd457cf9cb367f3c15bc 100644
--- a/opam/octez-bls12-381-signature.opam
+++ b/opam/octez-bls12-381-signature.opam
@@ -16,7 +16,7 @@ depends: [
   "re" { >= "1.9.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-client.opam b/opam/octez-client.opam
index 005fb675f36abe0358820a5ead0c27ea180c8ef4..fa00929eb934ee03cf6264d188bf058d042724cd 100644
--- a/opam/octez-client.opam
+++ b/opam/octez-client.opam
@@ -62,7 +62,7 @@ depopts: [
   "tezos-protocol-plugin-alpha"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-codec.opam b/opam/octez-codec.opam
index 6f3e3e46e3290f99b182938ae516a7a815a0a6df..19e5bf325ac0ed7187122c18e07d0f66534d5092 100644
--- a/opam/octez-codec.opam
+++ b/opam/octez-codec.opam
@@ -36,7 +36,7 @@ depopts: [
   "tezos-client-alpha"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-crawler.opam b/opam/octez-crawler.opam
index 2b8da4a26683ea4d3db688dce7faa481078b163c..ee31a070bf4fa44b3d654fd7e8004bf179ccd171 100644
--- a/opam/octez-crawler.opam
+++ b/opam/octez-crawler.opam
@@ -17,7 +17,7 @@ depends: [
   "tezos-shell"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-dac-client.opam b/opam/octez-dac-client.opam
index c40f9feba21861c8ca176a9b56818aac9353d0b5..bdf41d7b730240fd9e66cf77c57fbf40c4f63bea 100644
--- a/opam/octez-dac-client.opam
+++ b/opam/octez-dac-client.opam
@@ -25,7 +25,7 @@ depopts: [
   "tezos-dac-alpha"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-dac-node.opam b/opam/octez-dac-node.opam
index 74d4c50306b49a9f359ad406a0a4ebdc26ad1f85..0742cfccc97bc286997f65e5613f5f1230a7a030 100644
--- a/opam/octez-dac-node.opam
+++ b/opam/octez-dac-node.opam
@@ -34,7 +34,7 @@ conflicts: [
   "checkseum" { = "0.5.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-dal-node.opam b/opam/octez-dal-node.opam
index 86ab3d2d987115b9944397af0ec84850913e5fb3..2ae52cd34e9b7a7e46589bf03507e71bd824aa95 100644
--- a/opam/octez-dal-node.opam
+++ b/opam/octez-dal-node.opam
@@ -42,7 +42,7 @@ conflicts: [
   "checkseum" { = "0.5.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-distributed-internal.opam b/opam/octez-distributed-internal.opam
index 4097153e5d1d946de724fb6aba2d87904710b857..b99ac01d9caeda8d14cb95550d973cc45d6e50b9 100644
--- a/opam/octez-distributed-internal.opam
+++ b/opam/octez-distributed-internal.opam
@@ -13,7 +13,7 @@ depends: [
   "base-unix"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-distributed-lwt-internal.opam b/opam/octez-distributed-lwt-internal.opam
index eecebd2b4d2ea9a7b591bf316cfdb13f5b1ffcaa..f2b90b05d9650ec850fba287f2543a10604a0e0f 100644
--- a/opam/octez-distributed-lwt-internal.opam
+++ b/opam/octez-distributed-lwt-internal.opam
@@ -16,7 +16,7 @@ depends: [
   "logs"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-distributed-plonk.opam b/opam/octez-distributed-plonk.opam
index 412ccff517916f2eea007a7bae64b9be647df139..2d2e2276589e47b0c33221a65a882870cea1b3d9 100644
--- a/opam/octez-distributed-plonk.opam
+++ b/opam/octez-distributed-plonk.opam
@@ -15,7 +15,7 @@ depends: [
   "octez-plonk"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-epoxy-tx.opam b/opam/octez-epoxy-tx.opam
index d34b78e2fef834ba3c6fd3aa9550e12cec05959b..37984656a8c2ebefc77444416249230976bb6b0a 100644
--- a/opam/octez-epoxy-tx.opam
+++ b/opam/octez-epoxy-tx.opam
@@ -18,7 +18,7 @@ depends: [
   "octez-aplonk"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-evm-proxy.opam b/opam/octez-evm-proxy.opam
index cc17d25d9789ff8dc8943ab3254892a4ddfb21cf..b6f3bbe879f31d47c8c409a07737ea76ba2925e4 100644
--- a/opam/octez-evm-proxy.opam
+++ b/opam/octez-evm-proxy.opam
@@ -23,7 +23,7 @@ depends: [
   "lwt-exit"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-injector.opam b/opam/octez-injector.opam
index 6f15d96cb7f91ec4c5143d0e9be04074ffd3b497..9301e2d7676f2e3b17ae399b27ca3c32226fa270 100644
--- a/opam/octez-injector.opam
+++ b/opam/octez-injector.opam
@@ -21,7 +21,7 @@ depends: [
   "octez-crawler"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-mec.opam b/opam/octez-mec.opam
index a675fc26440acd82b90a1defbef6809dd20b1c94..3a2958b9afb51541a46a0292d8db1f0401432584 100644
--- a/opam/octez-mec.opam
+++ b/opam/octez-mec.opam
@@ -18,7 +18,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-node-config.opam b/opam/octez-node-config.opam
index 48a3e6a157c96cd918155db78cf2420a1b20b102..4fa9dc5c1d971e60f97e7a3b3ead7d6bc74edbc6 100644
--- a/opam/octez-node-config.opam
+++ b/opam/octez-node-config.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-validation"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-node.opam b/opam/octez-node.opam
index 0842afd001120a38a2803281355e0ef4c88239a1..ca9e62b28385ccfda47f52dc7381978c47058e56 100644
--- a/opam/octez-node.opam
+++ b/opam/octez-node.opam
@@ -71,7 +71,7 @@ depopts: [
   "tezos-protocol-plugin-alpha-registerer"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-plompiler.opam b/opam/octez-plompiler.opam
index d0df5f8c1df2f5e4471bc38ba446259d49d1be42..21cf25a28445b3b68f723a1e7e4785e38c5fdf91 100644
--- a/opam/octez-plompiler.opam
+++ b/opam/octez-plompiler.opam
@@ -20,7 +20,7 @@ depends: [
   "octez-mec"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-plonk.opam b/opam/octez-plonk.opam
index 4a7e879c905d557bcaf00d5b297c321aff94a5a2..bf15256a73e07bab688678da0aa65e417e9163a4 100644
--- a/opam/octez-plonk.opam
+++ b/opam/octez-plonk.opam
@@ -22,7 +22,7 @@ depends: [
   "bls12-381" { >= "6.1.0" & < "6.2.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-polynomial.opam b/opam/octez-polynomial.opam
index 31e463c35d715fa8a2c763505811201aac38d46f..d6700b64a2a1aa96ea37b6339a0d8a5e84697e48 100644
--- a/opam/octez-polynomial.opam
+++ b/opam/octez-polynomial.opam
@@ -18,7 +18,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-protocol-compiler.opam b/opam/octez-protocol-compiler.opam
index d8d78bf8148228f25bd9656715909363714d5d66..3a08872f58969bd924b40d2577fa6e0887545581 100644
--- a/opam/octez-protocol-compiler.opam
+++ b/opam/octez-protocol-compiler.opam
@@ -19,7 +19,7 @@ depends: [
   "base-unix"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-proxy-server.opam b/opam/octez-proxy-server.opam
index 71fc84bcf395d0ed5de8bc004a3fa09c3892a529..5b1cf70e6c104e4a6e387d71e0a33827ed87a74d 100644
--- a/opam/octez-proxy-server.opam
+++ b/opam/octez-proxy-server.opam
@@ -61,7 +61,7 @@ depopts: [
   "tezos-protocol-plugin-alpha"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-signer.opam b/opam/octez-signer.opam
index e3374c24ea9ab56f533b871e0add19e184a39b87..c877c73adc9738bc9d2ae95c3275e76cd863d25c 100644
--- a/opam/octez-signer.opam
+++ b/opam/octez-signer.opam
@@ -24,7 +24,7 @@ depends: [
   "tezos-signer-backends"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-smart-rollup-client-PtMumbai.opam b/opam/octez-smart-rollup-client-PtMumbai.opam
index 2c4a83765c9a11828fa529789963facb7ce89932..c6bb0e198216277c59eec537237772c569058add 100644
--- a/opam/octez-smart-rollup-client-PtMumbai.opam
+++ b/opam/octez-smart-rollup-client-PtMumbai.opam
@@ -21,7 +21,7 @@ depends: [
   "tezos-clic"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-smart-rollup-client-PtNairob.opam b/opam/octez-smart-rollup-client-PtNairob.opam
index eb37b0ab6a0676347250ce7c434fc8bc14d0fb6b..1fb7fa4b5fff127e3543f98cc5379df5e727332a 100644
--- a/opam/octez-smart-rollup-client-PtNairob.opam
+++ b/opam/octez-smart-rollup-client-PtNairob.opam
@@ -21,7 +21,7 @@ depends: [
   "tezos-clic"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-smart-rollup-client-alpha.opam b/opam/octez-smart-rollup-client-alpha.opam
index 7b4611bad7509f6236fae0bbd79ef6bbbc094176..0e320ef7779a600e26fa8fcf5c92d43b64b9827c 100644
--- a/opam/octez-smart-rollup-client-alpha.opam
+++ b/opam/octez-smart-rollup-client-alpha.opam
@@ -21,7 +21,7 @@ depends: [
   "tezos-clic"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-smart-rollup-node-PtMumbai.opam b/opam/octez-smart-rollup-node-PtMumbai.opam
index a1d4c63c959efecf4d008128ff1de2ec5ed407a3..a9816a74791f4388a425fcd68f5ce3d02e05f50f 100644
--- a/opam/octez-smart-rollup-node-PtMumbai.opam
+++ b/opam/octez-smart-rollup-node-PtMumbai.opam
@@ -48,7 +48,7 @@ conflicts: [
   "checkseum" { = "0.5.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-smart-rollup-node-PtNairob.opam b/opam/octez-smart-rollup-node-PtNairob.opam
index 49d78f713af94a77d7b5c1796b3c34feed510c4f..9c57ed18acfa93d77445227b77098b8988e5fe2a 100644
--- a/opam/octez-smart-rollup-node-PtNairob.opam
+++ b/opam/octez-smart-rollup-node-PtNairob.opam
@@ -48,7 +48,7 @@ conflicts: [
   "checkseum" { = "0.5.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-smart-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam
index 839792240c0dd7f96194760d61f9201b7e8e8ea8..ed6babaea2bdd5b31aecb02b722ddc68bfac4450 100644
--- a/opam/octez-smart-rollup-node-alpha.opam
+++ b/opam/octez-smart-rollup-node-alpha.opam
@@ -49,7 +49,7 @@ conflicts: [
   "checkseum" { = "0.5.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-smart-rollup-node.opam b/opam/octez-smart-rollup-node.opam
index 80114f0aa9e38c84487969664fb43e0443bebcbd..8f65c158b1f67856c8899dd326ba27592a1b4701 100644
--- a/opam/octez-smart-rollup-node.opam
+++ b/opam/octez-smart-rollup-node.opam
@@ -19,7 +19,7 @@ depends: [
   "octez-injector"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-smart-rollup-wasm-benchmark-lib.opam b/opam/octez-smart-rollup-wasm-benchmark-lib.opam
index 559ea348c86002c4a1a4f919168ee7c13caeb1e0..afea1fd6250ba344e7f834a6a63155cb4c4f7237 100644
--- a/opam/octez-smart-rollup-wasm-benchmark-lib.opam
+++ b/opam/octez-smart-rollup-wasm-benchmark-lib.opam
@@ -20,7 +20,7 @@ depends: [
   "lwt" { >= "5.6.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-smart-rollup-wasm-benchmark.opam b/opam/octez-smart-rollup-wasm-benchmark.opam
index acbb511066aba6e998293990c7ba47cdeba1fc70..e74f5dd19bb460f28612933cd60f80982f1502bd 100644
--- a/opam/octez-smart-rollup-wasm-benchmark.opam
+++ b/opam/octez-smart-rollup-wasm-benchmark.opam
@@ -15,7 +15,7 @@ depends: [
   "octez-smart-rollup-wasm-benchmark-lib"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-smart-rollup-wasm-debugger.opam b/opam/octez-smart-rollup-wasm-debugger.opam
index ee17eb716f9582488a64b15970a503f8154f2427..65565fd4a24a0f1b0178908ead7ca918bfd209e7 100644
--- a/opam/octez-smart-rollup-wasm-debugger.opam
+++ b/opam/octez-smart-rollup-wasm-debugger.opam
@@ -21,7 +21,7 @@ depends: [
   "tezos-webassembly-interpreter-extra"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-snoop.opam b/opam/octez-snoop.opam
index 1acdff09ae754eaa824b4a84eaae12f7336878b1..6586fa7312bae70f9121c77c1ca96f46ab496b4f 100644
--- a/opam/octez-snoop.opam
+++ b/opam/octez-snoop.opam
@@ -21,7 +21,7 @@ depends: [
   "prbnmcn-stats" { = "0.0.6" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-srs-extraction.opam b/opam/octez-srs-extraction.opam
index 01a81edae5621d4e5cea9a812ee592ba6f431a9f..67ae5544d3b0272f509b5bf96a77b00e14f24bdc 100644
--- a/opam/octez-srs-extraction.opam
+++ b/opam/octez-srs-extraction.opam
@@ -18,7 +18,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/octez-testnet-scenarios.opam b/opam/octez-testnet-scenarios.opam
index 00fe2aaaca3ea181b9c2389e88f2e037895d9676..6c2bf4fd3bd64ab4a5cbd7166185c919210eeb5d 100644
--- a/opam/octez-testnet-scenarios.opam
+++ b/opam/octez-testnet-scenarios.opam
@@ -15,7 +15,7 @@ depends: [
   "tezt-ethereum"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-016-PtMumbai-test-helpers.opam b/opam/tezos-016-PtMumbai-test-helpers.opam
index c041ee4aae5de1b9428ce50a128c9c3b30c242b9..9a724812909a98e7558bebe8127d39d8ef50190f 100644
--- a/opam/tezos-016-PtMumbai-test-helpers.opam
+++ b/opam/tezos-016-PtMumbai-test-helpers.opam
@@ -24,7 +24,7 @@ depends: [
   "tezos-crypto-dal"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-017-PtNairob-test-helpers.opam b/opam/tezos-017-PtNairob-test-helpers.opam
index ca7f3c84a184c648c73e9e0b2912dd5383d1c173..fd6da81869bdde4b9e14d2ed3aef1fb1cb3c6a07 100644
--- a/opam/tezos-017-PtNairob-test-helpers.opam
+++ b/opam/tezos-017-PtNairob-test-helpers.opam
@@ -24,7 +24,7 @@ depends: [
   "tezos-crypto-dal"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-alpha-test-helpers.opam b/opam/tezos-alpha-test-helpers.opam
index 1002ce39d3c9c125a8a6601fd431954aa598fd03..33cd23d6a7a5897f5c1059dc565c94d94b78e890 100644
--- a/opam/tezos-alpha-test-helpers.opam
+++ b/opam/tezos-alpha-test-helpers.opam
@@ -24,7 +24,7 @@ depends: [
   "tezos-crypto-dal"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-baking-016-PtMumbai-commands.opam b/opam/tezos-baking-016-PtMumbai-commands.opam
index 2ac37cc84411d6b01592f02765857be97ef226b5..8e03e528937d8b06d9e22968c98f046782be2f53 100644
--- a/opam/tezos-baking-016-PtMumbai-commands.opam
+++ b/opam/tezos-baking-016-PtMumbai-commands.opam
@@ -23,7 +23,7 @@ depends: [
   "uri" { >= "3.1.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-baking-016-PtMumbai.opam b/opam/tezos-baking-016-PtMumbai.opam
index 8baedc8cd0121184a2fdf2d96b0c4017b2a51406..73e0cc150801274bec0d3529ede698923547008c 100644
--- a/opam/tezos-baking-016-PtMumbai.opam
+++ b/opam/tezos-baking-016-PtMumbai.opam
@@ -43,7 +43,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-baking-017-PtNairob-commands.opam b/opam/tezos-baking-017-PtNairob-commands.opam
index cb26b68754cfaa39866532fa1363d5b2ea31faca..cacf526cd96f525a8f1de846539a02a653f3dffb 100644
--- a/opam/tezos-baking-017-PtNairob-commands.opam
+++ b/opam/tezos-baking-017-PtNairob-commands.opam
@@ -23,7 +23,7 @@ depends: [
   "uri" { >= "3.1.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-baking-017-PtNairob.opam b/opam/tezos-baking-017-PtNairob.opam
index b31a406e50e7d8a4eeab7c1d962bbdeaa0d1a2a8..80de41c771d3e9da328cb38393f3e25056e3df9c 100644
--- a/opam/tezos-baking-017-PtNairob.opam
+++ b/opam/tezos-baking-017-PtNairob.opam
@@ -44,7 +44,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-baking-alpha-commands.opam b/opam/tezos-baking-alpha-commands.opam
index e8bef8b44d4954bfe8c783867da3e418cb81a7e6..1bb7599222b622e5bd6135b761bdb08d4f0b2f1f 100644
--- a/opam/tezos-baking-alpha-commands.opam
+++ b/opam/tezos-baking-alpha-commands.opam
@@ -23,7 +23,7 @@ depends: [
   "uri" { >= "3.1.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-baking-alpha.opam b/opam/tezos-baking-alpha.opam
index baa7a5e40733661930bf7d1dc4db0b9bbece4d4b..4eb5a479269acd54b1c490c0f2b556eba0d45084 100644
--- a/opam/tezos-baking-alpha.opam
+++ b/opam/tezos-baking-alpha.opam
@@ -44,7 +44,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-base-test-helpers.opam b/opam/tezos-base-test-helpers.opam
index af84036676ee699febcd1e9fd7b1187cc02b4458..2a66e00836f876d3576840965a5ad5ec6908a4ea 100644
--- a/opam/tezos-base-test-helpers.opam
+++ b/opam/tezos-base-test-helpers.opam
@@ -18,7 +18,7 @@ depends: [
   "qcheck-alcotest" { >= "0.20" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-base.opam b/opam/tezos-base.opam
index 475b3c29655de1ca8162a6f2217c9bb1891fde45..f8d67b813f086e6a448ba1be0eb9396ac8423eae 100644
--- a/opam/tezos-base.opam
+++ b/opam/tezos-base.opam
@@ -30,7 +30,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-benchmark-016-PtMumbai.opam b/opam/tezos-benchmark-016-PtMumbai.opam
index e7ad37b58485c67b421258ab9070e6d379ad3cb9..e28836e899df307a642ddcef7554fccb2230aa7e 100644
--- a/opam/tezos-benchmark-016-PtMumbai.opam
+++ b/opam/tezos-benchmark-016-PtMumbai.opam
@@ -24,7 +24,7 @@ depends: [
   "prbnmcn-stats" { = "0.0.6" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-benchmark-017-PtNairob.opam b/opam/tezos-benchmark-017-PtNairob.opam
index 9251bb9f0228f3333499f6435d2315a1b3dc2988..15134b1178f4c3a087224927278a2c4d7ccba3ec 100644
--- a/opam/tezos-benchmark-017-PtNairob.opam
+++ b/opam/tezos-benchmark-017-PtNairob.opam
@@ -24,7 +24,7 @@ depends: [
   "prbnmcn-stats" { = "0.0.6" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-benchmark-alpha.opam b/opam/tezos-benchmark-alpha.opam
index a08635f89551209fb40650dfbcd2b8784cbaa265..74be164c9d3693480e215be8810d13986aa2e6cf 100644
--- a/opam/tezos-benchmark-alpha.opam
+++ b/opam/tezos-benchmark-alpha.opam
@@ -24,7 +24,7 @@ depends: [
   "prbnmcn-stats" { = "0.0.6" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-benchmark-examples.opam b/opam/tezos-benchmark-examples.opam
index 45ede119849c05aaa5ab6f5c056407e85a653f29..b177b136d2f7cb207b88fc2aad8392cf16aff180 100644
--- a/opam/tezos-benchmark-examples.opam
+++ b/opam/tezos-benchmark-examples.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-benchmark"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-benchmark-tests.opam b/opam/tezos-benchmark-tests.opam
index 5791b3cecc63da655d0ebb745ce9e08a21b58b3e..1f3bcbb5f087db00c458a3f40c73ea819e4e424e 100644
--- a/opam/tezos-benchmark-tests.opam
+++ b/opam/tezos-benchmark-tests.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-benchmark-examples" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-benchmark-type-inference-016-PtMumbai.opam b/opam/tezos-benchmark-type-inference-016-PtMumbai.opam
index 7a7ba310d590cf5db682d0deba6f77aff4dda6f0..1f3d1f2a5e66090bb93e98eb7b8609bfa38375a0 100644
--- a/opam/tezos-benchmark-type-inference-016-PtMumbai.opam
+++ b/opam/tezos-benchmark-type-inference-016-PtMumbai.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-client-016-PtMumbai" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-benchmark-type-inference-017-PtNairob.opam b/opam/tezos-benchmark-type-inference-017-PtNairob.opam
index 64bb105fb5944418b1a6da09a83a54f76b99760a..de0e2af54457ee627847d6b49b662a9bfc3000d6 100644
--- a/opam/tezos-benchmark-type-inference-017-PtNairob.opam
+++ b/opam/tezos-benchmark-type-inference-017-PtNairob.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-client-017-PtNairob" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-benchmark-type-inference-alpha.opam b/opam/tezos-benchmark-type-inference-alpha.opam
index d1032c79199909975c8c6082e7edee80d6fadfb8..91f3a7ce416d9f403d4a85b3db55338935279fbc 100644
--- a/opam/tezos-benchmark-type-inference-alpha.opam
+++ b/opam/tezos-benchmark-type-inference-alpha.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-client-alpha" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-benchmark.opam b/opam/tezos-benchmark.opam
index 762dcf209b6d92d007fc6ac3565fd70c378404cb..2c502beae15afb1ba5ae61177b24eae73b0a2d21 100644
--- a/opam/tezos-benchmark.opam
+++ b/opam/tezos-benchmark.opam
@@ -26,7 +26,7 @@ depends: [
   "hashcons"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-benchmarks-proto-016-PtMumbai.opam b/opam/tezos-benchmarks-proto-016-PtMumbai.opam
index 0fdc37e64aeefd17a890e58e67e0086f52497840..26236829dead65583268227614b885126f0291b3 100644
--- a/opam/tezos-benchmarks-proto-016-PtMumbai.opam
+++ b/opam/tezos-benchmarks-proto-016-PtMumbai.opam
@@ -28,7 +28,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-benchmarks-proto-017-PtNairob.opam b/opam/tezos-benchmarks-proto-017-PtNairob.opam
index 40a489793f59f51f4b6666ac56189c4fb8717b21..8ec2f1aa23fa3d68d1d0969a313f63c793419fcb 100644
--- a/opam/tezos-benchmarks-proto-017-PtNairob.opam
+++ b/opam/tezos-benchmarks-proto-017-PtNairob.opam
@@ -28,7 +28,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-benchmarks-proto-alpha.opam b/opam/tezos-benchmarks-proto-alpha.opam
index b514fbd75814e1064953290f84ebe73915ce4e7b..a91e1bd6ba4c01ac7c097e019a4eb17932d358c0 100644
--- a/opam/tezos-benchmarks-proto-alpha.opam
+++ b/opam/tezos-benchmarks-proto-alpha.opam
@@ -28,7 +28,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-clic.opam b/opam/tezos-clic.opam
index fb8da3b0ed057f9285a78f19eff1e409e9454ff4..202054d220f70bda2286d53f9b22afc54eff7300 100644
--- a/opam/tezos-clic.opam
+++ b/opam/tezos-clic.opam
@@ -20,7 +20,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-000-Ps9mPmXa.opam b/opam/tezos-client-000-Ps9mPmXa.opam
index 9e674739be9b9f4408edffb67d69aa470badea2a..b49716b908530e047c69a777b66f61c89ee83a64 100644
--- a/opam/tezos-client-000-Ps9mPmXa.opam
+++ b/opam/tezos-client-000-Ps9mPmXa.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-stdlib-unix"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-001-PtCJ7pwo.opam b/opam/tezos-client-001-PtCJ7pwo.opam
index c2da38a1d0030a7b72903a695c2e8c58286c1011..a9850c3fd7128375469b5c66a3f58748d93c2509 100644
--- a/opam/tezos-client-001-PtCJ7pwo.opam
+++ b/opam/tezos-client-001-PtCJ7pwo.opam
@@ -23,7 +23,7 @@ depends: [
   "tezos-client-commands"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-002-PsYLVpVv.opam b/opam/tezos-client-002-PsYLVpVv.opam
index cd13e5891cc2da63f4a0d8c5821a9dff1470df47..e710cd55badd51ce0eac0241b53590f340b35ee7 100644
--- a/opam/tezos-client-002-PsYLVpVv.opam
+++ b/opam/tezos-client-002-PsYLVpVv.opam
@@ -23,7 +23,7 @@ depends: [
   "tezos-client-commands"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-003-PsddFKi3.opam b/opam/tezos-client-003-PsddFKi3.opam
index 695d86deb350cd957854f12ff788de63903cb30b..84112f033898d5d1a39c8aaf2a8c38520964bccc 100644
--- a/opam/tezos-client-003-PsddFKi3.opam
+++ b/opam/tezos-client-003-PsddFKi3.opam
@@ -23,7 +23,7 @@ depends: [
   "tezos-client-commands"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-004-Pt24m4xi.opam b/opam/tezos-client-004-Pt24m4xi.opam
index eed3ad4aee130e7c100425ec402649132ecdf150..796cc57a3b7253e8df455def29cee93f4438f002 100644
--- a/opam/tezos-client-004-Pt24m4xi.opam
+++ b/opam/tezos-client-004-Pt24m4xi.opam
@@ -23,7 +23,7 @@ depends: [
   "tezos-client-commands"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-005-PsBabyM1.opam b/opam/tezos-client-005-PsBabyM1.opam
index c2ab6573a6478c37ab7926acc5372694c65c7c70..337817d8863c81df7683f87eb8cc5abf03397d85 100644
--- a/opam/tezos-client-005-PsBabyM1.opam
+++ b/opam/tezos-client-005-PsBabyM1.opam
@@ -23,7 +23,7 @@ depends: [
   "tezos-client-commands"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-006-PsCARTHA.opam b/opam/tezos-client-006-PsCARTHA.opam
index 45235fc2d0a42756210997892fdcb54e44c9820d..85db87d45964b7b17db2d8d7fbc0dc126bb149a2 100644
--- a/opam/tezos-client-006-PsCARTHA.opam
+++ b/opam/tezos-client-006-PsCARTHA.opam
@@ -23,7 +23,7 @@ depends: [
   "tezos-client-commands"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-007-PsDELPH1.opam b/opam/tezos-client-007-PsDELPH1.opam
index 7bac04368266dd0f525ed85d9ef48f70f708d2f0..788f09fc84ae1282162ea772c3bd685a61d470cd 100644
--- a/opam/tezos-client-007-PsDELPH1.opam
+++ b/opam/tezos-client-007-PsDELPH1.opam
@@ -24,7 +24,7 @@ depends: [
   "tezos-client-commands"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-008-PtEdo2Zk.opam b/opam/tezos-client-008-PtEdo2Zk.opam
index a585686fb45eee1b1a5f4fedca8237a4ca103535..2e2d48cc6eac6b4f8d760e7d1576d51c88ea9c1d 100644
--- a/opam/tezos-client-008-PtEdo2Zk.opam
+++ b/opam/tezos-client-008-PtEdo2Zk.opam
@@ -24,7 +24,7 @@ depends: [
   "tezos-client-commands"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-009-PsFLoren.opam b/opam/tezos-client-009-PsFLoren.opam
index 0e939920859e6f7b827ee91cfa3774632c34727d..76cdebf5c8a459a17ae1f54163a5da0d63350f43 100644
--- a/opam/tezos-client-009-PsFLoren.opam
+++ b/opam/tezos-client-009-PsFLoren.opam
@@ -26,7 +26,7 @@ depends: [
   "tezos-client-base-unix"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-010-PtGRANAD.opam b/opam/tezos-client-010-PtGRANAD.opam
index 1af66b2cffce6e26ee233a19f1ceb974160315b7..e74186a73c26a274630e796d18430b6914621be9 100644
--- a/opam/tezos-client-010-PtGRANAD.opam
+++ b/opam/tezos-client-010-PtGRANAD.opam
@@ -26,7 +26,7 @@ depends: [
   "tezos-client-base-unix"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-011-PtHangz2.opam b/opam/tezos-client-011-PtHangz2.opam
index 565caf8072a6e16f385e72c98f74b53375b3cbbe..ee95682a9f951775fc9cd4030828102ee5dfaf29 100644
--- a/opam/tezos-client-011-PtHangz2.opam
+++ b/opam/tezos-client-011-PtHangz2.opam
@@ -31,7 +31,7 @@ depends: [
   "tezos-crypto"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-012-Psithaca.opam b/opam/tezos-client-012-Psithaca.opam
index b75b9e70327ebc0391116b174c802d240a4b10be..0464337cc054bfb2c84c22ab052ca0de9a3fc0b5 100644
--- a/opam/tezos-client-012-Psithaca.opam
+++ b/opam/tezos-client-012-Psithaca.opam
@@ -31,7 +31,7 @@ depends: [
   "tezos-crypto"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-013-PtJakart.opam b/opam/tezos-client-013-PtJakart.opam
index bd0d3a9fdf12e79cc961d8fd6be328485b49b35e..9b0527ff28c576f161e6e05592d54d761a82efb1 100644
--- a/opam/tezos-client-013-PtJakart.opam
+++ b/opam/tezos-client-013-PtJakart.opam
@@ -31,7 +31,7 @@ depends: [
   "tezos-crypto"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-014-PtKathma.opam b/opam/tezos-client-014-PtKathma.opam
index c7d092fb9fbf7e480f2c6b6bc01139272887b72b..43293c36d385e0756bb8e77635bd721aa33582fa 100644
--- a/opam/tezos-client-014-PtKathma.opam
+++ b/opam/tezos-client-014-PtKathma.opam
@@ -31,7 +31,7 @@ depends: [
   "tezos-crypto"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-015-PtLimaPt.opam b/opam/tezos-client-015-PtLimaPt.opam
index 980fb4e2755bc59f5d879e22cd3a7db468d2c623..c764c13a5ff7283dced597c820eb0f58ce15ca73 100644
--- a/opam/tezos-client-015-PtLimaPt.opam
+++ b/opam/tezos-client-015-PtLimaPt.opam
@@ -31,7 +31,7 @@ depends: [
   "tezos-crypto"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-016-PtMumbai.opam b/opam/tezos-client-016-PtMumbai.opam
index bcdc209fa226ad61f2364c1bf158b702f7db42b6..fa13febf35d0ca575d4ac4a056cfc60665321ff0 100644
--- a/opam/tezos-client-016-PtMumbai.opam
+++ b/opam/tezos-client-016-PtMumbai.opam
@@ -38,7 +38,7 @@ depends: [
   "qcheck-alcotest" { with-test & >= "0.20" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-017-PtNairob.opam b/opam/tezos-client-017-PtNairob.opam
index 3005825c56f3fb87c6a4236b0d999590ebb190e1..cbbc8b8b53e68549a916ff112c3cb992ba40d69b 100644
--- a/opam/tezos-client-017-PtNairob.opam
+++ b/opam/tezos-client-017-PtNairob.opam
@@ -38,7 +38,7 @@ depends: [
   "qcheck-alcotest" { with-test & >= "0.20" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-alpha.opam b/opam/tezos-client-alpha.opam
index 547eb8b66614d9815cd9470b037baee82b902a7d..0edbcf143f9fc945928d46031a5c6f97107b1e3b 100644
--- a/opam/tezos-client-alpha.opam
+++ b/opam/tezos-client-alpha.opam
@@ -38,7 +38,7 @@ depends: [
   "qcheck-alcotest" { with-test & >= "0.20" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-base-unix.opam b/opam/tezos-client-base-unix.opam
index 891d347e6c638ac2fee96a1ef2dcf885fe04a69f..866f4d2974ce9ef2d2ee49810b311446a10b0af3 100644
--- a/opam/tezos-client-base-unix.opam
+++ b/opam/tezos-client-base-unix.opam
@@ -31,7 +31,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-base.opam b/opam/tezos-client-base.opam
index 3c5da340b0647e5df23df29019535e35a11ed897..a0142e085601be0c7c23da30cf8a5ab7e0af7d1e 100644
--- a/opam/tezos-client-base.opam
+++ b/opam/tezos-client-base.opam
@@ -20,7 +20,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-commands.opam b/opam/tezos-client-commands.opam
index b458c09745b422f37b278b0923696b7f6283ece5..32c141360222098408688c562415d3a55912aff1 100644
--- a/opam/tezos-client-commands.opam
+++ b/opam/tezos-client-commands.opam
@@ -22,7 +22,7 @@ depends: [
   "uri" { >= "3.1.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-demo-counter.opam b/opam/tezos-client-demo-counter.opam
index 952e36b346745bbe17699ffab975968d269bd573..9d2a6c09b15406e98939600aaf764a434ad98799 100644
--- a/opam/tezos-client-demo-counter.opam
+++ b/opam/tezos-client-demo-counter.opam
@@ -17,7 +17,7 @@ depends: [
   "tezos-protocol-demo-counter"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-client-genesis.opam b/opam/tezos-client-genesis.opam
index 923ca9883693d58e1cafffa33059e12deaa77627..edbc26fc82aca9edd12a32cd4b083ae9ee87d556 100644
--- a/opam/tezos-client-genesis.opam
+++ b/opam/tezos-client-genesis.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-stdlib-unix"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-context-ops.opam b/opam/tezos-context-ops.opam
index 262d212ef07f6994bd5db097c90f0dc72bc8c40a..48f73d92f16fc9143cacece5b6e248da0e072363 100644
--- a/opam/tezos-context-ops.opam
+++ b/opam/tezos-context-ops.opam
@@ -17,7 +17,7 @@ depends: [
   "tezos-shell-context"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-context.opam b/opam/tezos-context.opam
index 4e2ab17a0a244bced08f42a5625503f65157efcc..5675aab8b3dfcd073107131629e05b0af34f9965 100644
--- a/opam/tezos-context.opam
+++ b/opam/tezos-context.opam
@@ -27,7 +27,7 @@ conflicts: [
   "checkseum" { = "0.5.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-crypto-dal.opam b/opam/tezos-crypto-dal.opam
index 8f60a186c26de57bc87b604e9677996289021cdc..d05a1fc16fab61800b2b70abd074916e1e227d65 100644
--- a/opam/tezos-crypto-dal.opam
+++ b/opam/tezos-crypto-dal.opam
@@ -22,7 +22,7 @@ depends: [
   "tezos-test-helpers" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-crypto.opam b/opam/tezos-crypto.opam
index b18acc7cbb9eda2cac7eaab836be3b6710bdd8cd..415aca8d2881912589dcc337962b6007b4afddc1 100644
--- a/opam/tezos-crypto.opam
+++ b/opam/tezos-crypto.opam
@@ -29,7 +29,7 @@ depends: [
   "tezos-test-helpers" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-dac-017-PtNairob.opam b/opam/tezos-dac-017-PtNairob.opam
index faac988bb31e5a27dcfd27c8a9becb0ee718539a..9859b863651a4fd93217e3504412a7befcab7005 100644
--- a/opam/tezos-dac-017-PtNairob.opam
+++ b/opam/tezos-dac-017-PtNairob.opam
@@ -26,7 +26,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-dac-alpha.opam b/opam/tezos-dac-alpha.opam
index 5881dfe29b6f17d0cf60d3e297aee5a20726e60f..88462e4ae5df6706b60bd735fe2c805d981aaeff 100644
--- a/opam/tezos-dac-alpha.opam
+++ b/opam/tezos-dac-alpha.opam
@@ -26,7 +26,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-dac-client-lib.opam b/opam/tezos-dac-client-lib.opam
index 7594af17670dcd3214c1941c0b53ff905204153e..ba81d9937b6ad9b60d3389d019d33db588487389 100644
--- a/opam/tezos-dac-client-lib.opam
+++ b/opam/tezos-dac-client-lib.opam
@@ -17,7 +17,7 @@ depends: [
   "tezos-dac-lib"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-dac-lib-test.opam b/opam/tezos-dac-lib-test.opam
index 43e79a866820cc92d8c37b5ba0653c15aefe55d5..cbd3bea79812045428d93c7671daeebac4763941 100644
--- a/opam/tezos-dac-lib-test.opam
+++ b/opam/tezos-dac-lib-test.opam
@@ -20,7 +20,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-dac-lib.opam b/opam/tezos-dac-lib.opam
index 9a4ccb39569a067763410c54d38f6766610c6878..4d8f96964a159a3c150f143affc4d8df6061879e 100644
--- a/opam/tezos-dac-lib.opam
+++ b/opam/tezos-dac-lib.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-protocol-updater"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-dac-node-lib-test.opam b/opam/tezos-dac-node-lib-test.opam
index 71e5c5b068db85edc2b858ef2a71ca0f8cb5e7e5..4258eee43e13e071577fd3b542623bcfc6db7704 100644
--- a/opam/tezos-dac-node-lib-test.opam
+++ b/opam/tezos-dac-node-lib-test.opam
@@ -20,7 +20,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-dac-node-lib.opam b/opam/tezos-dac-node-lib.opam
index 0aa7c1050df06963c6f6e0b8327b2aeee4d20fb5..e592ff93f04f884c8dc7fa24fb392c3509b5eec6 100644
--- a/opam/tezos-dac-node-lib.opam
+++ b/opam/tezos-dac-node-lib.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-dac-client-lib"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-dal-016-PtMumbai.opam b/opam/tezos-dal-016-PtMumbai.opam
index 595346daf66a48f663978549fcb1392410e73bf0..54dcaf6c4a070ebe6171f5eb77514e6465977d24 100644
--- a/opam/tezos-dal-016-PtMumbai.opam
+++ b/opam/tezos-dal-016-PtMumbai.opam
@@ -26,7 +26,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-dal-017-PtNairob.opam b/opam/tezos-dal-017-PtNairob.opam
index a70f0de5fb13a678e738efe15ce1daa3979ffdeb..79ab7ae7204d09c19cb5f4a05aeea1434124b30e 100644
--- a/opam/tezos-dal-017-PtNairob.opam
+++ b/opam/tezos-dal-017-PtNairob.opam
@@ -26,7 +26,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-dal-alpha.opam b/opam/tezos-dal-alpha.opam
index 1e7785e7fc03fe41d860a9b3236410ca34b6a21b..59d4c243ec4c5c1eeb99cd6e94d536ef33a594cc 100644
--- a/opam/tezos-dal-alpha.opam
+++ b/opam/tezos-dal-alpha.opam
@@ -26,7 +26,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-dal-node-lib.opam b/opam/tezos-dal-node-lib.opam
index 9966cd5085d98ae269399a3744e33b5b88f47646..9217fffacca0c4fbbc95afa1eb0086b88f65cb5f 100644
--- a/opam/tezos-dal-node-lib.opam
+++ b/opam/tezos-dal-node-lib.opam
@@ -23,7 +23,7 @@ depends: [
   "tezos-crypto"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-dal-node-services.opam b/opam/tezos-dal-node-services.opam
index e81e44f90c825145f4a709d9c00ad31affd81a4c..b65889ca1af899ff1eb54b0b637f133fb7afdbc1 100644
--- a/opam/tezos-dal-node-services.opam
+++ b/opam/tezos-dal-node-services.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-crypto-dal"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam
index 3a00e07e317e921d21b7672d30d4f004aa89b860..1649a91d3c646586d857e54a771191ef29a03e3e 100644
--- a/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam
+++ b/opam/tezos-embedded-protocol-000-Ps9mPmXa.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam
index aa116496718b46bba51264a1a6369ae371941146..8ed178a429d6f77d5591620a7875edb524f2acfe 100644
--- a/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam
+++ b/opam/tezos-embedded-protocol-001-PtCJ7pwo.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam
index 4a5e513cf906b00fd1dd53b4d0b72d2b7411f52c..78b83b105e3edc28e495cb1be5d55fc39fa80a3c 100644
--- a/opam/tezos-embedded-protocol-002-PsYLVpVv.opam
+++ b/opam/tezos-embedded-protocol-002-PsYLVpVv.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-003-PsddFKi3.opam b/opam/tezos-embedded-protocol-003-PsddFKi3.opam
index 60a126fc7c79603c48ee84260045b266d71ffa43..7ec5fe9a13f5b351adb50a37882ef4d13ed6769d 100644
--- a/opam/tezos-embedded-protocol-003-PsddFKi3.opam
+++ b/opam/tezos-embedded-protocol-003-PsddFKi3.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam
index 24f34239c8fc1c06e6d502795d425e30278ee250..0fc77abdefd2c79b6ceb7dec6aaa77b82b3473fa 100644
--- a/opam/tezos-embedded-protocol-004-Pt24m4xi.opam
+++ b/opam/tezos-embedded-protocol-004-Pt24m4xi.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-005-PsBABY5H.opam b/opam/tezos-embedded-protocol-005-PsBABY5H.opam
index c716326d1d9d0825b8cb1cbc69669ef97a722b64..87633ee732d6da89cb6a22fcfed96986a0477a38 100644
--- a/opam/tezos-embedded-protocol-005-PsBABY5H.opam
+++ b/opam/tezos-embedded-protocol-005-PsBABY5H.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-005-PsBabyM1.opam b/opam/tezos-embedded-protocol-005-PsBabyM1.opam
index 696943c72dca945a43e2493fc2b6451d24131aa1..38814b98cb2fd7906a3cd46f5c7569c4db63b3e3 100644
--- a/opam/tezos-embedded-protocol-005-PsBabyM1.opam
+++ b/opam/tezos-embedded-protocol-005-PsBabyM1.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-006-PsCARTHA.opam b/opam/tezos-embedded-protocol-006-PsCARTHA.opam
index f0f48fcd09c081d76532a7af83f73e074c752f84..c0b21749be747d90e935a0ba949f5733fc79dec0 100644
--- a/opam/tezos-embedded-protocol-006-PsCARTHA.opam
+++ b/opam/tezos-embedded-protocol-006-PsCARTHA.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-007-PsDELPH1.opam b/opam/tezos-embedded-protocol-007-PsDELPH1.opam
index 39a251507b4b2ffec89b3944715bd978cf6964bd..365e6ae15496a9fd623b15b051820322a679d5c4 100644
--- a/opam/tezos-embedded-protocol-007-PsDELPH1.opam
+++ b/opam/tezos-embedded-protocol-007-PsDELPH1.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam
index 55e8aec35df7c6b5982bd2644553de5cd6cfbe40..025862819b6e164c6fdfd51d99fd24fbdb995798 100644
--- a/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam
+++ b/opam/tezos-embedded-protocol-008-PtEdo2Zk.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-008-PtEdoTez.opam b/opam/tezos-embedded-protocol-008-PtEdoTez.opam
index 952e2da53e40e0f98e6042ff3184f81472a77648..0113da93ff8c78c8c78a956b36e5da75c1215071 100644
--- a/opam/tezos-embedded-protocol-008-PtEdoTez.opam
+++ b/opam/tezos-embedded-protocol-008-PtEdoTez.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-009-PsFLoren.opam b/opam/tezos-embedded-protocol-009-PsFLoren.opam
index 410c358a4c8d399eb83f8cf455ce7b2ee8cadcba..0921ea850d6bc678210910b5d0eed775cb0d2b88 100644
--- a/opam/tezos-embedded-protocol-009-PsFLoren.opam
+++ b/opam/tezos-embedded-protocol-009-PsFLoren.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-010-PtGRANAD.opam b/opam/tezos-embedded-protocol-010-PtGRANAD.opam
index 4885258e4aab82d1377a8db0ddeda77d1301472e..f4f2cb8655cad8fa42ad81dde2b51b6a6853a8d1 100644
--- a/opam/tezos-embedded-protocol-010-PtGRANAD.opam
+++ b/opam/tezos-embedded-protocol-010-PtGRANAD.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-011-PtHangz2.opam b/opam/tezos-embedded-protocol-011-PtHangz2.opam
index d5999d7e01e44ef4f534de60e158864289eb134c..c42db712afb24be8fcae4ea78c5b05f202921cdf 100644
--- a/opam/tezos-embedded-protocol-011-PtHangz2.opam
+++ b/opam/tezos-embedded-protocol-011-PtHangz2.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-012-Psithaca.opam b/opam/tezos-embedded-protocol-012-Psithaca.opam
index f11dde9815888a4a68fbe1255e0a1ffd80ae2af1..86b6e8a1492ffef034bad1f7bbedce6efe562ba8 100644
--- a/opam/tezos-embedded-protocol-012-Psithaca.opam
+++ b/opam/tezos-embedded-protocol-012-Psithaca.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-013-PtJakart.opam b/opam/tezos-embedded-protocol-013-PtJakart.opam
index f8d307315c89b01640a5025c1e3aa2f697809ada..1073048fb63328d9dc007d1cbe8dd24a48dff1ab 100644
--- a/opam/tezos-embedded-protocol-013-PtJakart.opam
+++ b/opam/tezos-embedded-protocol-013-PtJakart.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-014-PtKathma.opam b/opam/tezos-embedded-protocol-014-PtKathma.opam
index 6190f85022af35d2f5e2eceda950a5b1e439ef16..212b279f442aacb9db606dbabb6a12493dff6bf2 100644
--- a/opam/tezos-embedded-protocol-014-PtKathma.opam
+++ b/opam/tezos-embedded-protocol-014-PtKathma.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-015-PtLimaPt.opam b/opam/tezos-embedded-protocol-015-PtLimaPt.opam
index 18ab93075a01fcca7251b022640667bc9b9956dc..b3138f154fe31b7a60d9537f17ae5e633fb3e4ff 100644
--- a/opam/tezos-embedded-protocol-015-PtLimaPt.opam
+++ b/opam/tezos-embedded-protocol-015-PtLimaPt.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-016-PtMumbai.opam b/opam/tezos-embedded-protocol-016-PtMumbai.opam
index 5fc45431268116928602ed8a24a8329538ac4f48..18f4669f077e8dfa52e8bf1a8253a13c6d846f22 100644
--- a/opam/tezos-embedded-protocol-016-PtMumbai.opam
+++ b/opam/tezos-embedded-protocol-016-PtMumbai.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-017-PtNairob.opam b/opam/tezos-embedded-protocol-017-PtNairob.opam
index c7eae26069c12a1e66d854b4c7db3d4cd227d3c5..eae5b0864d4a032c22b59a6f8843f7caa1b4aa34 100644
--- a/opam/tezos-embedded-protocol-017-PtNairob.opam
+++ b/opam/tezos-embedded-protocol-017-PtNairob.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-alpha.opam b/opam/tezos-embedded-protocol-alpha.opam
index 5660489100b2abaa292fe355407c78b4a1a403ec..7ec701a4c104a1da8c6ef71f03106937ebd2f57b 100644
--- a/opam/tezos-embedded-protocol-alpha.opam
+++ b/opam/tezos-embedded-protocol-alpha.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-demo-counter.opam b/opam/tezos-embedded-protocol-demo-counter.opam
index bddeefde6683c641dbf50cfcea69c36014f8b3cc..55758942e39e5ea77904b5d773c8730a048d5160 100644
--- a/opam/tezos-embedded-protocol-demo-counter.opam
+++ b/opam/tezos-embedded-protocol-demo-counter.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-demo-noops.opam b/opam/tezos-embedded-protocol-demo-noops.opam
index 67dcea23964675492b4585b1988305213b8ae79e..8d5e0e2ce7d024a8c7fbd3e0fff65c035103af8d 100644
--- a/opam/tezos-embedded-protocol-demo-noops.opam
+++ b/opam/tezos-embedded-protocol-demo-noops.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-embedded-protocol-genesis.opam b/opam/tezos-embedded-protocol-genesis.opam
index 872c3725af35e84515199ea4ae8f1f2e13ec7a63..6d389d190e196bbe39feab3e069807875e1be0eb 100644
--- a/opam/tezos-embedded-protocol-genesis.opam
+++ b/opam/tezos-embedded-protocol-genesis.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-error-monad.opam b/opam/tezos-error-monad.opam
index bd2d13e4c11e556371dc231e77e1a555f9b57657..f8c1d230067cbbc7651880153a0b3d95fb6dbd80 100644
--- a/opam/tezos-error-monad.opam
+++ b/opam/tezos-error-monad.opam
@@ -22,7 +22,7 @@ conflicts: [
   "result" { < "1.5" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-event-logging-test-helpers.opam b/opam/tezos-event-logging-test-helpers.opam
index da842a3c3272142866160fca609631c65e788595..9f01ecdd7fcc3712b84319236a4a170ef649d2a1 100644
--- a/opam/tezos-event-logging-test-helpers.opam
+++ b/opam/tezos-event-logging-test-helpers.opam
@@ -19,7 +19,7 @@ depends: [
   "octez-alcotezt"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-event-logging.opam b/opam/tezos-event-logging.opam
index 2e55d3f300e0a0c5e2eecb890ba8ceaa58b66dc6..bef7e4c2f679cc69a1938cdd8aa255f34c8e96df 100644
--- a/opam/tezos-event-logging.opam
+++ b/opam/tezos-event-logging.opam
@@ -18,7 +18,7 @@ depends: [
   "uri" { >= "3.1.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-expect-helper.opam b/opam/tezos-expect-helper.opam
index ec5502d38e2dc8259f5b1fcf8cfa6206abd7262e..fb30ea0ddbe4050f65bcd02b3d794275390dc0e0 100644
--- a/opam/tezos-expect-helper.opam
+++ b/opam/tezos-expect-helper.opam
@@ -13,7 +13,7 @@ depends: [
   "ppx_expect"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-gossipsub-test.opam b/opam/tezos-gossipsub-test.opam
index b065137c9999ece8e438765e4938924b1c173452..9abf3426c7f956b0f6b0cca81155b31a783719b6 100644
--- a/opam/tezos-gossipsub-test.opam
+++ b/opam/tezos-gossipsub-test.opam
@@ -18,7 +18,7 @@ depends: [
   "tezos-test-helpers" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-gossipsub.opam b/opam/tezos-gossipsub.opam
index 3c83019aefbf0d479af367c05876c0d133f09d17..4c6e03da474f4a5b80726a0502bd4a8b20e07fb4 100644
--- a/opam/tezos-gossipsub.opam
+++ b/opam/tezos-gossipsub.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-version"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-hacl.opam b/opam/tezos-hacl.opam
index 3650934659435dad8a36a616da6102622b1565c9..9333274fd7f094cdfd2c32527bd26d48006a6373 100644
--- a/opam/tezos-hacl.opam
+++ b/opam/tezos-hacl.opam
@@ -30,7 +30,7 @@ conflicts: [
   "hacl_x25519"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-layer2-store.opam b/opam/tezos-layer2-store.opam
index d1f880b5386aaf0bf01c0c3219278e9d8d467b81..d5d7a7ed156c79b5d3fe6de07a20408d64cfe2fc 100644
--- a/opam/tezos-layer2-store.opam
+++ b/opam/tezos-layer2-store.opam
@@ -26,7 +26,7 @@ conflicts: [
   "checkseum" { = "0.5.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-layer2-utils-016-PtMumbai.opam b/opam/tezos-layer2-utils-016-PtMumbai.opam
index 75976a5d6284dcd4a91b4f5d7eba15404175b03d..ad89d5a09e337c00b3c680f3c26c382c04794894 100644
--- a/opam/tezos-layer2-utils-016-PtMumbai.opam
+++ b/opam/tezos-layer2-utils-016-PtMumbai.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-client-016-PtMumbai"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-layer2-utils-017-PtNairob.opam b/opam/tezos-layer2-utils-017-PtNairob.opam
index b4cfd6669bf4f6791ac967c599a4a69a1598a2d2..1aeba5ea800b5884d85e4f93dc9f8505513390f3 100644
--- a/opam/tezos-layer2-utils-017-PtNairob.opam
+++ b/opam/tezos-layer2-utils-017-PtNairob.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-client-017-PtNairob"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-layer2-utils-alpha.opam b/opam/tezos-layer2-utils-alpha.opam
index faaf4f43e59db5c5dabe62c6f2e26fdea7469715..94c965c1f597d419656c00782e2590d566762d86 100644
--- a/opam/tezos-layer2-utils-alpha.opam
+++ b/opam/tezos-layer2-utils-alpha.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-client-alpha"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-lazy-containers-tests.opam b/opam/tezos-lazy-containers-tests.opam
index eb2f132ea37bc84d7cc0df5b362f4e752234b798..94b5cea77a3898667123db7f53b1be6c3fd31d54 100644
--- a/opam/tezos-lazy-containers-tests.opam
+++ b/opam/tezos-lazy-containers-tests.opam
@@ -18,7 +18,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-lazy-containers.opam b/opam/tezos-lazy-containers.opam
index b66074b996a4785f8506ad9ca719c4ad52a5bbbd..a1085c7c4763e93ac4db72abe08f8f099648f04b 100644
--- a/opam/tezos-lazy-containers.opam
+++ b/opam/tezos-lazy-containers.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-tree-encoding"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-lwt-result-stdlib.opam b/opam/tezos-lwt-result-stdlib.opam
index c4cbaa485b1c404c8f698cfbac3d7089d91603e4..3a4b1ec3e772e3e5976078d2891fe6cd21f42c30 100644
--- a/opam/tezos-lwt-result-stdlib.opam
+++ b/opam/tezos-lwt-result-stdlib.opam
@@ -18,7 +18,7 @@ depends: [
   "tezos-test-helpers" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] { with-test & arch != "arm32" & arch != "x86_32" }
 ]
diff --git a/opam/tezos-micheline-rewriting.opam b/opam/tezos-micheline-rewriting.opam
index 0fc2f0f9d3d31b1f47ce0437f94393c211aa0d87..b3fb108c368c73a6eaedfee430f2074c0505be94 100644
--- a/opam/tezos-micheline-rewriting.opam
+++ b/opam/tezos-micheline-rewriting.opam
@@ -21,7 +21,7 @@ depends: [
   "tezos-client-alpha" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-micheline.opam b/opam/tezos-micheline.opam
index 5b5358c94f1d2af9613e479c41b2c585dc90c8e8..4989139cbfd7b0a157be433de30d8f70505fa851 100644
--- a/opam/tezos-micheline.opam
+++ b/opam/tezos-micheline.opam
@@ -19,7 +19,7 @@ depends: [
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-mockup-commands.opam b/opam/tezos-mockup-commands.opam
index 8ed94dfa9cf8b89d709e539406ce3a84fdb0cf04..e66b354ec97661e593d70a79d6549fc58e8bdb94 100644
--- a/opam/tezos-mockup-commands.opam
+++ b/opam/tezos-mockup-commands.opam
@@ -18,7 +18,7 @@ depends: [
   "tezos-mockup-registration"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-mockup-proxy.opam b/opam/tezos-mockup-proxy.opam
index d0984756cf08839d799f2488a1a3aad53f996966..56c16273dcb0dba4eec86dcce54d719c3b900f28 100644
--- a/opam/tezos-mockup-proxy.opam
+++ b/opam/tezos-mockup-proxy.opam
@@ -20,7 +20,7 @@ depends: [
   "uri" { >= "3.1.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-mockup-registration.opam b/opam/tezos-mockup-registration.opam
index 7cbb231880d2ef6f74c364ac7877288a0636722f..344ef6a5de816116e1510cb2d9ead6b35afd2849 100644
--- a/opam/tezos-mockup-registration.opam
+++ b/opam/tezos-mockup-registration.opam
@@ -17,7 +17,7 @@ depends: [
   "uri" { >= "3.1.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-mockup.opam b/opam/tezos-mockup.opam
index aafa484a0df48961e4a400e6ea973809e8970754..7abb77e81e79f4f261a92f837a962c24eeba3529 100644
--- a/opam/tezos-mockup.opam
+++ b/opam/tezos-mockup.opam
@@ -29,7 +29,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-openapi.opam b/opam/tezos-openapi.opam
index 844b879a754bce0c2061f3f6b2b6a39a9301ea1a..df682555378ec19755fad2678ac989977d6eee6b 100644
--- a/opam/tezos-openapi.opam
+++ b/opam/tezos-openapi.opam
@@ -15,7 +15,7 @@ depends: [
   "tezt" { >= "3.1.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-p2p-services.opam b/opam/tezos-p2p-services.opam
index b76c9ec83aea650b14b06125ead04cc75413a70d..920a4de49cbd3a4b744e78f8bca28bcedcfb53f8 100644
--- a/opam/tezos-p2p-services.opam
+++ b/opam/tezos-p2p-services.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-rpc"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-p2p.opam b/opam/tezos-p2p.opam
index 636d526a8b9a73bc8c9073a98402d7fed529d8a3..559b406c7ebf84684a15d7d5162cfebe4db65e52 100644
--- a/opam/tezos-p2p.opam
+++ b/opam/tezos-p2p.opam
@@ -29,7 +29,7 @@ depends: [
   "tezt" { with-test & >= "3.1.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-000-Ps9mPmXa.opam b/opam/tezos-protocol-000-Ps9mPmXa.opam
index 8aa26d264c07ce09f898e685566bd98007e6ce64..699f3b6edcf913ffca9d8dc099dba53d817f3915 100644
--- a/opam/tezos-protocol-000-Ps9mPmXa.opam
+++ b/opam/tezos-protocol-000-Ps9mPmXa.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-001-PtCJ7pwo.opam b/opam/tezos-protocol-001-PtCJ7pwo.opam
index 3b542c27f0619c322d253f6feeebac077679a477..8114ad316ef1b2963a58729239234094380f8b7a 100644
--- a/opam/tezos-protocol-001-PtCJ7pwo.opam
+++ b/opam/tezos-protocol-001-PtCJ7pwo.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-002-PsYLVpVv.opam b/opam/tezos-protocol-002-PsYLVpVv.opam
index acff93255f3664ddc221b371c38cf5208c374426..fd42129068dd9a5654d04e09cac97b8f17d297b1 100644
--- a/opam/tezos-protocol-002-PsYLVpVv.opam
+++ b/opam/tezos-protocol-002-PsYLVpVv.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-003-PsddFKi3.opam b/opam/tezos-protocol-003-PsddFKi3.opam
index 453ad0cdfe3fc84cf29542fad395452cda01e3b6..9192c8ed3e337dc02c4fa0a6974667de39579184 100644
--- a/opam/tezos-protocol-003-PsddFKi3.opam
+++ b/opam/tezos-protocol-003-PsddFKi3.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-004-Pt24m4xi.opam b/opam/tezos-protocol-004-Pt24m4xi.opam
index e3b7e5ce7fa917de0769694bd4e56f2448efc106..2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908 100644
--- a/opam/tezos-protocol-004-Pt24m4xi.opam
+++ b/opam/tezos-protocol-004-Pt24m4xi.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-005-PsBABY5H.opam b/opam/tezos-protocol-005-PsBABY5H.opam
index e3b7e5ce7fa917de0769694bd4e56f2448efc106..2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908 100644
--- a/opam/tezos-protocol-005-PsBABY5H.opam
+++ b/opam/tezos-protocol-005-PsBABY5H.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-005-PsBabyM1.opam b/opam/tezos-protocol-005-PsBabyM1.opam
index e3b7e5ce7fa917de0769694bd4e56f2448efc106..2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908 100644
--- a/opam/tezos-protocol-005-PsBabyM1.opam
+++ b/opam/tezos-protocol-005-PsBabyM1.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-006-PsCARTHA.opam b/opam/tezos-protocol-006-PsCARTHA.opam
index e3b7e5ce7fa917de0769694bd4e56f2448efc106..2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908 100644
--- a/opam/tezos-protocol-006-PsCARTHA.opam
+++ b/opam/tezos-protocol-006-PsCARTHA.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-007-PsDELPH1.opam b/opam/tezos-protocol-007-PsDELPH1.opam
index e3b7e5ce7fa917de0769694bd4e56f2448efc106..2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908 100644
--- a/opam/tezos-protocol-007-PsDELPH1.opam
+++ b/opam/tezos-protocol-007-PsDELPH1.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-008-PtEdo2Zk.opam b/opam/tezos-protocol-008-PtEdo2Zk.opam
index e3b7e5ce7fa917de0769694bd4e56f2448efc106..2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908 100644
--- a/opam/tezos-protocol-008-PtEdo2Zk.opam
+++ b/opam/tezos-protocol-008-PtEdo2Zk.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-008-PtEdoTez.opam b/opam/tezos-protocol-008-PtEdoTez.opam
index e3b7e5ce7fa917de0769694bd4e56f2448efc106..2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908 100644
--- a/opam/tezos-protocol-008-PtEdoTez.opam
+++ b/opam/tezos-protocol-008-PtEdoTez.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-009-PsFLoren.opam b/opam/tezos-protocol-009-PsFLoren.opam
index e3b7e5ce7fa917de0769694bd4e56f2448efc106..2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908 100644
--- a/opam/tezos-protocol-009-PsFLoren.opam
+++ b/opam/tezos-protocol-009-PsFLoren.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-010-PtGRANAD.opam b/opam/tezos-protocol-010-PtGRANAD.opam
index e3b7e5ce7fa917de0769694bd4e56f2448efc106..2fbea512e3b256c2e0ba6b0d1ec7d7c09dd71908 100644
--- a/opam/tezos-protocol-010-PtGRANAD.opam
+++ b/opam/tezos-protocol-010-PtGRANAD.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-011-PtHangz2.opam b/opam/tezos-protocol-011-PtHangz2.opam
index 59f5b6b0b44a3111c893650c10085c1b73e3bd25..dad3f88b62989ad150ff1fea571979d6093ca8dc 100644
--- a/opam/tezos-protocol-011-PtHangz2.opam
+++ b/opam/tezos-protocol-011-PtHangz2.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-base"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-012-Psithaca.opam b/opam/tezos-protocol-012-Psithaca.opam
index 59f5b6b0b44a3111c893650c10085c1b73e3bd25..dad3f88b62989ad150ff1fea571979d6093ca8dc 100644
--- a/opam/tezos-protocol-012-Psithaca.opam
+++ b/opam/tezos-protocol-012-Psithaca.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-base"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-013-PtJakart.opam b/opam/tezos-protocol-013-PtJakart.opam
index 59f5b6b0b44a3111c893650c10085c1b73e3bd25..dad3f88b62989ad150ff1fea571979d6093ca8dc 100644
--- a/opam/tezos-protocol-013-PtJakart.opam
+++ b/opam/tezos-protocol-013-PtJakart.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-base"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-014-PtKathma.opam b/opam/tezos-protocol-014-PtKathma.opam
index 59f5b6b0b44a3111c893650c10085c1b73e3bd25..dad3f88b62989ad150ff1fea571979d6093ca8dc 100644
--- a/opam/tezos-protocol-014-PtKathma.opam
+++ b/opam/tezos-protocol-014-PtKathma.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-base"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-015-PtLimaPt.opam b/opam/tezos-protocol-015-PtLimaPt.opam
index 59f5b6b0b44a3111c893650c10085c1b73e3bd25..dad3f88b62989ad150ff1fea571979d6093ca8dc 100644
--- a/opam/tezos-protocol-015-PtLimaPt.opam
+++ b/opam/tezos-protocol-015-PtLimaPt.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-base"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-016-PtMumbai-tests.opam b/opam/tezos-protocol-016-PtMumbai-tests.opam
index 51e055e80dfe0b21f5a7666e88f43f1adebd1b94..3b1b83ecbf01198e48110b1c48b019cc87ec5ea4 100644
--- a/opam/tezos-protocol-016-PtMumbai-tests.opam
+++ b/opam/tezos-protocol-016-PtMumbai-tests.opam
@@ -37,7 +37,7 @@ depends: [
   "tezos-webassembly-interpreter-extra" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-016-PtMumbai.opam b/opam/tezos-protocol-016-PtMumbai.opam
index 59f5b6b0b44a3111c893650c10085c1b73e3bd25..dad3f88b62989ad150ff1fea571979d6093ca8dc 100644
--- a/opam/tezos-protocol-016-PtMumbai.opam
+++ b/opam/tezos-protocol-016-PtMumbai.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-base"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-017-PtNairob-tests.opam b/opam/tezos-protocol-017-PtNairob-tests.opam
index 24e6dc306f5374ddfb876dd89bd1a36149f21fda..50a68e2f73ca7a1979154a76f6336c4a82602d46 100644
--- a/opam/tezos-protocol-017-PtNairob-tests.opam
+++ b/opam/tezos-protocol-017-PtNairob-tests.opam
@@ -37,7 +37,7 @@ depends: [
   "tezos-webassembly-interpreter-extra" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-017-PtNairob.opam b/opam/tezos-protocol-017-PtNairob.opam
index 59f5b6b0b44a3111c893650c10085c1b73e3bd25..dad3f88b62989ad150ff1fea571979d6093ca8dc 100644
--- a/opam/tezos-protocol-017-PtNairob.opam
+++ b/opam/tezos-protocol-017-PtNairob.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-base"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam
index 187c709e7090a89690f09e318ece3c79eb8423a8..a5d8c47ec3edafd78e9d96d26c267a39c773d890 100644
--- a/opam/tezos-protocol-alpha-tests.opam
+++ b/opam/tezos-protocol-alpha-tests.opam
@@ -37,7 +37,7 @@ depends: [
   "tezos-webassembly-interpreter-extra" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-alpha.opam b/opam/tezos-protocol-alpha.opam
index 59f5b6b0b44a3111c893650c10085c1b73e3bd25..dad3f88b62989ad150ff1fea571979d6093ca8dc 100644
--- a/opam/tezos-protocol-alpha.opam
+++ b/opam/tezos-protocol-alpha.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-base"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-demo-counter.opam b/opam/tezos-protocol-demo-counter.opam
index 216bca84a51e2b12564693f48daa0d57c7d9e523..cc0f3243e4bde10020120dbafd4aecef3dd48eac 100644
--- a/opam/tezos-protocol-demo-counter.opam
+++ b/opam/tezos-protocol-demo-counter.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-demo-noops.opam b/opam/tezos-protocol-demo-noops.opam
index 98f4cb83c0e6179d32710db8076dcbf59f31435b..24bedd0b68ec4da81a32fb82471adf8578ed375d 100644
--- a/opam/tezos-protocol-demo-noops.opam
+++ b/opam/tezos-protocol-demo-noops.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-environment.opam b/opam/tezos-protocol-environment.opam
index 311f64d40928d7f4217eee117667ab239009048a..1c15846a38c517226910055a92ad2e105f0b9e43 100644
--- a/opam/tezos-protocol-environment.opam
+++ b/opam/tezos-protocol-environment.opam
@@ -35,7 +35,7 @@ depends: [
   "lwt" { with-test & >= "5.6.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-genesis.opam b/opam/tezos-protocol-genesis.opam
index 471d077a4401ad8c892534feb6447a9dcfa06a53..006ac7f3d69a7470b19bdc32b828cbfb62286aff 100644
--- a/opam/tezos-protocol-genesis.opam
+++ b/opam/tezos-protocol-genesis.opam
@@ -13,7 +13,7 @@ depends: [
   "tezos-protocol-environment"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam b/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam
index bc9f4679581ea9cf1fee82daacb3953abf112b09..d169583ab899636c743a8d69442b48454d4aa839 100644
--- a/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam
+++ b/opam/tezos-protocol-plugin-007-PsDELPH1-registerer.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-shell"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-007-PsDELPH1.opam b/opam/tezos-protocol-plugin-007-PsDELPH1.opam
index aa2d166adfb0fbe71a9cf544e132365687519413..3bcf7df73d1624e16a0fe2511292585b356bcad5 100644
--- a/opam/tezos-protocol-plugin-007-PsDELPH1.opam
+++ b/opam/tezos-protocol-plugin-007-PsDELPH1.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-protocol-007-PsDELPH1"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam b/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam
index 7ee87971a122c8b9cfd26f7da6e3087fdf0b0b0a..32d999ca4333e7d52b576fbd0205bff24db19ff0 100644
--- a/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam
+++ b/opam/tezos-protocol-plugin-008-PtEdo2Zk-registerer.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-shell"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam b/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam
index 3f1f885c8cb61222af48ecda8974c4d70d15c04a..4b9127994b07428b65c902c616ea6063e4bb4787 100644
--- a/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam
+++ b/opam/tezos-protocol-plugin-008-PtEdo2Zk.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-protocol-008-PtEdo2Zk"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam b/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam
index a1e464f3b37d305f763b0e5ad9d75d63fa698ff7..8fd16668fdb39ece8f1fe15aca5342b9a067e63f 100644
--- a/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam
+++ b/opam/tezos-protocol-plugin-009-PsFLoren-registerer.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-shell"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-009-PsFLoren.opam b/opam/tezos-protocol-plugin-009-PsFLoren.opam
index 2d961620d7ec97274afe9404fa64113cb952826e..de4a53f5af0262fa7a445aac9e8f43609d1913e8 100644
--- a/opam/tezos-protocol-plugin-009-PsFLoren.opam
+++ b/opam/tezos-protocol-plugin-009-PsFLoren.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-protocol-009-PsFLoren"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam b/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam
index e645a364d57730debe4f2c5f9a1bf59f19e81404..19144e5d737be854ae4ad050fb262b53097ac43c 100644
--- a/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam
+++ b/opam/tezos-protocol-plugin-010-PtGRANAD-registerer.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-shell"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-010-PtGRANAD.opam b/opam/tezos-protocol-plugin-010-PtGRANAD.opam
index f6aea474fa4bff087a0097ebee7f72f065738b97..e9f86acf78fcf5434cbe6313bc83def8ee5f3996 100644
--- a/opam/tezos-protocol-plugin-010-PtGRANAD.opam
+++ b/opam/tezos-protocol-plugin-010-PtGRANAD.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-protocol-010-PtGRANAD"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam b/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam
index f85f268c8aa7c0f3838c640e2aac8f6712951c4b..77cf70178849f164e40bbb001176ea8f1882479d 100644
--- a/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam
+++ b/opam/tezos-protocol-plugin-011-PtHangz2-registerer.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-shell"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-011-PtHangz2.opam b/opam/tezos-protocol-plugin-011-PtHangz2.opam
index 0f54b801f657a7d9df25ea677e6484bdc0859ac1..35f1320fede5de09ed1842109b163a2702f4f18c 100644
--- a/opam/tezos-protocol-plugin-011-PtHangz2.opam
+++ b/opam/tezos-protocol-plugin-011-PtHangz2.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-protocol-011-PtHangz2"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam b/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam
index 6ec7e8eeb7a6cdc841151137e590d95532c1097c..00449b0d0ef065cb5a1e21427478f40737dc8d26 100644
--- a/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam
+++ b/opam/tezos-protocol-plugin-012-Psithaca-registerer.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-shell"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-012-Psithaca.opam b/opam/tezos-protocol-plugin-012-Psithaca.opam
index 96633daf4e546ad09b0063bdbe89c5dc012dd1b1..a74200e5f9b0be7f62668654de19bcac739b7a56 100644
--- a/opam/tezos-protocol-plugin-012-Psithaca.opam
+++ b/opam/tezos-protocol-plugin-012-Psithaca.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-protocol-012-Psithaca"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam b/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam
index 3f540cad2b628afba1c1827fa5eb9a0486ca261e..059cb99c0033d1487139638a3c43a7dd99f79bf3 100644
--- a/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam
+++ b/opam/tezos-protocol-plugin-013-PtJakart-registerer.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-shell"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-013-PtJakart.opam b/opam/tezos-protocol-plugin-013-PtJakart.opam
index 46b01004894502311638e2429b602bf7ac3ba598..88c8c936dd3764359037ab733a0ae18b029b9a23 100644
--- a/opam/tezos-protocol-plugin-013-PtJakart.opam
+++ b/opam/tezos-protocol-plugin-013-PtJakart.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-protocol-013-PtJakart"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam b/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam
index 831c43727c934c3d0cafceb4ea8b7b7ad8005d3b..e024598ced02d72548ac29e0b797c3f5ed336744 100644
--- a/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam
+++ b/opam/tezos-protocol-plugin-014-PtKathma-registerer.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-shell"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-014-PtKathma.opam b/opam/tezos-protocol-plugin-014-PtKathma.opam
index 8b9422f98388cccba288359486feee738c10f990..4edaa354d44facd82077dac814b0cc3981a24c7b 100644
--- a/opam/tezos-protocol-plugin-014-PtKathma.opam
+++ b/opam/tezos-protocol-plugin-014-PtKathma.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-protocol-014-PtKathma"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam b/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam
index 69d259bf47d5edf4477768b4bd8bbb7905997867..f5f416327402dc389f6e190079825b95d624f2e7 100644
--- a/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam
+++ b/opam/tezos-protocol-plugin-015-PtLimaPt-registerer.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-shell"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-015-PtLimaPt.opam b/opam/tezos-protocol-plugin-015-PtLimaPt.opam
index 852774bf464cc990b7cee409a901bc18fa5401d3..df66087ca891b923080369dd532af2079cca78ee 100644
--- a/opam/tezos-protocol-plugin-015-PtLimaPt.opam
+++ b/opam/tezos-protocol-plugin-015-PtLimaPt.opam
@@ -14,7 +14,7 @@ depends: [
   "tezos-protocol-015-PtLimaPt"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam b/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam
index f283e4ac00cb73cf45a98976f7754ecc1a681803..956e772a0c31f97baeaaeabb86e49a6fc421d6e4 100644
--- a/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam
+++ b/opam/tezos-protocol-plugin-016-PtMumbai-registerer.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-shell"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam b/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam
index 08253de819e1c38fba08b4c693ed032af5b53e2d..a7e8bcd2d917634d0120a692411244da1dd6cdf1 100644
--- a/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam
+++ b/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam
@@ -23,7 +23,7 @@ depends: [
   "tezos-016-PtMumbai-test-helpers" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-016-PtMumbai.opam b/opam/tezos-protocol-plugin-016-PtMumbai.opam
index f7f614dad98c6290708f2d58b447f135ddd28076..453f3b0c66369923cb4255af6f9d894b448f36d4 100644
--- a/opam/tezos-protocol-plugin-016-PtMumbai.opam
+++ b/opam/tezos-protocol-plugin-016-PtMumbai.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-smart-rollup-016-PtMumbai"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam b/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam
index f11ab3a39974fbd2a2159eade6da2b3295daf246..33e5a1f4094d3c42a9b7dfa53b5976fcfa9e9dfc 100644
--- a/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam
+++ b/opam/tezos-protocol-plugin-017-PtNairob-registerer.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-shell"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-017-PtNairob-tests.opam b/opam/tezos-protocol-plugin-017-PtNairob-tests.opam
index 3422ca9a0473347e8f7b6084a15b204b3a2b43ca..5f31ffa263466405fa961163b45861ea42c53b02 100644
--- a/opam/tezos-protocol-plugin-017-PtNairob-tests.opam
+++ b/opam/tezos-protocol-plugin-017-PtNairob-tests.opam
@@ -23,7 +23,7 @@ depends: [
   "tezos-017-PtNairob-test-helpers" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-017-PtNairob.opam b/opam/tezos-protocol-plugin-017-PtNairob.opam
index a7f6ff100afee81ca051be0117986d8eb7c1863c..ffa7d9a05d94cddc0dacd96efcca24cebb27fe9c 100644
--- a/opam/tezos-protocol-plugin-017-PtNairob.opam
+++ b/opam/tezos-protocol-plugin-017-PtNairob.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-smart-rollup-017-PtNairob"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-alpha-registerer.opam b/opam/tezos-protocol-plugin-alpha-registerer.opam
index ec51b5b1d9c6ac52f7d2d8a684c4230a9bac97dd..fb72a67c293474f28f8e2a60871daccd3e9bc3f4 100644
--- a/opam/tezos-protocol-plugin-alpha-registerer.opam
+++ b/opam/tezos-protocol-plugin-alpha-registerer.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-shell"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-alpha-tests.opam b/opam/tezos-protocol-plugin-alpha-tests.opam
index b63b2cc5e8fc5f28e9b7ffb3e44c083ca67a9049..b9b12cefccb7a3ec3f3ae2bfbd1cbd767d2889a9 100644
--- a/opam/tezos-protocol-plugin-alpha-tests.opam
+++ b/opam/tezos-protocol-plugin-alpha-tests.opam
@@ -23,7 +23,7 @@ depends: [
   "tezos-alpha-test-helpers" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-plugin-alpha.opam b/opam/tezos-protocol-plugin-alpha.opam
index 750701e9cc2a1544df8fb5a6ea984e22fe55b76d..8dc984f7784547543dd9b5082c336b60fb7c210e 100644
--- a/opam/tezos-protocol-plugin-alpha.opam
+++ b/opam/tezos-protocol-plugin-alpha.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-smart-rollup-alpha"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-protocol-updater.opam b/opam/tezos-protocol-updater.opam
index 17c8c44185627679775fcc5b1f5f627c1016da0d..af9e00ef0823ed01eb265a30a07fca1ec3abdb1a 100644
--- a/opam/tezos-protocol-updater.opam
+++ b/opam/tezos-protocol-updater.opam
@@ -21,7 +21,7 @@ depends: [
   "lwt-exit"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-proxy-server-config.opam b/opam/tezos-proxy-server-config.opam
index 632a24230157ed33cd399334b73fee7f2b96d26d..88761493bf3077fe3f27cc9d298c71a19d01e22b 100644
--- a/opam/tezos-proxy-server-config.opam
+++ b/opam/tezos-proxy-server-config.opam
@@ -19,7 +19,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-proxy.opam b/opam/tezos-proxy.opam
index 339d6550ff7a52cf626ece2d4dcbebede0c8bacf..fbfb8065781e0c0b7d4d79918e1aecd53702afaa 100644
--- a/opam/tezos-proxy.opam
+++ b/opam/tezos-proxy.opam
@@ -31,7 +31,7 @@ depends: [
   "qcheck-alcotest" { with-test & >= "0.20" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-requester.opam b/opam/tezos-requester.opam
index 93411c7ac107fddf3ac732f6608340af4f522f09..821312322c9814244de7acf723c68ff205b9968f 100644
--- a/opam/tezos-requester.opam
+++ b/opam/tezos-requester.opam
@@ -21,7 +21,7 @@ depends: [
   "qcheck-alcotest" { with-test & >= "0.20" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-rpc-http-client-unix.opam b/opam/tezos-rpc-http-client-unix.opam
index f4999936af6169ccba40f38cf3fdd51e7bcad2a7..f70597e9e8aaddb96af0c9aaf9e0fa6755163f92 100644
--- a/opam/tezos-rpc-http-client-unix.opam
+++ b/opam/tezos-rpc-http-client-unix.opam
@@ -18,7 +18,7 @@ depends: [
   "tezos-rpc-http-client"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-rpc-http-client.opam b/opam/tezos-rpc-http-client.opam
index cae42a15bb39d5ac5f22061ce9ef97dd9e83fbb3..09c8baa0528aa77fda8523edd6b749207e036e3d 100644
--- a/opam/tezos-rpc-http-client.opam
+++ b/opam/tezos-rpc-http-client.opam
@@ -16,7 +16,7 @@ depends: [
   "tezos-rpc-http"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-rpc-http-server.opam b/opam/tezos-rpc-http-server.opam
index 9a08bf0f2a28a4a53008bbfdfb38a772516e58db..d7e34f70990f538fc3dff6ec4efc606f796c35e9 100644
--- a/opam/tezos-rpc-http-server.opam
+++ b/opam/tezos-rpc-http-server.opam
@@ -24,7 +24,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-rpc-http.opam b/opam/tezos-rpc-http.opam
index fcf4611d0c495be72b464843ecb580bdc0321fe1..af07f2b21fa9daef8ab6e4e86b74858ced940fb8 100644
--- a/opam/tezos-rpc-http.opam
+++ b/opam/tezos-rpc-http.opam
@@ -16,7 +16,7 @@ depends: [
   "uri" { >= "3.1.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-rpc.opam b/opam/tezos-rpc.opam
index 512baf702eca8b959c81282c716ce91c688d9d4f..4864e6a8dae003caff6b895b70a8b11387bba07b 100644
--- a/opam/tezos-rpc.opam
+++ b/opam/tezos-rpc.opam
@@ -17,7 +17,7 @@ depends: [
   "uri" { >= "3.1.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-sapling.opam b/opam/tezos-sapling.opam
index ff47dde48c1c13095125afad7b7dfdd9cf759cee..08ab04ed437aac34c7f706f0e618e041a41896a9 100644
--- a/opam/tezos-sapling.opam
+++ b/opam/tezos-sapling.opam
@@ -31,5 +31,5 @@ depends: [
 x-opam-monorepo-opam-provided: [
   "tezos-rust-libs"
 ]
-build: [["rm" "-r" "vendors"] ["dune" "build" "-p" name "-j" jobs]]
+build: [["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs]]
 synopsis: "OCaml library for the Sapling protocol, using librustzcash"
diff --git a/opam/tezos-sc-rollup-node-test.opam b/opam/tezos-sc-rollup-node-test.opam
index 36772d19d9c451ca02f2fcd0ce5e288f806c1772..4e5d1fe918c7bc6b3866d60c9cda45f6e6bc5043 100644
--- a/opam/tezos-sc-rollup-node-test.opam
+++ b/opam/tezos-sc-rollup-node-test.opam
@@ -31,7 +31,7 @@ depends: [
   "tezt" { with-test & >= "3.1.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-scoru-wasm-durable-snapshot.opam b/opam/tezos-scoru-wasm-durable-snapshot.opam
index b51cafdfcff4beb6acbf42a9a8c3c80e1708c8e2..83c2fcca1c2f42557d6734a10aac254705d758d4 100644
--- a/opam/tezos-scoru-wasm-durable-snapshot.opam
+++ b/opam/tezos-scoru-wasm-durable-snapshot.opam
@@ -17,7 +17,7 @@ depends: [
   "tezos-webassembly-interpreter-extra"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-scoru-wasm-fast-test.opam b/opam/tezos-scoru-wasm-fast-test.opam
index 7f622e5172a3c3e9445b93ac671cf6cbc8ecb1a1..dc9162793e2ed9518136cde9dc7f17f97af4e6ea 100644
--- a/opam/tezos-scoru-wasm-fast-test.opam
+++ b/opam/tezos-scoru-wasm-fast-test.opam
@@ -26,7 +26,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-scoru-wasm-fast.opam b/opam/tezos-scoru-wasm-fast.opam
index d626ee3b7b439aebacb0c6bad8d3fe87dbf4eae9..aa11d05296f6fd51ff61bfeb26a633d8491e552c 100644
--- a/opam/tezos-scoru-wasm-fast.opam
+++ b/opam/tezos-scoru-wasm-fast.opam
@@ -18,7 +18,7 @@ depends: [
   "tezos-wasmer"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-scoru-wasm-helpers.opam b/opam/tezos-scoru-wasm-helpers.opam
index f5dc13238b589dda1db96a9f148facbdf8a3f6fa..2379f2f64bcad1df212a0dbbbad084594228c290 100644
--- a/opam/tezos-scoru-wasm-helpers.opam
+++ b/opam/tezos-scoru-wasm-helpers.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-webassembly-interpreter-extra"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-scoru-wasm-regressions.opam b/opam/tezos-scoru-wasm-regressions.opam
index 62d2fb754245d37be92c3b950b7826ec9f54493c..1e94f850eef1d414d8be82c789c4d910ce93caca 100644
--- a/opam/tezos-scoru-wasm-regressions.opam
+++ b/opam/tezos-scoru-wasm-regressions.opam
@@ -20,7 +20,7 @@ depends: [
   "tezt" { >= "3.1.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-scoru-wasm-test-helpers.opam b/opam/tezos-scoru-wasm-test-helpers.opam
index 5b06e2fd1155949dbcd1209fd7f3f79e8f3d20de..8594717ba6dd632fe6643aef932a2d835894288e 100644
--- a/opam/tezos-scoru-wasm-test-helpers.opam
+++ b/opam/tezos-scoru-wasm-test-helpers.opam
@@ -26,7 +26,7 @@ depends: [
   "tezos-webassembly-interpreter-extra"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-scoru-wasm-test.opam b/opam/tezos-scoru-wasm-test.opam
index b9890eeda8f39231ffe9b8aca051ff4ac14585c0..0d690aa1543b098a5f8e4b37d2a68a0e82e10dd5 100644
--- a/opam/tezos-scoru-wasm-test.opam
+++ b/opam/tezos-scoru-wasm-test.opam
@@ -26,7 +26,7 @@ depends: [
   "tezos-webassembly-interpreter-extra" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-scoru-wasm.opam b/opam/tezos-scoru-wasm.opam
index de5b5b93640c46e5b1832d2aa0c0ee272bb3e337..e21ef5d798221345a71628525afcb659a1536aaf 100644
--- a/opam/tezos-scoru-wasm.opam
+++ b/opam/tezos-scoru-wasm.opam
@@ -19,7 +19,7 @@ depends: [
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-shell-benchmarks.opam b/opam/tezos-shell-benchmarks.opam
index 6d258ca0076d281759f8e98b0f41ae9fa6fe77b8..3310334a4e7d0c32c2c3ffad25bbe21868b89fef 100644
--- a/opam/tezos-shell-benchmarks.opam
+++ b/opam/tezos-shell-benchmarks.opam
@@ -20,7 +20,7 @@ depends: [
   "tezos-micheline"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-shell-context-test.opam b/opam/tezos-shell-context-test.opam
index 176b296bf6f13d84c1412f60756ecd7554e4f37e..b6dbca1be34a78efbfdf50f868284a1b6f17b298 100644
--- a/opam/tezos-shell-context-test.opam
+++ b/opam/tezos-shell-context-test.opam
@@ -18,7 +18,7 @@ depends: [
   "tezos-protocol-environment" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-shell-context.opam b/opam/tezos-shell-context.opam
index ade5012e5110cdab2cc0c61732a42fb3f7fcf46a..4e5d1eb76f17a516735f63cb1111540dcd25aa0e 100644
--- a/opam/tezos-shell-context.opam
+++ b/opam/tezos-shell-context.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-context"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-shell-services.opam b/opam/tezos-shell-services.opam
index 2ac6b9093867da8a3861008ad012af40ca2ed8cb..c6c727e4a7e9811e097d08d4647d1bb95246086a 100644
--- a/opam/tezos-shell-services.opam
+++ b/opam/tezos-shell-services.opam
@@ -19,7 +19,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-shell.opam b/opam/tezos-shell.opam
index 3d72479b0808f920282286cdc94f672fe1471fcb..ef3af1b615456531c4ebb352010de62cb16d9fa8 100644
--- a/opam/tezos-shell.opam
+++ b/opam/tezos-shell.opam
@@ -39,7 +39,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-signer-backends.opam b/opam/tezos-signer-backends.opam
index 5944f94b4f373b128b1ba127793b898504d79a8e..533eb72a36504e6971358b7290b04b5a4a4626a9 100644
--- a/opam/tezos-signer-backends.opam
+++ b/opam/tezos-signer-backends.opam
@@ -35,7 +35,7 @@ conflicts: [
   "ledgerwallet-tezos" { < "0.3.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-signer-services.opam b/opam/tezos-signer-services.opam
index ff688997b9d413cc74a130b8f846367da59cc86a..bd149321c4c4ea80bf986a847ddbee7ac47f3e42 100644
--- a/opam/tezos-signer-services.opam
+++ b/opam/tezos-signer-services.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-client-base"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-smart-rollup-016-PtMumbai.opam b/opam/tezos-smart-rollup-016-PtMumbai.opam
index 18eb0ec2b809523ac439cc0ea5ea677eeaba30a2..4fbfc652a0a3338ce0a0411cba5c9de8d7e303e7 100644
--- a/opam/tezos-smart-rollup-016-PtMumbai.opam
+++ b/opam/tezos-smart-rollup-016-PtMumbai.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-016-PtMumbai"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-smart-rollup-017-PtNairob.opam b/opam/tezos-smart-rollup-017-PtNairob.opam
index af95e83291e61292ffbf914e231afc71c8b5148c..28b4ef502e3308f93954853f31bfebfe0f1f7681 100644
--- a/opam/tezos-smart-rollup-017-PtNairob.opam
+++ b/opam/tezos-smart-rollup-017-PtNairob.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-017-PtNairob"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-smart-rollup-alpha.opam b/opam/tezos-smart-rollup-alpha.opam
index 46d3f7f80f1a24257ee64aabb97bdbc7b47231c7..325e9d2912982c322e26dd2e00a06fe80c60bfe5 100644
--- a/opam/tezos-smart-rollup-alpha.opam
+++ b/opam/tezos-smart-rollup-alpha.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-protocol-alpha"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam b/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam
index 18bc6cb044123c3d829be40d68b45419b3c926f1..fa0f735a04f3dbf0debabfb32449486b60bc1426 100644
--- a/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam
+++ b/opam/tezos-smart-rollup-layer2-016-PtMumbai.opam
@@ -16,7 +16,7 @@ depends: [
   "octez-injector"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-smart-rollup-layer2-017-PtNairob.opam b/opam/tezos-smart-rollup-layer2-017-PtNairob.opam
index 05c9055763634f230af5f4de01f596d78cada461..89154c63e3dbcbfb5cdc8584813bc65d0e172311 100644
--- a/opam/tezos-smart-rollup-layer2-017-PtNairob.opam
+++ b/opam/tezos-smart-rollup-layer2-017-PtNairob.opam
@@ -16,7 +16,7 @@ depends: [
   "octez-injector"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-smart-rollup-layer2-alpha.opam b/opam/tezos-smart-rollup-layer2-alpha.opam
index 5e0b7af27672eb10714f495bd7ac9896a4ff0b3f..3559d0eccb36375a45f02542a02ceba80195a2f5 100644
--- a/opam/tezos-smart-rollup-layer2-alpha.opam
+++ b/opam/tezos-smart-rollup-layer2-alpha.opam
@@ -16,7 +16,7 @@ depends: [
   "octez-injector"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-stdlib-unix.opam b/opam/tezos-stdlib-unix.opam
index eb487cc77d4896523ef56fcab967780614a5e4e8..2f23851017525e3b578079a9d37e20286f98a38b 100644
--- a/opam/tezos-stdlib-unix.opam
+++ b/opam/tezos-stdlib-unix.opam
@@ -33,7 +33,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-stdlib.opam b/opam/tezos-stdlib.opam
index 3183c9a298c3dd66ac09da74f92dd3f865ec22ef..2a47b7462360f4377be065eed2ffb30bf619908c 100644
--- a/opam/tezos-stdlib.opam
+++ b/opam/tezos-stdlib.opam
@@ -24,7 +24,7 @@ depends: [
   "lwt_log" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-store.opam b/opam/tezos-store.opam
index 3c344f3951379df60d8a6f57ba15316181d535b9..1b5c742b6d82544bb7ad6aa5919dc7f58eb8d81e 100644
--- a/opam/tezos-store.opam
+++ b/opam/tezos-store.opam
@@ -45,7 +45,7 @@ conflicts: [
   "checkseum" { = "0.5.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-test-helpers.opam b/opam/tezos-test-helpers.opam
index 2d53ec60b91c93e00bd4a0f007b66e371ea04390..c1a744e598245a8307864f88e4172b7bcaf06305 100644
--- a/opam/tezos-test-helpers.opam
+++ b/opam/tezos-test-helpers.opam
@@ -18,7 +18,7 @@ depends: [
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-tooling.opam b/opam/tezos-tooling.opam
index 5a9ed3cf4a628d535cb64c3e80b4bd1ee69c7d84..0e91c2b5c7a80aafd8a3c6e45b294a9d0a6002d7 100644
--- a/opam/tezos-tooling.opam
+++ b/opam/tezos-tooling.opam
@@ -16,7 +16,7 @@ depends: [
   "base-unix"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-tps-evaluation.opam b/opam/tezos-tps-evaluation.opam
index 015a2029903fb1fa0eb4ae8692ee825ae64a3281..e589074ca5d8bbbb72f07b5c38a16cc29b980fd6 100644
--- a/opam/tezos-tps-evaluation.opam
+++ b/opam/tezos-tps-evaluation.opam
@@ -26,7 +26,7 @@ depends: [
   "uri" { >= "3.1.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-tree-encoding-test.opam b/opam/tezos-tree-encoding-test.opam
index e17249b597d900c614e571f96a426acfd9961e60..b99ca5ee9004cc71612513f9dd898c07f2935bd1 100644
--- a/opam/tezos-tree-encoding-test.opam
+++ b/opam/tezos-tree-encoding-test.opam
@@ -21,7 +21,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-tree-encoding.opam b/opam/tezos-tree-encoding.opam
index 1aa2abadb938bced6ed1b28830ff7e382311eb9e..1186a0a0f346703f20f10a34fb3fbb4227a0b6ba 100644
--- a/opam/tezos-tree-encoding.opam
+++ b/opam/tezos-tree-encoding.opam
@@ -16,7 +16,7 @@ depends: [
   "data-encoding" { >= "0.7.1" & < "1.0.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-validation.opam b/opam/tezos-validation.opam
index 201bcc3e50ba76aa58b4aac01c4e1e2ab46b3d13..e17dc8fa521efaa6175fc97493c22d976518146f 100644
--- a/opam/tezos-validation.opam
+++ b/opam/tezos-validation.opam
@@ -21,7 +21,7 @@ depends: [
   "tezos-stdlib-unix"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-version.opam b/opam/tezos-version.opam
index 0e3e8768f909c0b66bb2bd977017e40849a83e77..d3a5416f373b9eda5f76b6fa8a66132dcaf46d29 100644
--- a/opam/tezos-version.opam
+++ b/opam/tezos-version.opam
@@ -17,7 +17,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-wasmer.opam b/opam/tezos-wasmer.opam
index 86cbcdf84e9aed0be6cb1565602bde4a39645e30..9b26d71505435499feb232e3847fe1b65a7c08fa 100644
--- a/opam/tezos-wasmer.opam
+++ b/opam/tezos-wasmer.opam
@@ -20,7 +20,7 @@ x-opam-monorepo-opam-provided: [
   "tezos-rust-libs"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-webassembly-interpreter-extra.opam b/opam/tezos-webassembly-interpreter-extra.opam
index 0f5bbc01b0a6ee0ebb8946893ff2f2265c5c789a..9ae6c07d75db6b07a704ececd17945b15a4dd0f3 100644
--- a/opam/tezos-webassembly-interpreter-extra.opam
+++ b/opam/tezos-webassembly-interpreter-extra.opam
@@ -15,7 +15,7 @@ depends: [
   "tezos-lazy-containers"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-webassembly-interpreter.opam b/opam/tezos-webassembly-interpreter.opam
index 85e0d0068ab198405b533407d74567764fe15796..db72ab867180b83dbd0e098edfe454d309fa20fb 100644
--- a/opam/tezos-webassembly-interpreter.opam
+++ b/opam/tezos-webassembly-interpreter.opam
@@ -20,7 +20,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezos-workers.opam b/opam/tezos-workers.opam
index 77bf229a2615bd773bbd82ad81ff29f1425c1a5d..8875e3874e7d917cf08e146c528ea4f80bf7f94b 100644
--- a/opam/tezos-workers.opam
+++ b/opam/tezos-workers.opam
@@ -19,7 +19,7 @@ depends: [
   "octez-alcotezt" {with-test}
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezt-ethereum.opam b/opam/tezt-ethereum.opam
index 20380aa50c5ab39c299fed6d537e02b747a6ef09..131e39c0cc966f6ca65a65a6bd05c09158dd23cc 100644
--- a/opam/tezt-ethereum.opam
+++ b/opam/tezt-ethereum.opam
@@ -14,7 +14,7 @@ depends: [
   "tezt-performance-regression"
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezt-performance-regression.opam b/opam/tezt-performance-regression.opam
index 52afbb5ecb5def6621aa0fef10415fa6c260dcdf..0493321d688bbf343fa2f3159e09e80510d3c5be 100644
--- a/opam/tezt-performance-regression.opam
+++ b/opam/tezt-performance-regression.opam
@@ -15,7 +15,7 @@ depends: [
   "cohttp-lwt-unix" { >= "4.0.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
diff --git a/opam/tezt-tezos.opam b/opam/tezt-tezos.opam
index ff74f320683e693f812f19eedf0722ae2028dbc6..3f6fe07f7384b5788ddcaab5c2ab090431d3b822 100644
--- a/opam/tezt-tezos.opam
+++ b/opam/tezt-tezos.opam
@@ -19,7 +19,7 @@ depends: [
   "cohttp-lwt-unix" { >= "4.0.0" }
 ]
 build: [
-  ["rm" "-r" "vendors"]
+  ["rm" "-r" "vendors" "contrib"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]