diff --git a/.gitignore b/.gitignore
index b016d04..deff5ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .env
 .direnv
+result
\ No newline at end of file
diff --git a/flake.nix b/flake.nix
index 58db685..f26aff2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,31 +8,50 @@
 
   outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } {
     systems = [ "x86_64-linux" "aarch64-linux" ];
-    perSystem = { config, self', pkgs, lib, system, ... }: {
+    perSystem = { config, self', pkgs, lib, system, ... }: rec {
       devShells.default = import ./shell.nix { inherit pkgs; };
 
       packages = let 
         vendorHash = "sha256-A5hZxo0zZ3w6qryV24PjYaKQatN2G2heyuee6QaU55M=";
+        isolateBinary = pkg: name: pkgs.stdenvNoCC.mkDerivation {
+          name = "saerro-${name}";
+          version = "1.0.0";
+          src = pkg;
+          installPhase = ''
+            mkdir -p $out/bin
+            cp $src/bin/${name} $out/bin/${name}
+          '';
+        };
       in rec {
         default = saerro;
         saerro = pkgs.buildGoModule {
           inherit vendorHash;
-          name = "saerro-ws";
+          name = "saerro";
           src = ./.;
           subPackages = [
             "cmd/ws"
             "cmd/pruner"
           ];
         };
-        ws = pkgs.ociTools.buildContainer {
-          args = [
-            "${saerro}/ws"
+        ws = pkgs.dockerTools.buildImage {
+          name = "ps2.live/saerro/ws";
+          tag = "latest";
+          copyToRoot = [ 
+            pkgs.dockerTools.caCertificates
           ];
+          config = {
+            Cmd = [ "${isolateBinary saerro "ws"}/bin/ws" ];
+          };
         };
-        pruner = pkgs.ociTools.buildContainer {
-          args = [
-            "${saerro}/pruner"
+        pruner = pkgs.dockerTools.buildImage {
+          name = "ps2.live/saerro/pruner";
+          tag = "latest";
+          copyToRoot = [ 
+            pkgs.dockerTools.caCertificates
           ];
+          config = {
+            Cmd = [ "${isolateBinary saerro "pruner"}/bin/pruner" ];
+          };
         };
       };
     };
diff --git a/result b/result
deleted file mode 120000
index c01530c..0000000
--- a/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/aa9byv99dpxncm4pf9baih91ni4x23cw-join
\ No newline at end of file