diff --git a/dune b/dune
index 93eb9c2f267924a0df4ff5cea8310ea8ce77e717..9fc8d64ca131d65f3b4ef82ee8dac2858433c7c1 100644
--- a/dune
+++ b/dune
@@ -17,3 +17,13 @@
 ;;  70 [missing-mli]
  (_
   (binaries (%{workspace_root}/src/tooling/node_wrapper.exe as node))))
+
+; This file is included in the link_flags stanza of binaries for which
+; we want a static build.
+; If the current dune profile is "static", it contains the flag
+; telling the compiler to compile static executables.
+; Else it contains no flags.
+(rule
+ (target static-link-flags.sexp)
+ (action (with-stdout-to %{target}
+  (system "[ '%{profile}' = 'static' ] && echo '(-ccopt -static)' || echo '()'"))))
diff --git a/manifest/manifest.ml b/manifest/manifest.ml
index 393b4e8d428d6232254f87efccee5c10932853d9..47eab1d6fcd7b52698c94f0cc017da3db6c7ff09 100644
--- a/manifest/manifest.ml
+++ b/manifest/manifest.ml
@@ -256,8 +256,8 @@ module Dune = struct
           | None -> E
           | Some flags -> S "js_of_ocaml" :: flags);
           opt library_flags (fun x -> [S "library_flags"; x]);
-          opt link_flags (fun x -> [S "link_flags"; x]);
-          opt flags (fun x -> [S "flags"; x]);
+          opt link_flags (fun l -> [V (of_list (List.cons (S "link_flags") l))]);
+          opt flags (fun l -> [V (of_list (List.cons (S "flags") l))]);
           (if not wrapped then [S "wrapped"; S "false"] else E);
           opt modules (fun x -> S "modules" :: x);
           opt modules_without_implementation (fun x ->
@@ -917,7 +917,6 @@ module Target = struct
     opam_only_deps : t list;
     release : bool;
     static : bool;
-    static_cclibs : string list;
     synopsis : string option;
     description : string option;
     wrapped : bool;
@@ -1065,7 +1064,6 @@ module Target = struct
     ?opam_only_deps:t option list ->
     ?release:bool ->
     ?static:bool ->
-    ?static_cclibs:string list ->
     ?synopsis:string ->
     ?description:string ->
     ?time_measurement_ppx:bool ->
@@ -1117,9 +1115,9 @@ module Target = struct
       ?(modules_without_implementation = []) ?(npm_deps = []) ?ocaml ?opam
       ?(opam_with_test = Always) ?(opens = []) ?(preprocess = [])
       ?(preprocessor_deps = []) ?(private_modules = []) ?(opam_only_deps = [])
-      ?release ?static ?static_cclibs ?synopsis ?description
-      ?(time_measurement_ppx = false) ?(wrapped = true) ?(cram = false) ?license
-      ?(extra_authors = []) ~path names =
+      ?release ?static ?synopsis ?description ?(time_measurement_ppx = false)
+      ?(wrapped = true) ?(cram = false) ?license ?(extra_authors = []) ~path
+      names =
     let conflicts = List.filter_map Fun.id conflicts in
     let deps = List.filter_map Fun.id deps in
     let opam_only_deps = List.filter_map Fun.id opam_only_deps in
@@ -1261,15 +1259,11 @@ module Target = struct
       | None -> ( match kind with Public_executable _ -> true | _ -> false)
     in
     let static =
-      match static with
-      | Some static -> static
-      | None -> (
-          match static_cclibs with
-          | Some _ -> true
-          | None -> (
-              match kind with Public_executable _ -> true | _ -> false))
+      match (static, kind) with
+      | Some static, _ -> static
+      | None, Public_executable _ -> true
+      | None, _ -> false
     in
-    let static_cclibs = Option.value static_cclibs ~default:[] in
     let modules =
       match (modules, all_modules_except) with
       | None, None -> All
@@ -1360,7 +1354,6 @@ module Target = struct
         opam_only_deps;
         release;
         static;
-        static_cclibs;
         synopsis;
         description;
         npm_deps;
@@ -1651,7 +1644,7 @@ let write filename f =
   generated_files := String_set.add filename !generated_files ;
   write_raw filename f
 
-let generate_dune ~dune_file_has_static_profile (internal : Target.internal) =
+let generate_dune (internal : Target.internal) =
   let libraries, empty_files_to_create =
     let empty_files_to_create = ref [] in
     let rec get_library (dep : Target.t) =
@@ -1707,35 +1700,34 @@ let generate_dune ~dune_file_has_static_profile (internal : Target.internal) =
     else None
   in
   let link_flags =
-    if internal.linkall && not is_lib then
-      Some Dune.[S ":standard"; S "-linkall"]
-    else None
+    let linkall = internal.linkall && not is_lib in
+    let static =
+      if internal.static then
+        Some Dune.[S ":include"; S "%{workspace_root}/static-link-flags.sexp"]
+      else None
+    in
+    match (linkall, static) with
+    | false, None -> None
+    | true, None -> Some [Dune.[S ":standard"; S "-linkall"]]
+    | false, Some static -> Some [[S ":standard"]; static]
+    | true, Some static -> Some [[S ":standard"; S "-linkall"]; static]
   in
   let open_flags : Dune.s_expr list =
     internal.opens |> List.map (fun m -> Dune.(H [S "-open"; S m]))
   in
-  let minus_flags : Dune.s_expr =
-    if dune_file_has_static_profile && not internal.static then
-      (* Disable static compilation for this particular target
-         (the static profile is global for the dune file).
-         This must be at the end of the flag list. *)
-      Dune.(H [S "\\"; S "-ccopt"; S "-static"])
-    else Dune.E
-  in
   let flags =
-    match (internal.flags, minus_flags, open_flags) with
-    | None, Dune.E, [] -> None
-    | flags, _, _ ->
+    match (internal.flags, open_flags) with
+    | None, [] -> None
+    | flags, _ ->
         let flags =
           match flags with None -> Flags.standard () | Some flags -> flags
         in
         let flags =
-          match (flags.standard, minus_flags) with
-          | false, _ -> flags.rest
-          | true, E -> Dune.[S ":standard"] :: flags.rest
-          | true, minus_flags -> Dune.[S ":standard"; minus_flags] :: flags.rest
+          match flags.standard with
+          | false -> flags.rest
+          | true -> Dune.[S ":standard"] :: flags.rest
         in
-        Some Dune.(V [V (of_list flags); V (of_list open_flags)])
+        Some (flags @ open_flags)
   in
 
   let preprocess =
@@ -1862,23 +1854,6 @@ let generate_dune ~dune_file_has_static_profile (internal : Target.internal) =
       ?js_of_ocaml:internal.js_of_ocaml
     :: documentation :: create_empty_files :: internal.dune)
 
