diff --git a/bin/worker.ml b/bin/worker.ml
index 50ed524e..3f4c1e0c 100644
--- a/bin/worker.ml
+++ b/bin/worker.ml
@@ -129,7 +129,7 @@ module Obuilder_config = struct
       | None -> None
       | Some store -> Some (Cluster_worker.Obuilder_config.v sandbox_config store)
     in
-    Term.(const make $ Obuilder.Runc_sandbox.cmdliner $ store)
+    Term.(const make $ Obuilder.Sandbox.cmdliner $ store)
 end
 
 let worker_opts_t =
diff --git a/obuilder b/obuilder
index 671a2400..73a177fc 160000
--- a/obuilder
+++ b/obuilder
@@ -1 +1 @@
-Subproject commit 671a2400528f29736dc446813f0699055d8e631b
+Subproject commit 73a177fcef506125a3699723e3e0ed58a9b08ae3
diff --git a/worker/cluster_worker.mli b/worker/cluster_worker.mli
index 3504aeed..1ca33a4b 100644
--- a/worker/cluster_worker.mli
+++ b/worker/cluster_worker.mli
@@ -7,7 +7,7 @@ type job_spec = [
 module Obuilder_config : sig
   type t
 
-  val v : Obuilder.Runc_sandbox.config -> [ `Btrfs of string | `Rsync of string | `Zfs of string ] -> t
+  val v : Obuilder.Sandbox.config -> [ `Btrfs of string | `Rsync of string | `Zfs of string ] -> t
 end
 
 type build = 
diff --git a/worker/obuilder_build.ml b/worker/obuilder_build.ml
index 5fc333e6..a377cf4f 100644
--- a/worker/obuilder_build.ml
+++ b/worker/obuilder_build.ml
@@ -7,7 +7,7 @@ type builder = Builder : (module Obuilder.BUILDER with type t = 'a) * 'a -> buil
 module Config = struct
   type t = {
     store_spec : [ `Btrfs of string | `Rsync of string | `Zfs of string ];
-    sandbox_config : Obuilder.Runc_sandbox.config;
+    sandbox_config : Obuilder.Sandbox.config;
   }
 
   let v sandbox_config store_spec = { store_spec; sandbox_config }
@@ -21,7 +21,7 @@ type t = {
   prune_threshold : float option;
 }
 
-module Sandbox = Obuilder.Runc_sandbox
+module Sandbox = Obuilder.Sandbox
 module Fetcher = Obuilder.Docker
 
 let ( / ) = Filename.concat
diff --git a/worker/obuilder_build.mli b/worker/obuilder_build.mli
index 24215b27..c22e873b 100644
--- a/worker/obuilder_build.mli
+++ b/worker/obuilder_build.mli
@@ -3,7 +3,7 @@ type t
 module Config : sig
   type t
 
-  val v : Obuilder.Runc_sandbox.config -> [ `Btrfs of string | `Rsync of string | `Zfs of string ] -> t
+  val v : Obuilder.Sandbox.config -> [ `Btrfs of string | `Rsync of string | `Zfs of string ] -> t
 end
 
 val create : ?prune_threshold:float -> Config.t -> t Lwt.t