diff --git a/hosts/koi/services/geesefs.nix b/hosts/koi/services/geesefs.nix
index 09dfd32..d7a748a 100644
--- a/hosts/koi/services/geesefs.nix
+++ b/hosts/koi/services/geesefs.nix
@@ -39,6 +39,7 @@
     bucket = "desu-priv";
     mountPoint = "/mnt/s3-desu-priv";
   };
+  systemd.services.geesefs.after = [ "coredns.service" ];
 
   services.gocryptfs = {
     enable = true;
diff --git a/services/geesefs.nix b/services/geesefs.nix
index af90223..b6709cd 100644
--- a/services/geesefs.nix
+++ b/services/geesefs.nix
@@ -33,7 +33,6 @@
     cfg = config.services.geesefs;
 
     allArgs = cfg.args ++ [
-      "-f" # foreground
       cfg.bucket
       cfg.mountPoint
     ];
@@ -46,7 +45,10 @@
       serviceConfig = {
         User = "root";
         Group = "root";
+        Type = "forking";
+        GuessMainPID = true;
         ExecStart = "${cfg.package}/bin/geesefs ${builtins.concatStringsSep " " (map lib.escapeShellArg allArgs)}";
+        ExecStop = "fusermount -u ${lib.escapeShellArg cfg.mountPoint}";
         Restart = "on-failure";
       };
     };