-let static_profile (cclibs : string list) =
-  Env.add
-    (Profile "static")
-    ~key:"flags"
-    Dune.
-      [
-        S ":standard";
-        G [S "-ccopt"; S "-static"];
-        (match cclibs with
-        | [] -> E
-        | _ :: _ ->
-            let arg =
-              List.map (fun lib -> "-l" ^ lib) cclibs |> String.concat " "
-            in
-            G [S "-cclib"; S arg]);
-      ]
-
 (* Remove duplicates from a list.
    Items that are not removed are kept in their original order.
    In case of duplicates, the first occurrence is kept.
@@ -1905,9 +1880,6 @@ let deduplicate_list ?merge get_key list =
 
 let generate_dune_files () =
   Target.iter_internal_by_path @@ fun path internals ->
-  let has_static =
-    List.exists (fun (internal : Target.internal) -> internal.static) internals
-  in
   let node_preload =
     List.concat_map
       (fun (internal : Target.internal) ->
@@ -1915,26 +1887,13 @@ let generate_dune_files () =
       internals
     |> List.sort_uniq compare
   in
-  let dunes =
-    List.map (generate_dune ~dune_file_has_static_profile:has_static) internals
-  in
+  let dunes = List.map generate_dune internals in
   write (path // "dune") @@ fun fmt ->
   Format.fprintf
     fmt
     "; This file was automatically generated, do not edit.@.; Edit file \
      manifest/main.ml instead.@.@." ;
   let env = Env.empty in
-  let env =
-    if has_static then
-      let cclibs =
-        List.map
-          (fun (internal : Target.internal) -> internal.static_cclibs)
-          internals
-        |> List.flatten |> deduplicate_list Fun.id
-      in
-      static_profile cclibs env
-    else env
-  in
   let env =
     match node_preload with
     | [] -> env
diff --git a/manifest/manifest.mli b/manifest/manifest.mli
index 5a6cf492bdde17d4b12c35c60259af7d86c7cac1..2d479e8167912bf1d3cb5e15786727ef7bed43c4 100644
--- a/manifest/manifest.mli
+++ b/manifest/manifest.mli
@@ -619,14 +619,9 @@ type with_test = Always | Never | Only_on_64_arch
     - [release]: unused for now. The intent is to define whether this should be released.
       Default is [true] for public executables and [false] for other targets.
 
-    - [static]: whether to generate a [(env (static (flags (:standard -ccopt -static ...))))]
-      stanza to provide a static compilation profile.
-      Default is [true] for public executables and [false] for other targets,
-      unless you specify [static_cclibs], in which case default is [true].
-
-    - [static_cclibs]: list of static libraries to link with for targets
-      in this [dune] file when building static executables.
-      Added using [-cclib] to the stanza that is generated when [static] is [true].
+    - [static]: whether to incluce [ %{workspace_root}/static-link-flags.sexp ] to the link
+      flags to provide a static compilation profile.
+      Default is [true] for public executables and [false] for other targets.
 
     - [synopsis]: short description for the [.opam] file.
 
@@ -670,7 +665,6 @@ type 'a maker =
   ?opam_only_deps:target list ->
   ?release:bool ->
   ?static:bool ->
-  ?static_cclibs:string list ->
   ?synopsis:string ->
   ?description:string ->
   ?time_measurement_ppx:bool ->
diff --git a/src/bin_client/dune b/src/bin_client/dune
index d774c3f3b585000bec9e30aaddde61c5f574c925..1d775fcd5d56d0ed58d95be3a23889a1109cc7fd 100644
--- a/src/bin_client/dune
+++ b/src/bin_client/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executables
  (names main_client main_admin)
  (public_names tezos-client tezos-admin-client)
@@ -93,7 +91,9 @@
   (select void_for_linking-tezos-protocol-plugin-alpha from
    (tezos-protocol-plugin-alpha -> void_for_linking-tezos-protocol-plugin-alpha.empty)
    (-> void_for_linking-tezos-protocol-plugin-alpha.empty)))
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/bin_codec/dune b/src/bin_codec/dune
index 66764027506d9db8308c593254199fc6d9cbc5e4..6b966dfa03a93b41dda9f85a55efba9f637a0840 100644
--- a/src/bin_codec/dune
+++ b/src/bin_codec/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name codec)
  (public_name tezos-codec)
@@ -48,7 +46,9 @@
   (select void_for_linking-tezos-client-alpha from
    (tezos-client-alpha -> void_for_linking-tezos-client-alpha.empty)
    (-> void_for_linking-tezos-client-alpha.empty)))
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Data_encoding
diff --git a/src/bin_node/dune b/src/bin_node/dune
index 1e48f00507e907c46e497f6fe09fb9f7af7bf8d3..94f32ecc71469bcff5c1b59047573213f6e66d8b 100644
--- a/src/bin_node/dune
+++ b/src/bin_node/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main)
  (public_name tezos-node)
@@ -106,7 +104,9 @@
   (select void_for_linking-tezos-protocol-plugin-alpha-registerer from
    (tezos-protocol-plugin-alpha-registerer -> void_for_linking-tezos-protocol-plugin-alpha-registerer.empty)
    (-> void_for_linking-tezos-protocol-plugin-alpha-registerer.empty)))
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune
index e6c478b7fd1d88f8805634c5c07de0073cefb974..de84641e8d9bfac86aa0c8a0574352165db33f4f 100644
--- a/src/bin_proxy_server/dune
+++ b/src/bin_proxy_server/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_proxy_server)
  (public_name tezos-proxy-server)
@@ -98,7 +96,9 @@
   (select void_for_linking-tezos-protocol-plugin-alpha from
    (tezos-protocol-plugin-alpha -> void_for_linking-tezos-protocol-plugin-alpha.empty)
    (-> void_for_linking-tezos-protocol-plugin-alpha.empty)))
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/bin_signer/dune b/src/bin_signer/dune
index 9b94a15f80f8162c035f6c8f41325886b5ea7b18..8cd676d2cc735ea5afd275ba5df8d0979ca26db4 100644
--- a/src/bin_signer/dune
+++ b/src/bin_signer/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_signer)
  (public_name tezos-signer)
@@ -21,6 +19,9 @@
   tezos-stdlib-unix
   tezos-stdlib
   tezos-signer-backends.unix)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune
index 5c78016b23c1afafbe4f4dcb51f47402b98de496..61efe7db63ab561063d4329e72b7e32965b0504c 100644
--- a/src/bin_snoop/dune
+++ b/src/bin_snoop/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_snoop)
  (public_name tezos-snoop)
@@ -21,7 +19,9 @@
   ocamlgraph
   pyml
   prbnmcn-stats)
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/bin_validation/bin/dune b/src/bin_validation/bin/dune
index 8898174fb85cb3117a58e94dcaafc6a4b3a20415..0a5f5695155c444109e9bf960b4c124d56c2b7be 100644
--- a/src/bin_validation/bin/dune
+++ b/src/bin_validation/bin/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_validator)
  (public_name tezos-validator)
@@ -17,7 +15,9 @@
   tezos-validation
   tezos-protocol-updater
   tezos-validator)
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/lib_base/test/dune b/src/lib_base/test/dune
index 633a5922696fa9f11c4e7cdaabef70aab98e479b..92365c90812cc3075e76b93198f17b9518116371 100644
--- a/src/lib_base/test/dune
+++ b/src/lib_base/test/dune
@@ -13,9 +13,10 @@
   qcheck-alcotest
   tezos-test-helpers)
  (js_of_ocaml)
- (flags (:standard)
-        -open Tezos_base
-        -open Tezos_error_monad)
+ (flags
+  (:standard)
+  -open Tezos_base
+  -open Tezos_error_monad)
  (modules test_bounded test_time test_protocol))
 
 (rule
@@ -58,9 +59,10 @@
   qcheck-alcotest
   tezos-test-helpers)
  (js_of_ocaml)
- (flags (:standard)
-        -open Tezos_base
-        -open Tezos_error_monad)
+ (flags
+  (:standard)
+  -open Tezos_base
+  -open Tezos_error_monad)
  (modules test_p2p_addr))
 
 (rule
@@ -85,9 +87,10 @@
   qcheck-alcotest
   tezos-test-helpers)
  (js_of_ocaml)
- (flags (:standard)
-        -open Tezos_base
-        -open Tezos_error_monad)
+ (flags
+  (:standard)
+  -open Tezos_base
+  -open Tezos_error_monad)
  (modules test_sized))
 
 (rule
diff --git a/src/lib_base/test_helpers/dune b/src/lib_base/test_helpers/dune
index c67f9c3a36d1ff022b0cd9e3cbd0d053865b7893..4fc8819afbc7472c58eac22ab0e87b3d9d1e8867 100644
--- a/src/lib_base/test_helpers/dune
+++ b/src/lib_base/test_helpers/dune
@@ -14,5 +14,6 @@
   alcotest-lwt
   qcheck-alcotest)
  (library_flags (:standard -linkall))
