diff --git a/modules/server/containers/builder.nix b/modules/server/containers/builder.nix
index 0316723..7115935 100644
--- a/modules/server/containers/builder.nix
+++ b/modules/server/containers/builder.nix
@@ -34,10 +34,15 @@ let
 in {
   mkContainer = builder;
   mkData = { name, dir, vars?{} }: pkgs.runCommand name vars ''
-    export PATH="${pkgs.buildPackages.substituteAll}/bin:$PATH"
     mkdir -p $out
     cp -r ./data/${dir}/. $out/
-    find $out -type f -exec substituteAllInPlace {} + 
+    find $out -type f | while read file; do
+      ${pkgs.replaceVarsWith {
+        name = "temp-sub";
+        src = "/dev/null"; # Dummy src, we use the script logic below
+        replacements = vars;
+      }}/bin/replace-vars "$file" --replace-inplace
+    done
   '';
   host = "host.containers.internal"; 
 }
\ No newline at end of file