diff --git a/systems/jeeves/docker/filebrowser.nix b/systems/jeeves/docker/filebrowser.nix
deleted file mode 100644
index a1c4d57..0000000
--- a/systems/jeeves/docker/filebrowser.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-let
-  vars = import ../vars.nix;
-in
-{
-  virtualisation.oci-containers.containers.filebrowser = {
-    image = "hurlenko/filebrowser:v2.32.0";
-    extraOptions = [ "--network=web" ];
-    volumes = [
-      "/zfs:/data"
-      "${vars.media_docker_configs}/filebrowser:/config"
-    ];
-    autoStart = true;
-    user = "1000:users";
-  };
-}
diff --git a/systems/jeeves/docker/haproxy.cfg b/systems/jeeves/docker/haproxy.cfg
index d20e75e..2438f1e 100644
--- a/systems/jeeves/docker/haproxy.cfg
+++ b/systems/jeeves/docker/haproxy.cfg
@@ -53,7 +53,7 @@ backend cache_nodes
 
 backend filebrowser_nodes
   mode http
-  server server filebrowser:8080
+  server server 192.168.90.40:8080
 
 backend homeassistant_nodes
   mode http
diff --git a/systems/jeeves/docker/reverse_proxy.nix b/systems/jeeves/docker/reverse_proxy.nix
index c2db15a..6ca3cd7 100644
--- a/systems/jeeves/docker/reverse_proxy.nix
+++ b/systems/jeeves/docker/reverse_proxy.nix
@@ -15,7 +15,6 @@ in
       ];
       dependsOn = [
         "audiobookshelf"
-        "filebrowser"
         "photoprism"
         "uptime_kuma"
       ];
diff --git a/systems/jeeves/services/filebrowser.nix b/systems/jeeves/services/filebrowser.nix
new file mode 100644
index 0000000..d95e07b
--- /dev/null
+++ b/systems/jeeves/services/filebrowser.nix
@@ -0,0 +1,23 @@
+{
+  pkgs,
+  ...
+}:
+let
+  vars = import ../vars.nix;
+in
+{
+  networking.firewall.allowedTCPPorts = [ 8080 ];
+
+  systemd.services.filebrowser = {
+    description = "filebrowser";
+    after = [ "network.target" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "simple";
+      User = "richie";
+      Group = "users";
+      ExecStart = "${pkgs.filebrowser}/bin/filebrowser --root=/zfs --address=0.0.0.0 --database=${vars.media_docker_configs}/filebrowser/filebrowser.db";
+      Restart = "on-failure";
+    };
+  };
+}