- (flags (:standard)
-        -open Tezos_base.TzPervasives))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives))
diff --git a/src/lib_benchmark/dune b/src/lib_benchmark/dune
index e5786f0cedaaa7bf84c6052c366fcaf86bb2ad6b..821ca5e27642c80da6778582393b1a348a2687db 100644
--- a/src/lib_benchmark/dune
+++ b/src/lib_benchmark/dune
@@ -18,7 +18,8 @@
   pringo
   pyml
   ocaml-migrate-parsetree)
- (flags (:standard)
-        -open Tezos_base.TzPervasives
-        -open Tezos_stdlib_unix)
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib_unix)
  (foreign_stubs (language c) (flags (:standard)) (names snoop_stubs)))
diff --git a/src/lib_benchmark/example/dune b/src/lib_benchmark/example/dune
index 270df02850ce48139485cf397c0cc3e4f41c4fe0..96a532e3cb8e4bce4e402baeb54a654438e91249 100644
--- a/src/lib_benchmark/example/dune
+++ b/src/lib_benchmark/example/dune
@@ -10,5 +10,6 @@
   tezos-stdlib-unix
   tezos-crypto
   tezos-benchmark)
- (flags (:standard)
-        -open Tezos_base.TzPervasives))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives))
diff --git a/src/lib_benchmark/lib_micheline_rewriting/test/dune b/src/lib_benchmark/lib_micheline_rewriting/test/dune
index 5dab467223f1d16f4622e2be47eee2fe3df4a0cd..135a05a95c9705de5d211f2d0746a89a184b55c8 100644
--- a/src/lib_benchmark/lib_micheline_rewriting/test/dune
+++ b/src/lib_benchmark/lib_micheline_rewriting/test/dune
@@ -10,8 +10,9 @@
   tezos-error-monad
   tezos-client-alpha
   alcotest-lwt)
- (flags (:standard)
-        -open Tezos_micheline))
+ (flags
+  (:standard)
+  -open Tezos_micheline))
 
 (rule
  (alias runtest)
diff --git a/src/lib_benchmark/test/dune b/src/lib_benchmark/test/dune
index 961ff42ce298eafb5e24f9e34f5d5669e9cd3e3c..92dcc40e7cd5e001766efe0f7344c1825cd5a971 100644
--- a/src/lib_benchmark/test/dune
+++ b/src/lib_benchmark/test/dune
@@ -12,8 +12,9 @@
   tezos-crypto
   tezos-benchmark
   tezos-benchmark-examples)
- (flags (:standard)
-        -open Tezos_base.TzPervasives))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives))
 
 (rule
  (alias runtest)
diff --git a/src/lib_clic/test/dune b/src/lib_clic/test/dune
index 2ddfa6c673c49172873cc6557b2260f27e5c6f49..673a7dc59c05214d816513f360ede22d0b72cb51 100644
--- a/src/lib_clic/test/dune
+++ b/src/lib_clic/test/dune
@@ -7,9 +7,10 @@
   tezos-stdlib
   tezos-clic
   alcotest-lwt)
- (flags (:standard)
-        -open Tezos_stdlib
-        -open Tezos_clic))
+ (flags
+  (:standard)
+  -open Tezos_stdlib
+  -open Tezos_clic))
 
 (rule
  (alias runtest)
diff --git a/src/lib_client_base/test/dune b/src/lib_client_base/test/dune
index c5395e1776cb21d8260fff1126e96b6f6a0551b7..fb8dfdfb7e0d89d064c8fa6902073e505746651b 100644
--- a/src/lib_client_base/test/dune
+++ b/src/lib_client_base/test/dune
@@ -11,8 +11,9 @@
   tezos-client-base
   alcotest)
  (js_of_ocaml)
- (flags (:standard)
-        -open Tezos_client_base))
+ (flags
+  (:standard)
+  -open Tezos_client_base))
 
 (rule
  (alias runtest)
diff --git a/src/lib_context/dump/dune b/src/lib_context/dump/dune
index bbfa8b28bc62533fcbd270d6aec9e1dabaa85c9b..f10c89bb37987a1a79f0999f3ffe55d740b04784 100644
--- a/src/lib_context/dump/dune
+++ b/src/lib_context/dump/dune
@@ -9,6 +9,7 @@
   tezos-base
   tezos-stdlib-unix
   fmt)
- (flags (:standard)
-        -open Tezos_base.TzPervasives
-        -open Tezos_stdlib_unix))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib_unix))
diff --git a/src/lib_context/encoding/dune b/src/lib_context/encoding/dune
index f46f172120f63a85e232c68fc58a949f8604a224..7819ff793273c2cf7660c05a803ab322998944a6 100644
--- a/src/lib_context/encoding/dune
+++ b/src/lib_context/encoding/dune
@@ -10,6 +10,7 @@
   tezos-stdlib
   irmin
   irmin-pack)
- (flags (:standard)
-        -open Tezos_base.TzPervasives
-        -open Tezos_stdlib))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib))
diff --git a/src/lib_context/helpers/dune b/src/lib_context/helpers/dune
index aae7f71419e3894b7a858cacde63925f186ad1c8..57531f62f255afd0f26ba5a2bef8670968bb277c 100644
--- a/src/lib_context/helpers/dune
+++ b/src/lib_context/helpers/dune
@@ -12,6 +12,7 @@
   tezos-context.sigs
   irmin
   irmin-pack)
- (flags (:standard)
-        -open Tezos_base.TzPervasives
-        -open Tezos_stdlib))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib))
diff --git a/src/lib_context/memory/test/dune b/src/lib_context/memory/test/dune
index 3004c24aa3356f124bbb67b677c90e26b901a993..187be6350debb81173f6e773d929075401898b77 100644
--- a/src/lib_context/memory/test/dune
+++ b/src/lib_context/memory/test/dune
@@ -10,9 +10,10 @@
   tezos-context.memory
   tezos-stdlib-unix
   alcotest-lwt)
- (flags (:standard)
-        -open Tezos_base.TzPervasives
-        -open Tezos_stdlib_unix))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib_unix))
 
 (rule
  (alias runtest)
diff --git a/src/lib_context/test/dune b/src/lib_context/test/dune
index d33f72a62b857fa7cd2b443f9dda4f42cbc958ca..886bc63004826a73c647450fab63d1388baff1e0 100644
--- a/src/lib_context/test/dune
+++ b/src/lib_context/test/dune
@@ -13,9 +13,10 @@
   tezos-test-helpers
   tezos-test-helpers-extra
   alcotest-lwt)
- (flags (:standard)
-        -open Tezos_base.TzPervasives
-        -open Tezos_stdlib_unix)
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib_unix)
  (modules test_context test))
 
 (rule
diff --git a/src/lib_error_monad/dune b/src/lib_error_monad/dune
index 1e65874dda8e265394fb9fd4234ee16b8f6f0316..9ca5d807ecb9861e1203ecd03d7235eaf7f50ef2 100644
--- a/src/lib_error_monad/dune
+++ b/src/lib_error_monad/dune
@@ -12,6 +12,7 @@
   lwt
   tezos-lwt-result-stdlib)
  (js_of_ocaml)
- (flags (:standard)
-        -open Tezos_stdlib
-        -open Data_encoding))
+ (flags
+  (:standard)
+  -open Tezos_stdlib
+  -open Data_encoding))
diff --git a/src/lib_error_monad/test/dune b/src/lib_error_monad/test/dune
index bcfb9b7f2244c09d3fad22e2710467c5dc98c7c3..8af8148905198eabab4cc78d05c658530bc0cc77 100644
--- a/src/lib_error_monad/test/dune
+++ b/src/lib_error_monad/test/dune
@@ -9,8 +9,9 @@
   data-encoding
   alcotest)
  (js_of_ocaml)
