diff --git a/dune b/dune
index e3e6643d1..92f31239d 100644
--- a/dune
+++ b/dune
@@ -4,3 +4,8 @@
   (preludes doc/prelude.ml)
   (enabled_if (<> %{os_type} "Win32"))
   (files README.md))
+
+(rule (copy eio.opam.template eio_main.opam.template))
+(rule (copy eio.opam.template eio_linux.opam.template))
+(rule (copy eio.opam.template eio_posix.opam.template))
+(rule (copy eio.opam.template eio_windows.opam.template))
diff --git a/dune-project b/dune-project
index 6c0bbeecf..5ca48e27c 100644
--- a/dune-project
+++ b/dune-project
@@ -1,4 +1,4 @@
-(lang dune 3.7)
+(lang dune 3.9)
 (name eio)
 (formatting disabled)
 (generate_opam_files true)
diff --git a/eio.opam b/eio.opam
index 17e7138d5..f7f470eb1 100644
--- a/eio.opam
+++ b/eio.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml-multicore/eio"
 doc: "https://ocaml-multicore.github.io/eio/"
 bug-reports: "https://github.com/ocaml-multicore/eio/issues"
 depends: [
-  "dune" {>= "3.7"}
+  "dune" {>= "3.9"}
   "ocaml" {>= "5.0.0"}
   "bigstringaf" {>= "0.9.0"}
   "cstruct" {>= "6.0.1"}
@@ -47,3 +47,8 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/ocaml-multicore/eio.git"
+pin-depends:
+[[
+   "dune.3.9.0"
+   "git+https://github.com/emillon/dune#d0d3ddb93d11b3622192b4dc3789e2bcb7cfc05d"
+]]
diff --git a/eio.opam.template b/eio.opam.template
new file mode 100644
index 000000000..0a28bfad7
--- /dev/null
+++ b/eio.opam.template
@@ -0,0 +1,5 @@
+pin-depends:
+[[
+   "dune.3.9.0"
+   "git+https://github.com/emillon/dune#d0d3ddb93d11b3622192b4dc3789e2bcb7cfc05d"
+]]
diff --git a/eio_linux.opam b/eio_linux.opam
index a343d52fc..4b149132d 100644
--- a/eio_linux.opam
+++ b/eio_linux.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml-multicore/eio"
 doc: "https://ocaml-multicore.github.io/eio/"
 bug-reports: "https://github.com/ocaml-multicore/eio/issues"
 depends: [
-  "dune" {>= "3.7"}
+  "dune" {>= "3.9"}
   "alcotest" {>= "1.4.0" & with-test}
   "eio" {= version}
   "mdx" {>= "2.2.0" & with-test}
@@ -34,3 +34,8 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/ocaml-multicore/eio.git"
+pin-depends:
+[[
+   "dune.3.9.0"
+   "git+https://github.com/emillon/dune#d0d3ddb93d11b3622192b4dc3789e2bcb7cfc05d"
+]]
diff --git a/eio_main.opam b/eio_main.opam
index c6298237d..0ab0d7321 100644
--- a/eio_main.opam
+++ b/eio_main.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml-multicore/eio"
 doc: "https://ocaml-multicore.github.io/eio/"
 bug-reports: "https://github.com/ocaml-multicore/eio/issues"
 depends: [
-  "dune" {>= "3.7"}
+  "dune" {>= "3.9"}
   "mdx" {>= "2.2.0" & with-test}
   "kcas" {>= "0.3.0" & with-test}
   "yojson" {>= "2.0.2" & with-test}
@@ -33,3 +33,8 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/ocaml-multicore/eio.git"
+pin-depends:
+[[
+   "dune.3.9.0"
+   "git+https://github.com/emillon/dune#d0d3ddb93d11b3622192b4dc3789e2bcb7cfc05d"
+]]
diff --git a/eio_posix.opam b/eio_posix.opam
index d52d70b76..7614198b3 100644
--- a/eio_posix.opam
+++ b/eio_posix.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml-multicore/eio"
 doc: "https://ocaml-multicore.github.io/eio/"
 bug-reports: "https://github.com/ocaml-multicore/eio/issues"
 depends: [
-  "dune" {>= "3.7"}
+  "dune" {>= "3.9"}
   "eio" {= version}
   "iomux" {>= "0.2"}
   "mdx" {>= "2.2.0" & with-test}
@@ -31,3 +31,8 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/ocaml-multicore/eio.git"
+pin-depends:
+[[
+   "dune.3.9.0"
+   "git+https://github.com/emillon/dune#d0d3ddb93d11b3622192b4dc3789e2bcb7cfc05d"
+]]
diff --git a/eio_windows.opam b/eio_windows.opam
index 7ad94c870..292ac221b 100755
--- a/eio_windows.opam
+++ b/eio_windows.opam
@@ -9,7 +9,7 @@ homepage: "https://github.com/ocaml-multicore/eio"
 doc: "https://ocaml-multicore.github.io/eio/"
 bug-reports: "https://github.com/ocaml-multicore/eio/issues"
 depends: [
-  "dune" {>= "3.7"}
+  "dune" {>= "3.9"}
   "eio" {= version}
   "kcas" {>= "0.3.0" & with-test}
   "alcotest" {>= "1.4.0" & with-test}
@@ -30,3 +30,8 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/ocaml-multicore/eio.git"
+pin-depends:
+[[
+   "dune.3.9.0"
+   "git+https://github.com/emillon/dune#d0d3ddb93d11b3622192b4dc3789e2bcb7cfc05d"
+]]
diff --git a/lib_eio_linux/tests/dune b/lib_eio_linux/tests/dune
index 18146c1d3..9e57d34b9 100644
--- a/lib_eio_linux/tests/dune
+++ b/lib_eio_linux/tests/dune
@@ -1,9 +1,3 @@
-(* -*- tuareg -*- *)
-
-let linux = List.mem ("system", "linux") Jbuild_plugin.V1.ocamlc_config
-
-let () = Jbuild_plugin.V1.send @@ if not linux then "" else {|
-
 (library
  (name eurcp_lib)
  (enabled_if (= %{system} "linux"))
@@ -31,7 +25,7 @@ let () = Jbuild_plugin.V1.send @@ if not linux then "" else {|
 (test
  (name test)
  (package eio_linux)
- (enabled_if (= %{system} "linux"))
+ (build_if (= %{system} "linux"))
  (modules test)
  (libraries alcotest eio_linux))
 
@@ -39,5 +33,3 @@ let () = Jbuild_plugin.V1.send @@ if not linux then "" else {|
   (package eio_linux)
   (enabled_if (= %{system} "linux"))
   (deps (package eio_linux)))
-
-|}
diff --git a/lib_eio_windows/test/dune b/lib_eio_windows/test/dune
index 0b97f06ca..440913208 100755
--- a/lib_eio_windows/test/dune
+++ b/lib_eio_windows/test/dune
@@ -1,13 +1,5 @@
-(* -*- tuareg -*- *)
-
-let win32 = List.mem ("os_type", "Win32") Jbuild_plugin.V1.ocamlc_config
-
-let () = Jbuild_plugin.V1.send @@ if not win32 then "" else {|
-
 (test
   (name test)
   (package eio_windows)
-  (enabled_if (= %{os_type} "Win32"))
+  (build_if (= %{os_type} "Win32"))
   (libraries alcotest kcas eio.mock eio_windows))
-
-|}
\ No newline at end of file