diff --git a/Makefile b/Makefile
index 11fb5ad..71609d5 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,7 @@ install:
 	if ! [ -e _opam ]; then \
 		opam switch create . --empty ; \
 	fi
-	opam install . --deps-only --with-test --yes
-	opam install -y ocaml-lsp-server ocamlformat
+	opam install . --deps-only --working-dir --with-test --with-dev-setup --yes
 
 update:
 	opam update
diff --git a/dune-project b/dune-project
index 55b8872..f57164d 100644
--- a/dune-project
+++ b/dune-project
@@ -35,4 +35,6 @@
   re
   uri
   yaml
-  yojson))
+  yojson
+  (ocaml-lsp-server :with-dev-setup)
+  (ocamlformat :with-dev-setup)))
diff --git a/osnap.opam b/osnap.opam
index 15e2cd9..f6d98a1 100644
--- a/osnap.opam
+++ b/osnap.opam
@@ -26,6 +26,8 @@ depends: [
   "uri"
   "yaml"
   "yojson"
+  "ocaml-lsp-server" {with-dev-setup}
+  "ocamlformat" {with-dev-setup}
   "odoc" {with-doc}
 ]
 build: [
@@ -46,7 +48,8 @@ dev-repo: "git+https://github.com/eWert-Online/OSnap.git"
 pin-depends: [
   [ "cdp.dev" "git+https://github.com/eWert-Online/reason-cdp.git#a0579cb4789b8ccf1cc4342b9885a46cf1549012"]
   [ "eio-ssl.dev" "git+https://github.com/anmonteiro/eio-ssl.git#0.3.0"]
-  [ "httpun-ws.dev" "git+https://github.com/eWert-Online/httpun-ws.git#fec8721c4eb67ef0c9436677916473ab81a1ebbe"]
+  [ "httpun-ws.dev" "git+https://github.com/anmonteiro/httpun-ws.git"]
+  [ "httpun-ws-eio.dev" "git+https://github.com/anmonteiro/httpun-ws.git"]
   [ "libspng.dev" "git+https://github.com/eWert-Online/esy-libspng.git#opam"]
   [ "multipart_form.dev" "git+https://github.com/anmonteiro/multipart_form.git"]
   [ "odiff-core.dev" "git+https://github.com/dmtrKovalenko/odiff.git#5a9a1976c553b6c57c32c4e9dcf185bbcdaf1fca"]
diff --git a/osnap.opam.template b/osnap.opam.template
index c9af815..63fb759 100644
--- a/osnap.opam.template
+++ b/osnap.opam.template
@@ -1,7 +1,8 @@
 pin-depends: [
   [ "cdp.dev" "git+https://github.com/eWert-Online/reason-cdp.git#a0579cb4789b8ccf1cc4342b9885a46cf1549012"]
   [ "eio-ssl.dev" "git+https://github.com/anmonteiro/eio-ssl.git#0.3.0"]
-  [ "httpun-ws.dev" "git+https://github.com/eWert-Online/httpun-ws.git#fec8721c4eb67ef0c9436677916473ab81a1ebbe"]
+  [ "httpun-ws.dev" "git+https://github.com/anmonteiro/httpun-ws.git"]
+  [ "httpun-ws-eio.dev" "git+https://github.com/anmonteiro/httpun-ws.git"]
   [ "libspng.dev" "git+https://github.com/eWert-Online/esy-libspng.git#opam"]
   [ "multipart_form.dev" "git+https://github.com/anmonteiro/multipart_form.git"]
   [ "odiff-core.dev" "git+https://github.com/dmtrKovalenko/odiff.git#5a9a1976c553b6c57c32c4e9dcf185bbcdaf1fca"]