- (flags (:standard)
-        -open Tezos_error_monad))
+ (flags
+  (:standard)
+  -open Tezos_error_monad))
 
 (rule
  (alias runtest)
diff --git a/src/lib_lwt_result_stdlib/test/dune b/src/lib_lwt_result_stdlib/test/dune
index 827d8d029789f7238b30c6ae27609b47fbc50504..d63201a05efb2e244d68343a23c13982b8caca9a 100644
--- a/src/lib_lwt_result_stdlib/test/dune
+++ b/src/lib_lwt_result_stdlib/test/dune
@@ -20,8 +20,9 @@
   alcotest-lwt
   qcheck-alcotest
   tezos-test-helpers)
- (flags (:standard)
-        -open Tezos_lwt_result_stdlib))
+ (flags
+  (:standard)
+  -open Tezos_lwt_result_stdlib))
 
 (rule
  (alias runtest)
diff --git a/src/lib_micheline/test/dune b/src/lib_micheline/test/dune
index 039eb5c02ae1ebf90a98b26e1519f46ddf07a9c7..ca91c27e0e56fb523debe690f40bb7a594d28f04 100644
--- a/src/lib_micheline/test/dune
+++ b/src/lib_micheline/test/dune
@@ -8,8 +8,9 @@
   tezos-micheline
   alcotest)
  (js_of_ocaml)
- (flags (:standard)
-        -open Tezos_micheline))
+ (flags
+  (:standard)
+  -open Tezos_micheline))
 
 (rule
  (alias runtest)
diff --git a/src/lib_mockup/dune b/src/lib_mockup/dune
index e5e62fbd30882a8d6bb57c0ab342e1bea5c0d037..02610de07af48b830d3e9c391c60af6108b9aa6f 100644
--- a/src/lib_mockup/dune
+++ b/src/lib_mockup/dune
@@ -11,8 +11,9 @@
   tezos-shell-services
   tezos-protocol-environment
   uri)
- (flags (:standard)
-        -open Tezos_base.TzPervasives)
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives)
  (modules registration registration_intf mockup_args))
 
 (library
diff --git a/src/lib_mockup_proxy/dune b/src/lib_mockup_proxy/dune
index 6e644049851fdba2a2b80d64c57bc9276240f6ad..8f8e0f1c89b49603820a15c2ab88a09154d42bbe 100644
--- a/src/lib_mockup_proxy/dune
+++ b/src/lib_mockup_proxy/dune
@@ -14,5 +14,6 @@
   tezos-rpc-http-client
   tezos-shell-services
   uri)
- (flags (:standard)
-        -open Tezos_base.TzPervasives))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives))
diff --git a/src/lib_p2p/test/dune b/src/lib_p2p/test/dune
index 02fea7044a7932c9c4e6f167b463bcd0123417a4..6f85f6120da52d5d892485045e89c33564903da4 100644
--- a/src/lib_p2p/test/dune
+++ b/src/lib_p2p/test/dune
@@ -23,7 +23,8 @@
   tezos-p2p-services
   alcotest-lwt
   astring)
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/lib_p2p_services/dune b/src/lib_p2p_services/dune
index 144be3955b9c3017d0f293782c16b60a86e99774..e51d9a99ef08fc03bba361c077e453206c699c50 100644
--- a/src/lib_p2p_services/dune
+++ b/src/lib_p2p_services/dune
@@ -11,5 +11,6 @@
   tezos-base)
  (js_of_ocaml)
  (library_flags (:standard -linkall))
- (flags (:standard)
-        -open Tezos_base.TzPervasives))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives))
diff --git a/src/lib_polynomial/dune b/src/lib_polynomial/dune
index deb9a5a7985bf6e3c5e4b5247ed8ae03ab3c49a3..391470defaac8ec1ac801a6d3a556246d4eab72b 100644
--- a/src/lib_polynomial/dune
+++ b/src/lib_polynomial/dune
@@ -9,8 +9,9 @@
   data-encoding
   bls12-381)
  (library_flags (:standard -linkall))
- (flags (:standard)
-        -open Data_encoding)
+ (flags
+  (:standard)
+  -open Data_encoding)
  (modules
   Carray
   Fr_generation
diff --git a/src/lib_protocol_compiler/bin/dune b/src/lib_protocol_compiler/bin/dune
index cc46cb643f17a3837eed497529ab04a667e9ddb3..3aeda8a38508fa0f08c0dc6bfa682503f903ddb0 100644
--- a/src/lib_protocol_compiler/bin/dune
+++ b/src/lib_protocol_compiler/bin/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_native)
  (public_name tezos-protocol-compiler)
@@ -11,7 +9,9 @@
  (modes native)
  (libraries
   tezos-protocol-compiler.native)
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (modules Main_native))
 
 (executable
@@ -23,6 +23,9 @@
   tezos-base
   tezos-stdlib-unix
   tezos-protocol-compiler)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
@@ -40,7 +43,9 @@
   tezos-base
   tezos-base.unix
   tezos-stdlib-unix)
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune
index f02df288fc74393aa92be06052c7b048da921ba2..cfc9e84c03057ce07d1b0cd307933775e0f3af55 100644
--- a/src/lib_protocol_compiler/dune
+++ b/src/lib_protocol_compiler/dune
@@ -8,9 +8,10 @@
  (libraries
   tezos-base
   tezos-protocol-environment.sigs)
- (flags (:standard)
-        -opaque
-        -open Tezos_base.TzPervasives)
+ (flags
+  (:standard)
+  -opaque
+  -open Tezos_base.TzPervasives)
  (modules Registerer))
 
 (rule
diff --git a/src/lib_protocol_environment/dune b/src/lib_protocol_environment/dune
index ce5da4e3d9c5bac7168c7ddf316ac9c4b2bc902f..cd5be010896c06a4c6709b66dc393ea844fab0b9 100644
--- a/src/lib_protocol_environment/dune
+++ b/src/lib_protocol_environment/dune
@@ -19,9 +19,10 @@
   tezos-context.memory
   tezos-scoru-wasm
   tezos-event-logging)
- (flags (:standard)
-        -open Tezos_base.TzPervasives
-        -open Tezos_micheline)
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_micheline)
  (wrapped false)
  (modules
   Tezos_protocol_environment
@@ -53,8 +54,9 @@
   tezos-base
   tezos-protocol-environment
   tezos-context)
- (flags (:standard)
-        -open Tezos_base.TzPervasives)
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives)
  (modules Proxy_delegate_maker Shell_context))
 
 (library
diff --git a/src/lib_protocol_environment/sigs/dune b/src/lib_protocol_environment/sigs/dune
index c895848d9a57108b4a3aeb32d8f2558abaf8f531..f12d0587f2ae3227d1e5f2e2945423e77ba36107 100644
--- a/src/lib_protocol_environment/sigs/dune
+++ b/src/lib_protocol_environment/sigs/dune
@@ -7,9 +7,10 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezos-protocol-environment.sigs.stdlib-compat)
- (flags (:standard)
-        -nostdlib
-        -nopervasives)
+ (flags
+  (:standard)
+  -nostdlib
+  -nopervasives)
  (modules V0 V1 V2 V3 V4 V5 V6))
 
 (include v0.dune.inc)
diff --git a/src/lib_proxy/dune b/src/lib_proxy/dune
index e9450836835ac236ec6305411a76121bb848fdb6..9c3fa4a856ac165cbfd79ca70672ca8e40cab805 100644
--- a/src/lib_proxy/dune
+++ b/src/lib_proxy/dune
@@ -15,5 +15,6 @@
   tezos-shell-services
   tezos-context.memory
   uri)
