diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..8988448
--- /dev/null
+++ b/.envrc
@@ -0,0 +1,3 @@
+# shellcheck shell=bash
+layout node
+layout opam
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 3b17491..1c55ae3 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -24,7 +24,7 @@ jobs:
       - run: corepack enable
       - run: yarn install --immutable
       - run: opam install . --deps-only
-      - run: make
+      - run: opam exec -- yarn exec -- make
       - run: node dist/main.bc.js
 
   lint-fmt:
diff --git a/.yarnrc.yml b/.yarnrc.yml
index 5695c88..4a2f46f 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,5 +1,5 @@
 defaultSemverRangePrefix: ""
 
-nodeLinker: pnpm
+nodeLinker: node-modules
 
 preferInteractive: true
diff --git a/Makefile b/Makefile
index 12fde96..16fc325 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ all: clean bindings build
 
 .PHONY: pretty-bytes
 pretty-bytes:
-	yarn exec -- ts2ocaml jsoo node_modules/pretty-bytes/index.d.ts \
+	ts2ocaml jsoo node_modules/pretty-bytes/index.d.ts \
 		--output-dir=lib \
 		--preset=full \
 		--simplify \
@@ -16,8 +16,8 @@ bindings: pretty-bytes
 
 .PHONY: build
 build:
-	opam exec -- dune build @all --profile=release
-	yarn exec -- esbuild _build/default/bin/main.bc.js \
+	dune build @all --profile=release
+	esbuild _build/default/bin/main.bc.js \
 		--bundle \
 		--minify \
 		--outdir=dist \
@@ -26,10 +26,10 @@ build:
 
 .PHONY: fmt
 fmt:
-	opam exec -- dune build @fmt --auto-promote
+	dune build @fmt --auto-promote
 
 .PHONY: clean
 clean:
 	-rm -r dist/
 	-rm lib/*.{mli,js}
-	opam exec -- dune clean
+	dune clean