diff --git a/src/bin_client/tezos-client.opam b/src/bin_client/tezos-client.opam
index 071642c1c..ab4055f99 100644
--- a/src/bin_client/tezos-client.opam
+++ b/src/bin_client/tezos-client.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-base"
   "tezos-client-base"
   "tezos-client-genesis"
diff --git a/src/bin_node/tezos-node.opam b/src/bin_node/tezos-node.opam
index 7d5229f62..5168786c4 100644
--- a/src/bin_node/tezos-node.opam
+++ b/src/bin_node/tezos-node.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-base"
   "tezos-rpc-http"
   "tezos-p2p"
diff --git a/src/lib_base/tezos-base.opam b/src/lib_base/tezos-base.opam
index f1869338c..ec1e989e6 100644
--- a/src/lib_base/tezos-base.opam
+++ b/src/lib_base/tezos-base.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-stdlib"
   "tezos-stdlib-lwt"
   "tezos-crypto"
diff --git a/src/lib_client_base/tezos-client-base.opam b/src/lib_client_base/tezos-client-base.opam
index 7417b7d12..2330dfa1d 100644
--- a/src/lib_client_base/tezos-client-base.opam
+++ b/src/lib_client_base/tezos-client-base.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-base"
   "tezos-shell-services"
   "tezos-storage"
diff --git a/src/lib_crypto/tezos-crypto.opam b/src/lib_crypto/tezos-crypto.opam
index a8e24836f..8de36b77f 100644
--- a/src/lib_crypto/tezos-crypto.opam
+++ b/src/lib_crypto/tezos-crypto.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-test-helpers" { test }
   "tezos-stdlib"
   "tezos-stdlib-lwt"
diff --git a/src/lib_data_encoding/tezos-data-encoding.opam b/src/lib_data_encoding/tezos-data-encoding.opam
index f530d2189..19b02ad79 100644
--- a/src/lib_data_encoding/tezos-data-encoding.opam
+++ b/src/lib_data_encoding/tezos-data-encoding.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-test-helpers" { test }
   "tezos-stdlib"
   "ocplib-json-typed"
diff --git a/src/lib_error_monad/tezos-error-monad.opam b/src/lib_error_monad/tezos-error-monad.opam
index 5092caea1..b3b98aa2e 100644
--- a/src/lib_error_monad/tezos-error-monad.opam
+++ b/src/lib_error_monad/tezos-error-monad.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-stdlib"
   "tezos-data-encoding"
   "lwt"
diff --git a/src/lib_micheline/tezos-micheline.opam b/src/lib_micheline/tezos-micheline.opam
index fabcc2047..cfc8d7f51 100644
--- a/src/lib_micheline/tezos-micheline.opam
+++ b/src/lib_micheline/tezos-micheline.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-data-encoding"
   "tezos-error-monad"
   "uutf"
diff --git a/src/lib_p2p/tezos-p2p.opam b/src/lib_p2p/tezos-p2p.opam
index 33ab6191f..333a9ceed 100644
--- a/src/lib_p2p/tezos-p2p.opam
+++ b/src/lib_p2p/tezos-p2p.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-test-helpers" { test }
   "tezos-base"
 ]
diff --git a/src/lib_protocol_compiler/tezos-protocol-compiler.opam b/src/lib_protocol_compiler/tezos-protocol-compiler.opam
index 9ec8c1ac2..c7d2a762f 100644
--- a/src/lib_protocol_compiler/tezos-protocol-compiler.opam
+++ b/src/lib_protocol_compiler/tezos-protocol-compiler.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "base-unix"
   "tezos-base"
   "tezos-protocol-environment-sigs"
diff --git a/src/lib_protocol_environment_client/tezos-protocol-environment-client.opam b/src/lib_protocol_environment_client/tezos-protocol-environment-client.opam
index e7da705c3..90cda43d6 100644
--- a/src/lib_protocol_environment_client/tezos-protocol-environment-client.opam
+++ b/src/lib_protocol_environment_client/tezos-protocol-environment-client.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-base"
   "tezos-micheline"
   "tezos-protocol-environment-sigs"