- (flags (:standard)
-        -open Tezos_base.TzPervasives))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives))
diff --git a/src/lib_proxy/rpc/dune b/src/lib_proxy/rpc/dune
index 9d656e384533617b50ac9dc1e66f52b9ce15ca7b..6028ed4d08534f6a70f812d6d520a5f39e3e8f9a 100644
--- a/src/lib_proxy/rpc/dune
+++ b/src/lib_proxy/rpc/dune
@@ -12,5 +12,6 @@
   tezos-rpc
   tezos-proxy
   uri)
- (flags (:standard)
-        -open Tezos_base.TzPervasives))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives))
diff --git a/src/lib_proxy_server_config/dune b/src/lib_proxy_server_config/dune
index 32f74f1771b48b8a309755c9edfe078096d0448b..026cc437f66a009a65be29bb66211c87307f1f60 100644
--- a/src/lib_proxy_server_config/dune
+++ b/src/lib_proxy_server_config/dune
@@ -9,5 +9,6 @@
   tezos-base
   tezos-stdlib-unix
   uri)
- (flags (:standard)
-        -open Tezos_base.TzPervasives))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives))
diff --git a/src/lib_proxy_server_config/test/dune b/src/lib_proxy_server_config/test/dune
index 7696e7e5e54e9fe2c7141d445465e7408625e921..0ff177467ddebd80a40a5357d0962d2ee866c1f0 100644
--- a/src/lib_proxy_server_config/test/dune
+++ b/src/lib_proxy_server_config/test/dune
@@ -11,8 +11,9 @@
   qcheck-alcotest
   alcotest-lwt
   uri)
- (flags (:standard)
-        -open Tezos_base.TzPervasives))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives))
 
 (rule
  (alias runtest)
diff --git a/src/lib_requester/dune b/src/lib_requester/dune
index 9ac46aca3b4d7587e7cef563d12183dfc7b746c0..3a59ba3da0b5ef7de0acf22f2f471d0a2b1fef7b 100644
--- a/src/lib_requester/dune
+++ b/src/lib_requester/dune
@@ -9,6 +9,7 @@
   tezos-base
   tezos-stdlib-unix
   lwt-watcher)
- (flags (:standard)
-        -open Tezos_base.TzPervasives
-        -open Tezos_stdlib_unix))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_stdlib_unix))
diff --git a/src/lib_rpc/dune b/src/lib_rpc/dune
index d103ddedb2b04c463253ca48e3260b0864a5054d..b17c0d099546e633b6e62daa6e04025608aeb9c1 100644
--- a/src/lib_rpc/dune
+++ b/src/lib_rpc/dune
@@ -12,6 +12,7 @@
   resto-directory
   uri)
  (js_of_ocaml)
- (flags (:standard)
-        -open Data_encoding
-        -open Tezos_error_monad))
+ (flags
+  (:standard)
+  -open Data_encoding
+  -open Tezos_error_monad))
diff --git a/src/lib_rpc_http/dune b/src/lib_rpc_http/dune
index 70052af75a73bcb141adc38bcb2295b265028e9f..6c9b3f3a24e3ac78489bf88f9f0b75aaf6c2ab6d 100644
--- a/src/lib_rpc_http/dune
+++ b/src/lib_rpc_http/dune
@@ -9,8 +9,9 @@
   tezos-base
   resto-cohttp
   uri)
- (flags (:standard)
-        -open Tezos_base.TzPervasives)
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives)
  (modules RPC_client_errors media_type))
 
 (library
@@ -21,9 +22,10 @@
   tezos-base
   resto-cohttp-client
   tezos-rpc-http)
- (flags (:standard)
-        -open Tezos_base.TzPervasives
-        -open Tezos_rpc_http)
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_rpc_http)
  (modules RPC_client))
 
 (library
@@ -36,9 +38,10 @@
   cohttp-lwt-unix
   resto-cohttp-client
   tezos-rpc-http-client)
- (flags (:standard)
-        -open Tezos_base.TzPervasives
-        -open Tezos_rpc_http_client)
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_rpc_http_client)
  (modules RPC_client_unix))
 
 (library
diff --git a/src/lib_sapling/test/dune b/src/lib_sapling/test/dune
index 2db116f142b987970f2bd91ea10755f83a6bf47b..19028be5b4a5c7b81a6448b50eff2d01c17bcd9d 100644
--- a/src/lib_sapling/test/dune
+++ b/src/lib_sapling/test/dune
@@ -62,7 +62,8 @@
   tezos-sapling
   tezos-hacl)
  (js_of_ocaml)
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall))
  (modules test_js))
 
 (rule
diff --git a/src/lib_shell_services/test/dune b/src/lib_shell_services/test/dune
index 6935d0a634e4b67a8b5b7763a3f451811be6f851..41f4f37bf967f376b3bfdb14feb0a6b171a5aefc 100644
--- a/src/lib_shell_services/test/dune
+++ b/src/lib_shell_services/test/dune
@@ -11,9 +11,10 @@
   tezos-shell-services
   alcotest)
  (js_of_ocaml)
- (flags (:standard)
-        -open Tezos_base.TzPervasives
-        -open Tezos_shell_services))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_shell_services))
 
 (rule
  (alias runtest)
diff --git a/src/lib_shell_services/test_helpers/dune b/src/lib_shell_services/test_helpers/dune
index c1556e3d2498ef408ee67f414209ef94e0ef89ea..9703a6db3345ce4fed7f226dbe77dd32815cb539 100644
--- a/src/lib_shell_services/test_helpers/dune
+++ b/src/lib_shell_services/test_helpers/dune
@@ -10,5 +10,6 @@
   tezos-test-helpers
   qcheck-core)
  (library_flags (:standard -linkall))
- (flags (:standard)
-        -open Tezos_base.TzPervasives))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives))
diff --git a/src/lib_shell_services/test_helpers/test/dune b/src/lib_shell_services/test_helpers/test/dune
index 2ffe9b0db5b4da6e4abbc0058cbb1de1adbd96f2..118fb038dfe6df33daf1f25abb8d208ec99c0150 100644
--- a/src/lib_shell_services/test_helpers/test/dune
+++ b/src/lib_shell_services/test_helpers/test/dune
@@ -11,8 +11,9 @@
   tezos-shell-services-test-helpers
   qcheck-alcotest
   alcotest-lwt)
- (flags (:standard)
-        -open Tezos_base.TzPervasives))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives))
 
 (rule
  (alias runtest)
diff --git a/src/lib_stdlib/test-unix/dune b/src/lib_stdlib/test-unix/dune
index 9f5f5285b125a5572b5d5552aa502bb1ed9f4e5f..418985a786122177acd40f17c1039c1a1502df86 100644
--- a/src/lib_stdlib/test-unix/dune
+++ b/src/lib_stdlib/test-unix/dune
@@ -16,8 +16,9 @@
   lwt.unix
   tezos-test-helpers
   qcheck-alcotest)
- (flags (:standard)
-        -open Tezos_stdlib))
+ (flags
+  (:standard)
+  -open Tezos_stdlib))
 
 (rule
  (alias runtest)
diff --git a/src/lib_stdlib/test/dune b/src/lib_stdlib/test/dune
index 97d93db6fa22e4f1825d5df8b3ec0228858548c2..08787a3175860d3731947ed00f1ff03a0aaf9ab6 100644
--- a/src/lib_stdlib/test/dune
+++ b/src/lib_stdlib/test/dune
@@ -18,8 +18,9 @@
   tezos-test-helpers
   qcheck-alcotest)
  (js_of_ocaml)
