diff --git a/.gitignore b/.gitignore
index b888df5ef..b9fd9a534 100644
--- a/.gitignore
+++ b/.gitignore
@@ -167,3 +167,4 @@ ecies_bindings_wasm/
 
 chain_urls.json
 result/**
+result
diff --git a/nix/mls_validation_service/default.nix b/nix/mls_validation_service/default.nix
index 03c044f28..87d5dac13 100644
--- a/nix/mls_validation_service/default.nix
+++ b/nix/mls_validation_service/default.nix
@@ -1,16 +1,21 @@
-{ pkgs, craneLib, filesets }:
+{
+  pkgs,
+  craneLib,
+  filesets,
+}:
 let
   mls_validation_service = pkgs.callPackage ./crate.nix { inherit craneLib filesets; };
   muslService = pkgs.pkgsCross.musl64.callPackage ./crate.nix {
-    inherit craneLib filesets; rustTarget = "x86_64-unknown-linux-musl";
+    inherit craneLib filesets;
+    rustTarget = "x86_64-unknown-linux-musl";
   };
 
-  dockerImage = pkgs.dockerTools.buildImage {
-    name = "mls_validation_service";
+  dockerImage = pkgs.dockerTools.streamLayeredImage {
+    name = "xmtp/mls_validation_service";
     tag = "latest";
-    copyToRoot = [ muslService.bin ];
+    contents = [ muslService.bin ];
     config = {
-      Cmd = [ "${muslService.bin}/bin/xdbg --help" ];
+      Cmd = [ "${muslService.bin}/bin/mls_validation_service" ];
     };
   };
 in
@@ -20,4 +25,3 @@ in
   inherit muslService;
   inherit dockerImage;
 }
-
diff --git a/nix/xdbg/default.nix b/nix/xdbg/default.nix
index 6c3ae1214..d34947138 100644
--- a/nix/xdbg/default.nix
+++ b/nix/xdbg/default.nix
@@ -1,16 +1,21 @@
-{ pkgs, craneLib, filesets }:
+{
+  pkgs,
+  craneLib,
+  filesets,
+}:
 let
   xdbg = pkgs.callPackage ./crate.nix { inherit craneLib filesets; };
   muslXDbg = pkgs.pkgsCross.musl64.callPackage ./crate.nix {
-    inherit craneLib filesets; rustTarget = "x86_64-unknown-linux-musl";
+    inherit craneLib filesets;
+    rustTarget = "x86_64-unknown-linux-musl";
   };
 
-  dockerImage = pkgs.dockerTools.buildImage {
-    name = "xdbg";
+  dockerImage = pkgs.dockerTools.streamLayeredImage {
+    name = "xmtp/xdbg";
     tag = "latest";
-    copyToRoot = [ muslXDbg.bin ];
+    contents = [ muslXDbg.bin ];
     config = {
-      Cmd = [ "${muslXDbg.bin}/bin/xdbg --help" ];
+      Cmd = [ "${muslXDbg.bin}/bin/xdbg" ];
     };
   };
 in
@@ -20,4 +25,3 @@ in
   inherit muslXDbg;
   inherit dockerImage;
 }
-