diff --git a/src/lib_protocol_environment_sigs/tezos-protocol-environment-sigs.opam b/src/lib_protocol_environment_sigs/tezos-protocol-environment-sigs.opam
index 774a9b33a..e3f1747a5 100644
--- a/src/lib_protocol_environment_sigs/tezos-protocol-environment-sigs.opam
+++ b/src/lib_protocol_environment_sigs/tezos-protocol-environment-sigs.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-stdlib" { test }
 ]
 build: [
diff --git a/src/lib_protocol_updater/tezos-protocol-updater.opam b/src/lib_protocol_updater/tezos-protocol-updater.opam
index 9a4a54471..0a38ec1c3 100644
--- a/src/lib_protocol_updater/tezos-protocol-updater.opam
+++ b/src/lib_protocol_updater/tezos-protocol-updater.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-base"
   "tezos-micheline"
   "tezos-protocol-compiler"
diff --git a/src/lib_rpc/tezos-rpc.opam b/src/lib_rpc/tezos-rpc.opam
index 8f7b34e13..5bb0c45e8 100644
--- a/src/lib_rpc/tezos-rpc.opam
+++ b/src/lib_rpc/tezos-rpc.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-error-monad"
   "tezos-data-encoding"
   "ocplib-resto"
diff --git a/src/lib_rpc_http/tezos-rpc-http.opam b/src/lib_rpc_http/tezos-rpc-http.opam
index de173f4f6..6a97163e2 100644
--- a/src/lib_rpc_http/tezos-rpc-http.opam
+++ b/src/lib_rpc_http/tezos-rpc-http.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-base"
   "ocplib-resto-directory"
   "ocplib-resto-cohttp"
diff --git a/src/lib_shell/tezos-shell.opam b/src/lib_shell/tezos-shell.opam
index ec5274000..23ad69919 100644
--- a/src/lib_shell/tezos-shell.opam
+++ b/src/lib_shell/tezos-shell.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-test-helpers" { test }
   "tezos-base"
   "tezos-rpc-http"
diff --git a/src/lib_shell_services/tezos-shell-services.opam b/src/lib_shell_services/tezos-shell-services.opam
index 428d8be2e..4e0fa68f7 100644
--- a/src/lib_shell_services/tezos-shell-services.opam
+++ b/src/lib_shell_services/tezos-shell-services.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-base"
 ]
 build: [
diff --git a/src/lib_stdlib/tezos-stdlib.opam b/src/lib_stdlib/tezos-stdlib.opam
index 021375fb9..bbc66a167 100644
--- a/src/lib_stdlib/tezos-stdlib.opam
+++ b/src/lib_stdlib/tezos-stdlib.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-test-helpers" { test }
   "cstruct"
   "hex"
diff --git a/src/lib_stdlib_lwt/tezos-stdlib-lwt.opam b/src/lib_stdlib_lwt/tezos-stdlib-lwt.opam
index 65a804589..911ac0610 100644
--- a/src/lib_stdlib_lwt/tezos-stdlib-lwt.opam
+++ b/src/lib_stdlib_lwt/tezos-stdlib-lwt.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-test-helpers" { test }
   "tezos-stdlib"
   "tezos-data-encoding"
diff --git a/src/lib_storage/tezos-storage.opam b/src/lib_storage/tezos-storage.opam
index ad9105c6a..72b588103 100644
--- a/src/lib_storage/tezos-storage.opam
+++ b/src/lib_storage/tezos-storage.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-test-helpers" { test }
   "tezos-base"
   "leveldb"
diff --git a/src/lib_test_helpers/tezos-test-helpers.opam b/src/lib_test_helpers/tezos-test-helpers.opam
index 516d1a141..1c7ad5453 100644
--- a/src/lib_test_helpers/tezos-test-helpers.opam
+++ b/src/lib_test_helpers/tezos-test-helpers.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "lwt"
   "kaputt"
 ]
diff --git a/src/proto_alpha/lib_client/tezos-client-alpha.opam b/src/proto_alpha/lib_client/tezos-client-alpha.opam
index 70bcbde1a..ebca98df3 100644
--- a/src/proto_alpha/lib_client/tezos-client-alpha.opam
+++ b/src/proto_alpha/lib_client/tezos-client-alpha.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-test-helpers" { test }
   "tezos-base"
   "tezos-protocol-environment-client"
diff --git a/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam b/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam
index 976a4d926..1ae7678b5 100644
--- a/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam
+++ b/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-base"
   "tezos-protocol-compiler"
   "tezos-protocol-updater"
diff --git a/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam b/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam
index d3bb810ca..f6b1e1471 100644
--- a/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam
+++ b/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-base"
   "tezos-protocol-compiler"
   "tezos-test-helpers" { test }
diff --git a/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam b/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam
index 063ade9b7..927232980 100644
--- a/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam
+++ b/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-protocol-compiler"
   "tezos-protocol-updater"
 ]
diff --git a/src/proto_demo/lib_protocol/tezos-protocol-demo.opam b/src/proto_demo/lib_protocol/tezos-protocol-demo.opam
index c64513cb5..0efc8a233 100644
--- a/src/proto_demo/lib_protocol/tezos-protocol-demo.opam
+++ b/src/proto_demo/lib_protocol/tezos-protocol-demo.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-protocol-compiler"
 ]
 build: [
diff --git a/src/proto_genesis/lib_client/tezos-client-genesis.opam b/src/proto_genesis/lib_client/tezos-client-genesis.opam
index 986709c9e..4d1b5d3de 100644
--- a/src/proto_genesis/lib_client/tezos-client-genesis.opam
+++ b/src/proto_genesis/lib_client/tezos-client-genesis.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-base"
   "tezos-shell-services"
   "tezos-client-base"
diff --git a/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam b/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam
index d6e34aede..8398a3b77 100644
--- a/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam
+++ b/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-protocol-compiler"
   "tezos-protocol-updater"
 ]
diff --git a/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam b/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam
index dd69d9488..d944c3d57 100644
--- a/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam
+++ b/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam
@@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
 license: "unreleased"
 depends: [
   "ocamlfind" { build }
-  "jbuilder" { build & >= "1.0+beta15" }
+  "jbuilder" { build & >= "1.0+beta17" }
   "tezos-protocol-compiler"
 ]
 build: [