diff --git a/.gitmodules b/.gitmodules
index e69de29b..c3ff424b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "obuilder"]
+	path = obuilder
+	url = https://github.com/ocurrent/obuilder.git
+	branch = master
diff --git a/Dockerfile b/Dockerfile
index e7351a5d..23ef2b34 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ocaml/opam:debian-11-ocaml-4.14@sha256:698cd4a3d59912f89deb3c8cb05b9299a870b27086d212877f5f3c88f4021b74 AS build
+FROM ocaml/opam:debian-11-ocaml-4.14@sha256:1161c383ca79f11d5e5d7fc69910ac255871fde0cbc0815faa0a6424f929b181 AS build
 RUN sudo apt-get update && sudo apt-get install libev-dev capnproto m4 pkg-config libsqlite3-dev libgmp-dev -y --no-install-recommends
-RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 57f1b681ce75766a17f15588c2088174edbb89c9 && opam update
+RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 56a03100e6d037e7c0e116ed34ec87b11aa3b592 && opam update
 COPY --chown=opam ocluster-api.opam ocluster.opam /src/
 COPY --chown=opam obuilder/obuilder.opam obuilder/obuilder-spec.opam /src/obuilder/
 RUN opam pin -yn /src/obuilder/
diff --git a/Dockerfile.worker b/Dockerfile.worker
index 14920bef..34ce11a0 100644
--- a/Dockerfile.worker
+++ b/Dockerfile.worker
@@ -1,6 +1,6 @@
-FROM ocaml/opam:ubuntu-22.04-ocaml-4.14@sha256:3d379b4a575d050ea02b1146f03d7ab28ccf15e6fecdada5595b0b04a8a307d0 AS build
+FROM ocaml/opam:debian-11-ocaml-4.14@sha256:1161c383ca79f11d5e5d7fc69910ac255871fde0cbc0815faa0a6424f929b181 AS build
 RUN sudo apt-get update && sudo apt-get install libev-dev capnproto m4 pkg-config libsqlite3-dev libgmp-dev -y --no-install-recommends
-RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 57f1b681ce75766a17f15588c2088174edbb89c9 && opam update
+RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 56a03100e6d037e7c0e116ed34ec87b11aa3b592 && opam update
 COPY --chown=opam ocluster-api.opam ocluster.opam /src/
 COPY --chown=opam obuilder/obuilder.opam obuilder/obuilder-spec.opam /src/obuilder/
 RUN opam pin -yn /src/obuilder/
diff --git a/obuilder b/obuilder
new file mode 160000
index 00000000..8dbe2dd6
--- /dev/null
+++ b/obuilder
@@ -0,0 +1 @@
+Subproject commit 8dbe2dd66b344198c9709a3432ed55ba8a5cb113
diff --git a/test/dune b/test/dune
index d87ae9e3..ba7f233e 100644
--- a/test/dune
+++ b/test/dune
@@ -16,7 +16,6 @@
 
 (library
   (name ocluster_expect_tests)
-  (package ocluster)
   (modules test_scheduling)
   (inline_tests)
   (preprocess (pps ppx_expect))