diff --git a/Caddyfile b/conf/Caddyfile
similarity index 100%
rename from Caddyfile
rename to conf/Caddyfile
diff --git a/conf/supervisord.conf b/conf/supervisord.conf
new file mode 100644
index 0000000..8c1597e
--- /dev/null
+++ b/conf/supervisord.conf
@@ -0,0 +1,11 @@
+[program-default]
+stderr_logfile = /dev/stderr
+stopsignal = TERM
+autorestart = true
+
+[program:pages]
+command = /bin/git-pages
+
+[program:caddy]
+command = /bin/caddy run
+depends_on = pages
diff --git a/flake.nix b/flake.nix
index a9057f2..c07fab6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,6 +32,16 @@
             ];
           };
 
+          buildInputs = with pkgs; [
+            pkgsStatic.musl
+          ];
+
+          ldflags = [
+            "-linkmode external"
+            "-extldflags -static"
+            "-s -w"
+          ];
+
           vendorHash = "sha256-f2+NDRrgqlyRn7kiBYbuUhDsQPF3Yf/3v24lqBUja6s=";
 
           fixupPhase = ''
diff --git a/fly.toml b/fly.toml
index e33c0e7..e98dee6 100644
--- a/fly.toml
+++ b/fly.toml
@@ -6,8 +6,7 @@
 #  - GIT_PAGES_CONFIG
 
 [build]
-dockerfile = "Dockerfile"
-# image = "registry.fly.io/git-pages-dev:latest"
+image = "registry.fly.io/git-pages:latest"
 
 [experimental]
 cmd = ["supervisord"]
diff --git a/nix/pkgs/image.nix b/nix/pkgs/image.nix
index 34be0e1..9f9ae9f 100644
--- a/nix/pkgs/image.nix
+++ b/nix/pkgs/image.nix
@@ -1,69 +1,63 @@
 {
-  buildEnv,
   caddy,
   callPackage,
   dockerTools,
   git-pages,
+  pkgsStatic,
   runtimeShell,
   self,
+  upx,
   writeTextDir,
   ...
 }:
 
 let
-  caddy' = caddy.withPlugins {
-    plugins = [
-      "github.com/ss098/certmagic-s3@v0.0.0-20250808023250-9788b7231c87"
-    ];
+  caddy' =
+    (caddy.withPlugins {
+      plugins = [
+        "github.com/ss098/certmagic-s3@v0.0.0-20250808023250-9788b7231c87"
+      ];
 
-    hash = "sha256-jZer6cBnE2Vo5/kMG+1vZBwWY8P/V1Lb33TA3Suz4pI=";
-  };
+      hash = "sha256-jZer6cBnE2Vo5/kMG+1vZBwWY8P/V1Lb33TA3Suz4pI=";
+    }).overrideAttrs
+      (oldAttrs: {
+        buildInputs = with pkgsStatic; [
+          musl
+        ];
+
+        ldflags = oldAttrs.ldflags ++ [
+          "-linkmode external"
+          "-extldflags -static"
+          "-s -w"
+        ];
+      });
 
   supervisord = callPackage ./supervisord.nix { };
-
-  supervisord-config = writeTextDir "app/supervisord.conf" ''
-    [program-default]
-    stderr_logfile = /dev/stderr
-    stopsignal = TERM
-    autorestart = true
-
-    [program:pages]
-    command = /bin/git-pages
-
-    [program:caddy]
-    command = /bin/caddy run
-    depends_on = pages
-  '';
 in
 dockerTools.buildImage {
   name = "git-pages";
   tag = "latest";
 
-  copyToRoot = buildEnv {
-    name = "image-root";
-
-    paths = [
-      caddy'
-      git-pages
-      supervisord
-      supervisord-config
-
-      dockerTools.caCertificates
-    ];
-
-    pathsToLink = [
-      "/app"
-      "/bin"
-      "/etc"
-    ];
-  };
+  copyToRoot = with dockerTools; [
+    caCertificates
+  ];
 
   runAsRoot = ''
     #!${runtimeShell}
 
-    cp ${self}/Caddyfile /app/Caddyfile
+    mkdir -p /app/data
+    mkdir /bin
+
     cp ${self}/config.toml.example /app/config.toml
-    mkdir /app/data
+    cp ${self}/conf/Caddyfile /app/Caddyfile
+    cp ${self}/conf/supervisord.conf /app/supervisord.conf
+
+    cp ${caddy'}/bin/caddy /bin/caddy
+    cp ${git-pages}/bin/git-pages /bin/git-pages
+    cp ${supervisord}/bin/supervisord /bin/supervisord
+
+    chmod +w /bin/*
+    ${upx}/bin/upx /bin/*
   '';
 
   config = {
diff --git a/nix/pkgs/supervisord.nix b/nix/pkgs/supervisord.nix
index 3bea862..a859823 100644
--- a/nix/pkgs/supervisord.nix
+++ b/nix/pkgs/supervisord.nix
@@ -29,6 +29,7 @@ buildGoModule rec {
   ldflags = [
     "-linkmode external"
     "-extldflags -static"
+    "-s -w"
   ];
 
   subPackages = ".";