diff --git a/dune b/dune
index 995521bd50a1de71aef98c122e99591be50769ee..07287393eb7eae3433e6011808861cac85566f9b 100644
--- a/dune
+++ b/dune
@@ -1,5 +1 @@
-(env
- (release
-  (ocamlopt_flags (:standard -O3))))
-
 (vendored_dirs vendors)
diff --git a/dune-workspace b/dune-workspace
index 45acd3f088476c213b9fef148e3832c8bb580de8..844ae5c2cee3b7600678ac368c955214483e8bcd 100644
--- a/dune-workspace
+++ b/dune-workspace
@@ -1 +1,6 @@
 (lang dune 2.7)
+
+(env
+ (static  (ocamlopt_flags (:standard -O3)))
+ (release (ocamlopt_flags (:standard -O3)))
+)
\ No newline at end of file
diff --git a/src/bin_client/dune b/src/bin_client/dune
index ec9b8c5a5db9efea5b5d5f80aa4b4c3f9206fb44..9ab1908d3f0cdac57edcd832c29a6cf6c2c77202 100644
--- a/src/bin_client/dune
+++ b/src/bin_client/dune
@@ -4,9 +4,7 @@
 
 (env
  (static
-  (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))
-  (ocamlopt_flags (:standard -O3)))
- (release (ocamlopt_flags (:standard -O3))))
+  (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))))
 
 (executables
  (names main_client main_admin)
diff --git a/src/bin_codec/dune b/src/bin_codec/dune
index 202b3cdfd95cbb23f1e580f06192c0f8e2b85577..421a68bb9d6069ff20b46a62e5ecc40d50f49918 100644
--- a/src/bin_codec/dune
+++ b/src/bin_codec/dune
@@ -1,8 +1,6 @@
 (env
  (static
-  (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))
-  (ocamlopt_flags (:standard -O3)))
- (release (ocamlopt_flags (:standard -O3))))
+  (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))))
 
 (executable
  (name codec)
diff --git a/src/bin_node/dune b/src/bin_node/dune
index 92ec6d879d47a14eb8ec4c83e333c59d87c862d0..dbeca49a8e8042fda207ff20c909e60429cfc96f 100644
--- a/src/bin_node/dune
+++ b/src/bin_node/dune
@@ -8,8 +8,7 @@
 ; "void_for_linking".
 
 (env
- (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3)))
- (release (ocamlopt_flags (:standard -O3))))
+ (static (flags (:standard -ccopt -static))))
 
 (executable
  (name main)
diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune
index f23a17bb14ed00da159d7ccf8081497e6eb034ac..21479e2f9f1904e4485fa88ba807164ea23e866b 100644
--- a/src/bin_proxy_server/dune
+++ b/src/bin_proxy_server/dune
@@ -3,8 +3,7 @@
 ; dependencies.
 
 (env
- (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3)))
- (release (ocamlopt_flags (:standard -O3))))
+ (static (flags (:standard -ccopt -static))))
 
 (executable
  (name main_proxy_server)
diff --git a/src/bin_signer/dune b/src/bin_signer/dune
index 983b7c8ea4c5914b041728b91a1cfe56e4b0fe3a..8528f6c04312a1a839084c107e9ea101a15d3695 100644
--- a/src/bin_signer/dune
+++ b/src/bin_signer/dune
@@ -1,8 +1,6 @@
 (env
  (static
-  (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))
-  (ocamlopt_flags (:standard -O3)))
- (release (ocamlopt_flags (:standard -O3))))
+  (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))))
 
 (executable
  (name main_signer)
diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune
index 50f07cf6de3590ac8a03b61cb54de903dd145515..f737757bb0aba4890bbecb606de56a3d16f8a5d3 100644
--- a/src/bin_snoop/dune
+++ b/src/bin_snoop/dune
@@ -1,6 +1,5 @@
 (env
- (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3)))
- (release (ocamlopt_flags (:standard -O3))))
+ (static (flags (:standard -ccopt -static))))
 
 (executable
  (name main_snoop)
diff --git a/src/bin_validation/dune b/src/bin_validation/dune
index 2325afda57bcc2f718c7708a35cd1a50e7ae6ec1..832641b492e29f7828282e66b97e53f3168a4b89 100644
--- a/src/bin_validation/dune
+++ b/src/bin_validation/dune
@@ -1,5 +1,3 @@
-(env (release (ocamlopt_flags (:standard -O3))))
-
 (library
  (name tezos_validator)
  (public_name tezos-validator)
diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune
index 82209a8600a9ff9e520caf67d4a3a5dc8a0b0711..e4e02d578a672664322994f015311cbe799cb728 100644
--- a/src/lib_protocol_compiler/dune
+++ b/src/lib_protocol_compiler/dune
@@ -2,8 +2,7 @@
 ; notice that the libraries are compiled with
 ; "\ -ccopt -static" is a temporary solution
 (env
- (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3)))
- (release (ocamlopt_flags (:standard -O3))))
+ (static (flags (:standard -ccopt -static))))
 
 (library
  (name tezos_protocol_registerer)
diff --git a/src/proto_010_PtGRANAD/bin_accuser/dune b/src/proto_010_PtGRANAD/bin_accuser/dune
index 4250095ec9525f4f026ee7a8d95b1d391c98da83..b744597f77ea78ebde77092bc071eda6bde62bc1 100644
--- a/src/proto_010_PtGRANAD/bin_accuser/dune
+++ b/src/proto_010_PtGRANAD/bin_accuser/dune
@@ -3,9 +3,7 @@
  (static
   (flags (:standard
            -ccopt -static
-           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))
-  (ocamlopt_flags (:standard -O3)))
- (release (ocamlopt_flags (:standard -O3))))
+           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))))
 
 (executable
  (name main_accuser_010_PtGRANAD)
diff --git a/src/proto_010_PtGRANAD/bin_baker/dune b/src/proto_010_PtGRANAD/bin_baker/dune
index be7a5120d680553d3b78f45db28502c4da07c198..c4a977650edb7c818706dd9ba2e0526705d48e20 100644
--- a/src/proto_010_PtGRANAD/bin_baker/dune
+++ b/src/proto_010_PtGRANAD/bin_baker/dune
@@ -3,9 +3,7 @@
  (static
   (flags (:standard
            -ccopt -static
-           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))
-  (ocamlopt_flags (:standard -O3)))
- (release (ocamlopt_flags (:standard -O3))))
+           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))))
 
 (executable
  (name main_baker_010_PtGRANAD)
diff --git a/src/proto_010_PtGRANAD/bin_endorser/dune b/src/proto_010_PtGRANAD/bin_endorser/dune
index c0b6473d17cae602d10b407ca8f623b7da3aa1f3..8201ba78b384c86ce21a3c4f5cde44ccea172206 100644
--- a/src/proto_010_PtGRANAD/bin_endorser/dune
+++ b/src/proto_010_PtGRANAD/bin_endorser/dune
@@ -3,9 +3,7 @@
  (static
   (flags (:standard
            -ccopt -static
-           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))
-  (ocamlopt_flags (:standard -O3)))
- (release (ocamlopt_flags (:standard -O3))))
+           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))))
 
 (executable
  (name main_endorser_010_PtGRANAD)
diff --git a/src/proto_011_PtHangz2/bin_accuser/dune b/src/proto_011_PtHangz2/bin_accuser/dune
index 0d51fa4d14d2557d285473901ee5c4911fef07ba..50f1caf8ef4e9246c4e521440e9589e37c0f5d2b 100644
--- a/src/proto_011_PtHangz2/bin_accuser/dune
+++ b/src/proto_011_PtHangz2/bin_accuser/dune
@@ -3,9 +3,7 @@
  (static
   (flags (:standard
            -ccopt -static
-           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))
-  (ocamlopt_flags (:standard -O3)))
- (release (ocamlopt_flags (:standard -O3))))
+           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))))
 
 (executable
  (name main_accuser_011_PtHangz2)
diff --git a/src/proto_011_PtHangz2/bin_baker/dune b/src/proto_011_PtHangz2/bin_baker/dune
index 1ade92beb947b5e65c8a6410dbfe299372e5ade8..d578ca5283f9919992b55a1f52df0e686a14af92 100644
--- a/src/proto_011_PtHangz2/bin_baker/dune
+++ b/src/proto_011_PtHangz2/bin_baker/dune
@@ -3,9 +3,7 @@
  (static
   (flags (:standard
            -ccopt -static
-           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))
-  (ocamlopt_flags (:standard -O3)))
- (release (ocamlopt_flags (:standard -O3))))
+           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))))
 
 (executable
  (name main_baker_011_PtHangz2)
diff --git a/src/proto_011_PtHangz2/bin_endorser/dune b/src/proto_011_PtHangz2/bin_endorser/dune
index d00bbcea86c4058f1c1bcc398a300c69a721d739..f271804315c1ac1b09415478b8400df698a509a1 100644
--- a/src/proto_011_PtHangz2/bin_endorser/dune
+++ b/src/proto_011_PtHangz2/bin_endorser/dune
@@ -3,9 +3,7 @@
  (static
   (flags (:standard
            -ccopt -static
-           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))
-  (ocamlopt_flags (:standard -O3)))
- (release (ocamlopt_flags (:standard -O3))))
+           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))))
 
 (executable
  (name main_endorser_011_PtHangz2)
diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune
index d9129c88b5fb9f6da313f7dbdb1f72b5a4350c42..520b4384a4ac8feb3e0b4c2ae9731dbe0182558f 100644
--- a/src/proto_alpha/bin_accuser/dune
+++ b/src/proto_alpha/bin_accuser/dune
@@ -3,9 +3,7 @@
  (static
   (flags (:standard
            -ccopt -static
-           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))
-  (ocamlopt_flags (:standard -O3)))
- (release (ocamlopt_flags (:standard -O3))))
+           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))))
 
 (executable
  (name main_accuser_alpha)
diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune
index e1212af6c4036a65c4cc5aed6ff7845c223683ce..7db4bf1b94801b1bfd4ab7f0989faa751406c344 100644
--- a/src/proto_alpha/bin_baker/dune
+++ b/src/proto_alpha/bin_baker/dune
@@ -3,9 +3,7 @@
  (static
   (flags (:standard
            -ccopt -static
-           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))
-  (ocamlopt_flags (:standard -O3)))
- (release (ocamlopt_flags (:standard -O3))))
+           -cclib "-lusb-1.0 -lhidapi-libusb -ludev"))))
 
 (executable
  (name main_baker_alpha)