- (flags (:standard)
-        -open Tezos_stdlib))
+ (flags
+  (:standard)
+  -open Tezos_stdlib))
 
 (rule
  (alias runtest)
diff --git a/src/lib_version/dune b/src/lib_version/dune
index 4b7a680e8b43863791363e2294680029cbf6aa48..856941bec0fb465a6d60d8159a6d161576051ad1 100644
--- a/src/lib_version/dune
+++ b/src/lib_version/dune
@@ -11,8 +11,9 @@
   tezos-base
   tezos-version.parser)
  (js_of_ocaml)
- (flags (:standard)
-        -open Tezos_base.TzPervasives))
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives))
 
 (rule
  (targets generated_git_info.ml)
diff --git a/src/lib_version/exe/dune b/src/lib_version/exe/dune
index 338b18dce12bc96648e272d817f6b0a644ba86b1..09ab40938448e97eb1b00f8da7f243dad54ef5c2 100644
--- a/src/lib_version/exe/dune
+++ b/src/lib_version/exe/dune
@@ -1,14 +1,11 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name get_git_info)
  (libraries
   dune-configurator
   tezos-version.parser)
- (flags (:standard \ -ccopt -static))
  (modules get_git_info))
 
 (executable
@@ -18,6 +15,10 @@
  (libraries
   tezos-version
   tezos-base.unix)
- (flags (:standard)
-        -open Tezos_version)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
+ (flags
+  (:standard)
+  -open Tezos_version)
  (modules tezos_print_version))
diff --git a/src/lib_version/test/dune b/src/lib_version/test/dune
index a84b182b31566bbed6438b3e5ab24e15c26c15e4..37000ed1a73c28a7101dfd4002ede2c655806bee 100644
--- a/src/lib_version/test/dune
+++ b/src/lib_version/test/dune
@@ -11,8 +11,9 @@
   tezos-version.parser
   alcotest)
  (js_of_ocaml)
- (flags (:standard)
-        -open Tezos_version))
+ (flags
+  (:standard)
+  -open Tezos_version))
 
 (rule
  (alias runtest)
diff --git a/src/lib_webassembly/interpreter/dune b/src/lib_webassembly/interpreter/dune
index 87c2c2be05e38516de0686f91dac6c1d79dad2cb..eef6fe995c0c2de1377f2a672537cdb1235a03be 100644
--- a/src/lib_webassembly/interpreter/dune
+++ b/src/lib_webassembly/interpreter/dune
@@ -16,6 +16,7 @@
  (instrumentation (backend bisect_ppx))
  (libraries
   tezos-webassembly-interpreter)
- (flags (:standard)
-        -open Tezos_webassembly_interpreter)
+ (flags
+  (:standard)
+  -open Tezos_webassembly_interpreter)
  (modules main))
diff --git a/src/lib_webassembly/test/dune b/src/lib_webassembly/test/dune
index afa6877dcb555d782b873f465fb9f72780857f7e..2d1f38eb4e847d44409471c7b9f0823dc9e2c699 100644
--- a/src/lib_webassembly/test/dune
+++ b/src/lib_webassembly/test/dune
@@ -8,8 +8,9 @@
   qcheck-core
   qcheck-alcotest
   alcotest)
- (flags (:standard)
-        -open Tezos_webassembly_interpreter))
+ (flags
+  (:standard)
+  -open Tezos_webassembly_interpreter))
 
 (rule
  (alias runtest)
diff --git a/src/proto_011_PtHangz2/lib_parameters/dune b/src/proto_011_PtHangz2/lib_parameters/dune
index f6aa1419c82177553358c4980e178704554685af..39df9f62b2a5b8e930a3999ba9369d37f8c35a7b 100644
--- a/src/proto_011_PtHangz2/lib_parameters/dune
+++ b/src/proto_011_PtHangz2/lib_parameters/dune
@@ -21,7 +21,8 @@
  (libraries
   tezos-base
   tezos-protocol-011-PtHangz2.parameters)
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune
index 693fb21ff8fdc57d16a26e527832d33fc3458f96..ac5b0b6701f60b9940509591e1c0cd3f923d67da 100644
--- a/src/proto_011_PtHangz2/lib_protocol/dune
+++ b/src/proto_011_PtHangz2/lib_protocol/dune
@@ -140,9 +140,10 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-011-PtHangz2.raw)
- (flags -w +a-4-40..42-44-45-48-51-70
-        -warn-error +a
-        -nopervasives)
+ (flags
+  -w +a-4-40..42-44-45-48-51-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -376,9 +377,10 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-011-PtHangz2.raw)
- (flags -w +a-4-40..42-44-45-48-51-70
-        -warn-error +a
-        -nopervasives)
+ (flags
+  -w +a-4-40..42-44-45-48-51-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -497,9 +499,10 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags (:standard)
-        -w +a-4-40..42-44-45-48-51-70
-        -warn-error +a)
+ (flags
+  (:standard)
+  -w +a-4-40..42-44-45-48-51-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_012_Psithaca/bin_accuser/dune b/src/proto_012_Psithaca/bin_accuser/dune
index daa3bf0a3bce3769e7861b6b8b9cd62ca7a43852..4a7c9ba5761ca3a708228810b05297d322c7c262 100644
--- a/src/proto_012_Psithaca/bin_accuser/dune
+++ b/src/proto_012_Psithaca/bin_accuser/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_accuser_012_Psithaca)
  (public_name tezos-accuser-012-Psithaca)
@@ -16,6 +14,9 @@
   tezos-baking-012-Psithaca-commands
   tezos-stdlib-unix
   tezos-client-base-unix)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_012_Psithaca/bin_baker/dune b/src/proto_012_Psithaca/bin_baker/dune
index 6b24571329592a2cdd669683b96bb1010b8738e9..94b726ad423c4c82623b06cc92446dabd0c73f5f 100644
--- a/src/proto_012_Psithaca/bin_baker/dune
+++ b/src/proto_012_Psithaca/bin_baker/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_baker_012_Psithaca)
  (public_name tezos-baker-012-Psithaca)
@@ -16,6 +14,9 @@
   tezos-baking-012-Psithaca-commands
   tezos-stdlib-unix
   tezos-client-base-unix)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_012_Psithaca/lib_parameters/dune b/src/proto_012_Psithaca/lib_parameters/dune
index 47c29e8dce25cc707656ee5bb1d4a44e61bfdec8..732a223c033d77729da4053d30da5ea551f22ba9 100644
--- a/src/proto_012_Psithaca/lib_parameters/dune
+++ b/src/proto_012_Psithaca/lib_parameters/dune
@@ -22,7 +22,8 @@
   tezos-base
   tezos-protocol-012-Psithaca.parameters
   tezos-protocol-012-Psithaca)
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune
index 45f319b15b187738f90e961c0833aac64e57f304..903eb32fe8db124addc681a436ba10236f35422d 100644
--- a/src/proto_012_Psithaca/lib_protocol/dune
+++ b/src/proto_012_Psithaca/lib_protocol/dune
@@ -157,9 +157,10 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-012-Psithaca.raw)
- (flags -w +a-4-40..42-44-45-48-51-70
-        -warn-error +a
-        -nopervasives)
+ (flags
+  -w +a-4-40..42-44-45-48-51-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -427,9 +428,10 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-012-Psithaca.raw)
- (flags -w +a-4-40..42-44-45-48-51-70
-        -warn-error +a
-        -nopervasives)
+ (flags
+  -w +a-4-40..42-44-45-48-51-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -565,9 +567,10 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags (:standard)
-        -w +a-4-40..42-44-45-48-51-70
-        -warn-error +a)
+ (flags
+  (:standard)
+  -w +a-4-40..42-44-45-48-51-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_013_PtJakart/bin_accuser/dune b/src/proto_013_PtJakart/bin_accuser/dune
index 4a51c4d009c7f4551ec801017bf7890a8ffaeed6..04210c11d41dd327dd6dab714a87da3b823ec0cf 100644
--- a/src/proto_013_PtJakart/bin_accuser/dune
+++ b/src/proto_013_PtJakart/bin_accuser/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_accuser_013_PtJakart)
  (public_name tezos-accuser-013-PtJakart)
