diff --git a/dune-project b/dune-project
index c7f9767e8..956137c17 100644
--- a/dune-project
+++ b/dune-project
@@ -1,4 +1,4 @@
-(lang dune 2.0)
+(lang dune 2.7)
 
 (name lwt)
 
diff --git a/lwt.opam b/lwt.opam
index f2cb21e1b..bc59b1d1e 100644
--- a/lwt.opam
+++ b/lwt.opam
@@ -20,7 +20,7 @@ homepage: "https://github.com/ocsigen/lwt"
 doc: "https://ocsigen.org/lwt"
 bug-reports: "https://github.com/ocsigen/lwt/issues"
 depends: [
-  "dune" {>= "2.0"}
+  "dune" {>= "2.7"}
   "ocaml" {>= "4.08"}
   "cppo" {build & >= "1.1.0"}
   "ocamlfind" {dev & >= "1.7.3-1"}
diff --git a/lwt_ppx.opam b/lwt_ppx.opam
index 4bdd4df72..68b2faf99 100644
--- a/lwt_ppx.opam
+++ b/lwt_ppx.opam
@@ -11,13 +11,13 @@ homepage: "https://github.com/ocsigen/lwt"
 doc: "https://ocsigen.org/lwt"
 bug-reports: "https://github.com/ocsigen/lwt/issues"
 depends: [
-  "dune" {>= "2.0"}
+  "dune" {>= "2.7"}
   "ocaml" {>= "4.08"}
   "ppxlib" {>= "0.16.0"}
   "ppx_let" {with-test}
   "lwt"
+  "odoc" {with-doc}
 ]
-dev-repo: "git+https://github.com/ocsigen/lwt.git"
 build: [
   ["dune" "subst"] {dev}
   [
@@ -32,3 +32,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+dev-repo: "git+https://github.com/ocsigen/lwt.git"
diff --git a/lwt_ppx.opam.template b/lwt_ppx.opam.template
deleted file mode 100644
index 87c8e5dcd..000000000
--- a/lwt_ppx.opam.template
+++ /dev/null
@@ -1,14 +0,0 @@
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-]
diff --git a/lwt_react.opam b/lwt_react.opam
index 39a9f58d9..975424697 100644
--- a/lwt_react.opam
+++ b/lwt_react.opam
@@ -10,13 +10,13 @@ homepage: "https://github.com/ocsigen/lwt"
 doc: "https://ocsigen.org/lwt"
 bug-reports: "https://github.com/ocsigen/lwt/issues"
 depends: [
-  "dune" {>= "2.0"}
+  "dune" {>= "2.7"}
   "ocaml" {>= "4.08"}
   "cppo" {build & >= "1.1.0"}
   "lwt" {>= "3.0.0"}
   "react" {>= "1.0.0"}
+  "odoc" {with-doc}
 ]
-dev-repo: "git+https://github.com/ocsigen/lwt.git"
 build: [
   ["dune" "subst"] {dev}
   [
@@ -31,3 +31,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+dev-repo: "git+https://github.com/ocsigen/lwt.git"
diff --git a/lwt_react.opam.template b/lwt_react.opam.template
deleted file mode 100644
index 87c8e5dcd..000000000
--- a/lwt_react.opam.template
+++ /dev/null
@@ -1,14 +0,0 @@
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-]