diff --git a/analysis.opam b/analysis.opam
index a202fba552..8350d0a8a9 100644
--- a/analysis.opam
+++ b/analysis.opam
@@ -7,9 +7,9 @@ license: "LGPL-3.0-or-later"
 homepage: "https://github.com/rescript-lang/rescript-compiler"
 bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
 depends: [
+  "dune" {>= "3.17"}
   "ocaml" {>= "5.0.0"}
   "cppo" {= "1.8.0"}
-  "dune" {>= "3.17"}
   "odoc" {with-doc}
 ]
 build: [
diff --git a/dune-project b/dune-project
index c8bb3117c5..eb93503c24 100644
--- a/dune-project
+++ b/dune-project
@@ -19,7 +19,31 @@
  (synopsis "ReScript compiler")
  (depends
   (ocaml
-   (>= 5.0.0))))
+   (>= 5.0.0))
+  dune
+  (cppo
+   (= 1.8.0))
+  (flow_parser
+   (= 0.267.0))
+  (ocamlformat
+   (and :with-test (= 0.27.0)))
+  (yojson
+   (and :with-test (= 2.2.2)))
+  (ounit2
+   (and :with-test (= 2.2.7)))
+  (odoc :with-doc)
+  (ocaml-lsp-server
+   (and :with-dev-setup (= 1.22.0)))
+  (js_of_ocaml
+   (and
+    (<> :os "win32")
+    :with-test
+    (= 6.0.1)))
+  (wasm_of_ocaml-compiler
+   (and
+    (<> :os "win32")
+    :with-test
+    (= 6.0.1)))))
 
 (package
  (name analysis)
@@ -29,7 +53,7 @@
    (>= 5.0.0))
   (cppo
    (= 1.8.0))
-  dune))
+  (odoc :with-doc)))
 
 (package
  (name tools)
@@ -42,4 +66,4 @@
   (cppo
    (= 1.8.0))
   analysis
-  dune))
+  (odoc :with-doc)))
diff --git a/rescript.opam b/rescript.opam
index 40a9251350..d87e63dc48 100644
--- a/rescript.opam
+++ b/rescript.opam
@@ -6,6 +6,19 @@ authors: ["Hongbo Zhang <bobzhang1988@gmail.com>"]
 license: "LGPL-3.0-or-later"
 homepage: "https://github.com/rescript-lang/rescript-compiler"
 bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
+depends: [
+  "ocaml" {>= "5.0.0"}
+  "dune" {>= "3.17"}
+  "cppo" {= "1.8.0"}
+  "flow_parser" {= "0.267.0"}
+  "ocamlformat" {with-test & = "0.27.0"}
+  "yojson" {with-test & = "2.2.2"}
+  "ounit2" {with-test & = "2.2.7"}
+  "odoc" {with-doc}
+  "ocaml-lsp-server" {with-dev-setup & = "1.22.0"}
+  "js_of_ocaml" {os != "win32" & with-test & = "6.0.1"}
+  "wasm_of_ocaml-compiler" {os != "win32" & with-test & = "6.0.1"}
+]
 build: [
   ["dune" "subst"] {dev}
   [
@@ -20,21 +33,6 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-depends: [
-  "ocaml" {>= "5.0.0"}
-  "cppo" {= "1.8.0"}
-  "dune" {>= "3.17"}
-  "flow_parser" {= "0.267.0"}
-  "ocamlformat" {with-test & = "0.27.0"}
-  "yojson" {with-test & = "2.2.2"}
-  "ounit2" {with-test & = "2.2.7"}
-  "odoc" {with-doc}
-  "ocaml-lsp-server" {with-dev-setup & = "1.22.0"}
-
-  # Test dependencies that would be broken on Windows runners
-  "js_of_ocaml" {os != "win32" & with-test & = "6.0.1"}
-  "wasm_of_ocaml-compiler" {os != "win32" & with-test & = "6.0.1"}
-]
 pin-depends: [
   ["flow_parser.0.267.0" "git+https://github.com/rescript-lang/flow.git#9ea4062c0b7e037415c4413a7634c459ebd5c31b"]
 ]
diff --git a/rescript.opam.template b/rescript.opam.template
index e5629e01d6..5f168c6730 100644
--- a/rescript.opam.template
+++ b/rescript.opam.template
@@ -1,18 +1,3 @@
-depends: [
-  "ocaml" {>= "5.0.0"}
-  "cppo" {= "1.8.0"}
-  "dune" {>= "3.17"}
-  "flow_parser" {= "0.267.0"}
-  "ocamlformat" {with-test & = "0.27.0"}
-  "yojson" {with-test & = "2.2.2"}
-  "ounit2" {with-test & = "2.2.7"}
-  "odoc" {with-doc}
-  "ocaml-lsp-server" {with-dev-setup & = "1.22.0"}
-
-  # Test dependencies that would be broken on Windows runners
-  "js_of_ocaml" {os != "win32" & with-test & = "6.0.1"}
-  "wasm_of_ocaml-compiler" {os != "win32" & with-test & = "6.0.1"}
-]
 pin-depends: [
   ["flow_parser.0.267.0" "git+https://github.com/rescript-lang/flow.git#9ea4062c0b7e037415c4413a7634c459ebd5c31b"]
 ]
diff --git a/tools.opam b/tools.opam
index 203f7fd753..bfcabac6a9 100644
--- a/tools.opam
+++ b/tools.opam
@@ -7,11 +7,11 @@ license: "LGPL-3.0-or-later"
 homepage: "https://github.com/rescript-lang/rescript-compiler"
 bug-reports: "https://github.com/rescript-lang/rescript-compiler/issues"
 depends: [
+  "dune" {>= "3.17"}
   "ocaml" {>= "5.0.0"}
   "cmarkit" {>= "0.3.0"}
   "cppo" {= "1.8.0"}
   "analysis"
-  "dune" {>= "3.17"}
   "odoc" {with-doc}
 ]
 build: [