@@ -16,6 +14,9 @@
   tezos-baking-013-PtJakart-commands
   tezos-stdlib-unix
   tezos-client-base-unix)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_013_PtJakart/bin_baker/dune b/src/proto_013_PtJakart/bin_baker/dune
index 6dcf377bedc30f361d5707bd9538f31da14ab93c..ccc4f03888a0b358b3f5a01f8a113cfe7f96faa0 100644
--- a/src/proto_013_PtJakart/bin_baker/dune
+++ b/src/proto_013_PtJakart/bin_baker/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_baker_013_PtJakart)
  (public_name tezos-baker-013-PtJakart)
@@ -16,6 +14,9 @@
   tezos-baking-013-PtJakart-commands
   tezos-stdlib-unix
   tezos-client-base-unix)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_013_PtJakart/bin_sc_rollup_client/dune b/src/proto_013_PtJakart/bin_sc_rollup_client/dune
index bf2cbc9607a8ecd882b55c091bfed8fabae84c9b..d1f27c48852c74b7ea7d50ca691c206361208120 100644
--- a/src/proto_013_PtJakart/bin_sc_rollup_client/dune
+++ b/src/proto_013_PtJakart/bin_sc_rollup_client/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_sc_rollup_client_013_PtJakart)
  (public_name tezos-sc-rollup-client-013-PtJakart)
@@ -20,6 +18,9 @@
   tezos-protocol-013-PtJakart
   tezos-sc-rollup-013-PtJakart
   uri)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_013_PtJakart/bin_sc_rollup_node/dune b/src/proto_013_PtJakart/bin_sc_rollup_node/dune
index c8f692b950d298befd5a629ca496f11165553768..a1db0066b916895babd7c16177e26bd0689cd216 100644
--- a/src/proto_013_PtJakart/bin_sc_rollup_node/dune
+++ b/src/proto_013_PtJakart/bin_sc_rollup_node/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_sc_rollup_node_013_PtJakart)
  (public_name tezos-sc-rollup-node-013-PtJakart)
@@ -31,6 +29,9 @@
   irmin
   ringo
   ringo-lwt)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_013_PtJakart/bin_tx_rollup_client/dune b/src/proto_013_PtJakart/bin_tx_rollup_client/dune
index 18a9c17d671f4c912d028bb9d1a87f83e0cc1d8d..cf9430bf95d9888d5a50e3e6ea8c3a56eb0ba696 100644
--- a/src/proto_013_PtJakart/bin_tx_rollup_client/dune
+++ b/src/proto_013_PtJakart/bin_tx_rollup_client/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_tx_rollup_client_013_PtJakart)
  (public_name tezos-tx-rollup-client-013-PtJakart)
@@ -18,6 +16,9 @@
   tezos-tx-rollup-013-PtJakart
   tezos-protocol-013-PtJakart.raw
   uri)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_013_PtJakart/bin_tx_rollup_node/dune b/src/proto_013_PtJakart/bin_tx_rollup_node/dune
index c1f148f75c0a4b42184b1ee2211bf2caa9cf9cd2..aa082bffab662b198cbf08e4f5eef250e4491121 100644
--- a/src/proto_013_PtJakart/bin_tx_rollup_node/dune
+++ b/src/proto_013_PtJakart/bin_tx_rollup_node/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_tx_rollup_node_013_PtJakart)
  (public_name tezos-tx-rollup-node-013-PtJakart)
@@ -15,6 +13,9 @@
   tezos-client-base
   tezos-client-base-unix
   tezos-tx-rollup-013-PtJakart)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/dune b/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/dune
index 4de96f7b4beef7c5af04bb8a37de52b3fa0e4390..b748774fdd5952367b022a74290c0062fd3440ee 100644
--- a/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/dune
+++ b/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/dune
@@ -9,7 +9,8 @@
   tezos-client-013-PtJakart
   tezos-protocol-013-PtJakart
   tezos-baking-013-PtJakart.tenderbrute)
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_013_PtJakart/lib_parameters/dune b/src/proto_013_PtJakart/lib_parameters/dune
index 9df035d1b5b9b2f39fa4462c8b6053de98c16141..7836339820f84ef3c5eb3755c7af69210871f979 100644
--- a/src/proto_013_PtJakart/lib_parameters/dune
+++ b/src/proto_013_PtJakart/lib_parameters/dune
@@ -22,7 +22,8 @@
   tezos-base
   tezos-protocol-013-PtJakart.parameters
   tezos-protocol-013-PtJakart)
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune
index e7fc45e8f1157ebd559825e1ee5970f6735db2c3..299a9f59a5ad4dee65d484ddff45aea0749a2b91 100644
--- a/src/proto_013_PtJakart/lib_protocol/dune
+++ b/src/proto_013_PtJakart/lib_protocol/dune
@@ -222,9 +222,10 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-013-PtJakart.raw)
- (flags -w +a-4-40..42-44-45-48-51-70
-        -warn-error +a
-        -nopervasives)
+ (flags
+  -w +a-4-40..42-44-45-48-51-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -624,9 +625,10 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-013-PtJakart.raw)
- (flags -w +a-4-40..42-44-45-48-51-70
-        -warn-error +a
-        -nopervasives)
+ (flags
+  -w +a-4-40..42-44-45-48-51-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -828,9 +830,10 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags (:standard)
-        -w +a-4-40..42-44-45-48-51-70
-        -warn-error +a)
+ (flags
+  (:standard)
+  -w +a-4-40..42-44-45-48-51-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune
index 52c6022c9ed830093298440098c205bbcf40b49d..224537d64175b3deeb321d1e50256263247515f3 100644
--- a/src/proto_alpha/bin_accuser/dune
+++ b/src/proto_alpha/bin_accuser/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_accuser_alpha)
  (public_name tezos-accuser-alpha)
@@ -16,6 +14,9 @@
   tezos-baking-alpha-commands
   tezos-stdlib-unix
   tezos-client-base-unix)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune
index 347249fba917dedd1fb207895f1d89a46fd9db0c..5d1b3748f549aef9b932d4797de736d8400c1a27 100644
--- a/src/proto_alpha/bin_baker/dune
+++ b/src/proto_alpha/bin_baker/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_baker_alpha)
  (public_name tezos-baker-alpha)
@@ -16,6 +14,9 @@
   tezos-baking-alpha-commands
   tezos-stdlib-unix
   tezos-client-base-unix)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_alpha/bin_sc_rollup_client/dune b/src/proto_alpha/bin_sc_rollup_client/dune
index 726c60c9a647e1c863f84ebabf590bcb484ef855..f657b4f98d7366c1f4a2acb14dd46ad74e45595f 100644
--- a/src/proto_alpha/bin_sc_rollup_client/dune
+++ b/src/proto_alpha/bin_sc_rollup_client/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_sc_rollup_client_alpha)
  (public_name tezos-sc-rollup-client-alpha)
@@ -20,6 +18,9 @@
   tezos-protocol-alpha
   tezos-sc-rollup-alpha
   uri)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune
index 8ee9f184846c33a65a329c173aa61dd7ec61dd91..f16b4510fd82818c5336792c199ab94f004838b1 100644
--- a/src/proto_alpha/bin_sc_rollup_node/dune
+++ b/src/proto_alpha/bin_sc_rollup_node/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_sc_rollup_node_alpha)
  (public_name tezos-sc-rollup-node-alpha)
@@ -31,6 +29,9 @@
   irmin
   ringo
   ringo-lwt)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_alpha/bin_tx_rollup_client/dune b/src/proto_alpha/bin_tx_rollup_client/dune
