diff --git a/dune b/dune
index a8c2af2c0..87f1c9e8e 100644
--- a/dune
+++ b/dune
@@ -5,6 +5,9 @@
 (rule
  (copy lsp.opam.template jsonrpc.opam.template))
 
+(rule
+ (copy lsp.opam.template ocaml-lsp-server.opam.template))
+
 (env
  (_
   (flags :standard -alert -unstable)))
diff --git a/dune-project b/dune-project
index a7616fb78..f4ef3dad6 100644
--- a/dune-project
+++ b/dune-project
@@ -46,6 +46,8 @@ possible and does not make any assumptions about IO.
  (depends
   yojson
   base
+  (lsp (= :version))
+  (jsonrpc (= :version))
   (re (>= 1.5.0))
   (ppx_yojson_conv_lib (>= "v0.14"))
   (dune-rpc (>= 3.4.0))
diff --git a/ocaml-lsp-server.opam b/ocaml-lsp-server.opam
index f0609e6d8..de7f25665 100644
--- a/ocaml-lsp-server.opam
+++ b/ocaml-lsp-server.opam
@@ -22,6 +22,8 @@ depends: [
   "dune" {>= "3.0"}
   "yojson"
   "base"
+  "lsp" {= version}
+  "jsonrpc" {= version}
   "re" {>= "1.5.0"}
   "ppx_yojson_conv_lib" {>= "v0.14"}
   "dune-rpc" {>= "3.4.0"}
@@ -51,9 +53,11 @@ build: [
   [
     "dune"
     "build"
+    "-p"
+    name
     "-j"
     jobs
-    "ocaml-lsp-server.install"
-    "--release"
+    "@install"
+    "@doc" {with-doc}
   ]
 ]
diff --git a/ocaml-lsp-server.opam.template b/ocaml-lsp-server.opam.template
deleted file mode 100644
index 445e88748..000000000
--- a/ocaml-lsp-server.opam.template
+++ /dev/null
@@ -1,11 +0,0 @@
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-j"
-    jobs
-    "ocaml-lsp-server.install"
-    "--release"
-  ]
-]