index 67c9308ac670b6277c9624199a8a7b9e18bad592..689f1653b61ed14d5617c2afd083f7de982bf78a 100644
--- a/src/proto_alpha/bin_tx_rollup_client/dune
+++ b/src/proto_alpha/bin_tx_rollup_client/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_tx_rollup_client_alpha)
  (public_name tezos-tx-rollup-client-alpha)
@@ -18,6 +16,9 @@
   tezos-tx-rollup-alpha
   tezos-protocol-alpha.raw
   uri)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_alpha/bin_tx_rollup_node/dune b/src/proto_alpha/bin_tx_rollup_node/dune
index be28870762500bdbf6603b9bc9ae5b939c06b7af..f9c1cd6b5e2f794298c9e9ba7057cd50d45153f2 100644
--- a/src/proto_alpha/bin_tx_rollup_node/dune
+++ b/src/proto_alpha/bin_tx_rollup_node/dune
@@ -1,8 +1,6 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(env (static (flags (:standard -ccopt -static))))
-
 (executable
  (name main_tx_rollup_node_alpha)
  (public_name tezos-tx-rollup-node-alpha)
@@ -15,6 +13,9 @@
   tezos-client-base
   tezos-client-base-unix
   tezos-tx-rollup-alpha)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/static-link-flags.sexp))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/dune
index 5bba20e18a7a7247423d237be3f013a3f9ba4e9e..aec676a976752e8bd211794be15bc42c3ea7c68a 100644
--- a/src/proto_alpha/lib_delegate/test/tenderbrute/dune
+++ b/src/proto_alpha/lib_delegate/test/tenderbrute/dune
@@ -9,7 +9,8 @@
   tezos-client-alpha
   tezos-protocol-alpha
   tezos-baking-alpha.tenderbrute)
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_alpha/lib_parameters/dune b/src/proto_alpha/lib_parameters/dune
index 25fac718610ee42871320ad9aa010957db66cc5b..ba6228fc1b09fccaf7fc86696108c3dd273ee673 100644
--- a/src/proto_alpha/lib_parameters/dune
+++ b/src/proto_alpha/lib_parameters/dune
@@ -10,9 +10,10 @@
   tezos-protocol-environment
   tezos-protocol-alpha)
  (library_flags (:standard -linkall))
- (flags (:standard)
-        -open Tezos_base.TzPervasives
-        -open Tezos_protocol_alpha)
+ (flags
+  (:standard)
+  -open Tezos_base.TzPervasives
+  -open Tezos_protocol_alpha)
  (modules (:standard \ gen)))
 
 (executable
@@ -21,7 +22,8 @@
   tezos-base
   tezos-protocol-alpha.parameters
   tezos-protocol-alpha)
- (link_flags (:standard -linkall))
+ (link_flags
+  (:standard -linkall))
  (flags
   (:standard)
   -open Tezos_base.TzPervasives
diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune
index ee039990e78f18abe924c856cc02409ae5a2ca34..027974698992173be5cd39ba68b50493c8e66670 100644
--- a/src/proto_alpha/lib_protocol/dune
+++ b/src/proto_alpha/lib_protocol/dune
@@ -241,9 +241,10 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-alpha.raw)
- (flags -w +a-4-40..42-44-45-48-70
-        -warn-error +a
-        -nopervasives)
+ (flags
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -682,9 +683,10 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-alpha.raw)
- (flags -w +a-4-40..42-44-45-48-70
-        -warn-error +a
-        -nopervasives)
+ (flags
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -906,9 +908,10 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags (:standard)
-        -w +a-4-40..42-44-45-48-70
-        -warn-error +a)
+ (flags
+  (:standard)
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune
index 2ea77e8ad30ccd909a1cb62a0bc71f53f39e2914..01575880f2a1e9511c09bd04cf78a64d71a4462d 100644
--- a/src/proto_demo_counter/lib_protocol/dune
+++ b/src/proto_demo_counter/lib_protocol/dune
@@ -52,9 +52,10 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-demo-counter.raw)
- (flags -w +a-4-40..42-44-45-48-70
-        -warn-error +a
-        -nopervasives)
+ (flags
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -112,9 +113,10 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-demo-counter.raw)
- (flags -w +a-4-40..42-44-45-48-70
-        -warn-error +a
-        -nopervasives)
+ (flags
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -145,9 +147,10 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags (:standard)
-        -w +a-4-40..42-44-45-48-70
-        -warn-error +a)
+ (flags
+  (:standard)
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune
index 507d65017a650076cc89cf09f6446919a458ee35..385aa9eea7470181451e433e03133501907041c4 100644
--- a/src/proto_demo_noops/lib_protocol/dune
+++ b/src/proto_demo_noops/lib_protocol/dune
@@ -43,9 +43,10 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-demo-noops.raw)
- (flags -w +a-4-40..42-44-45-48-70
-        -warn-error +a
-        -nopervasives)
+ (flags
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -83,9 +84,10 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-demo-noops.raw)
- (flags -w +a-4-40..42-44-45-48-70
-        -warn-error +a
-        -nopervasives)
+ (flags
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -107,9 +109,10 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags (:standard)
-        -w +a-4-40..42-44-45-48-70
-        -warn-error +a)
+ (flags
+  (:standard)
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune
index 319306c5f134eccb3a748c41cdf3147f99965e74..6b08fb73c284e81ec5b5a51a20eca9dfd78f1ce6 100644
--- a/src/proto_genesis/lib_protocol/dune
+++ b/src/proto_genesis/lib_protocol/dune
@@ -43,9 +43,10 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-genesis.raw)
- (flags -w +a-4-40..42-44-45-48-70
-        -warn-error +a
-        -nopervasives)
+ (flags
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a
+  -nopervasives)
  (modules Protocol))
 
 (install
@@ -87,9 +88,10 @@
   tezos-protocol-environment
   tezos-protocol-environment.sigs
   tezos-protocol-genesis.raw)
- (flags -w +a-4-40..42-44-45-48-70
-        -warn-error +a
-        -nopervasives)
+ (flags
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a
+  -nopervasives)
  (modules Functor))
 
 (rule
@@ -113,9 +115,10 @@
   tezos-protocol-updater
   tezos-protocol-environment)
  (library_flags (:standard -linkall))
- (flags (:standard)
-        -w +a-4-40..42-44-45-48-70
-        -warn-error +a)
+ (flags
+  (:standard)
+  -w +a-4-40..42-44-45-48-70
+  -warn-error +a)
  (modules Registerer))
 
 (rule
diff --git a/tezt/lib_performance_regression/dune b/tezt/lib_performance_regression/dune
index 53e45d9b1db28de79ba33d64142adaac5cc9110b..5aa7dcb43042e1d6c5924abb7eb81db382a4eed0 100644
--- a/tezt/lib_performance_regression/dune
+++ b/tezt/lib_performance_regression/dune
@@ -8,6 +8,7 @@
   tezt
   uri
   cohttp-lwt-unix)
- (flags (:standard)
-        -open Tezt
-        -open Tezt.Base))
+ (flags
+  (:standard)
+  -open Tezt
+  -open Tezt.Base))
diff --git a/tezt/self_tests/dune b/tezt/self_tests/dune
index e0ab5fa475d79fcf07d5dc37a090a744e4d266ef..f038e2ee5a068ae636f3159764144f6f2e406299 100644
--- a/tezt/self_tests/dune
+++ b/tezt/self_tests/dune
@@ -8,9 +8,10 @@
  (libraries
   tezt
   tezt-tezos)
- (flags (:standard)
-        -open Tezt
-        -open Tezt.Base
-        -open Tezt_tezos))
+ (flags
+  (:standard)
+  -open Tezt
+  -open Tezt.Base
+  -open Tezt_tezos))
 
 (cram (package tezt-self-tests) (deps tezt.sh main.exe))