diff --git a/systems/jeeves/docker/grafana.nix b/systems/jeeves/docker/grafana.nix
deleted file mode 100644
index d1d3c23..0000000
--- a/systems/jeeves/docker/grafana.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-let
-  vars = import ../vars.nix;
-in
-{
-  virtualisation.oci-containers.containers.grafana = {
-    image = "grafana/grafana-enterprise:latest";
-    volumes = [ "${vars.media_docker_configs}/grafana:/var/lib/grafana" ];
-    user = "600:600";
-    extraOptions = [ "--network=web" ];
-    autoStart = true;
-  };
-}
diff --git a/systems/jeeves/docker/haproxy.cfg b/systems/jeeves/docker/haproxy.cfg
index 48d4874..d20e75e 100644
--- a/systems/jeeves/docker/haproxy.cfg
+++ b/systems/jeeves/docker/haproxy.cfg
@@ -28,7 +28,6 @@ frontend ContentSwitching
   acl host_audiobookshelf  hdr(host) -i audiobookshelf.tmmworkshop.com
   acl host_cache  hdr(host) -i cache.tmmworkshop.com
   acl host_filebrowser  hdr(host) -i filebrowser.tmmworkshop.com
-  acl host_grafana  hdr(host) -i grafana.tmmworkshop.com
   acl host_homeassistant  hdr(host) -i homeassistant.tmmworkshop.com
   acl host_jellyfin  hdr(host) -i jellyfin.tmmworkshop.com
   acl host_photoprism  hdr(host) -i photoprism.tmmworkshop.com
@@ -38,7 +37,6 @@ frontend ContentSwitching
   use_backend audiobookshelf_nodes if host_audiobookshelf
   use_backend cache_nodes  if host_cache
   use_backend filebrowser_nodes  if host_filebrowser
-  use_backend grafana_nodes  if host_grafana
   use_backend homeassistant_nodes  if host_homeassistant
   use_backend jellyfin if host_jellyfin
   use_backend photoprism_nodes  if host_photoprism
@@ -53,10 +51,6 @@ backend cache_nodes
   mode http
   server server 192.168.90.40:5000
 
-backend grafana_nodes
-  mode http
-  server server grafana:3000
-
 backend filebrowser_nodes
   mode http
   server server filebrowser:8080
diff --git a/systems/jeeves/docker/postgresql.nix b/systems/jeeves/docker/postgresql.nix
deleted file mode 100644
index c32f63d..0000000
--- a/systems/jeeves/docker/postgresql.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-let
-  vars = import ../vars.nix;
-in
-{
-  users = {
-    users.postgres = {
-      isSystemUser = true;
-      group = "postgres";
-      uid = 999;
-    };
-    groups.postgres = {
-      gid = 999;
-    };
-  };
-
-  virtualisation.oci-containers.containers = {
-    postgres = {
-      image = "postgres:17";
-      ports = [ "5432:5432" ];
-      volumes = [ "${vars.media_database}/postgres:/var/lib/postgresql/data" ];
-      environment = {
-        POSTGRES_USER = "admin";
-        POSTGRES_DB = "archive";
-        POSTGRES_INITDB_ARGS = "--auth-host=scram-sha-256";
-      };
-      environmentFiles = [ "${vars.storage_secrets}/docker/postgres" ];
-      autoStart = true;
-      user = "postgres:postgres";
-    };
-  };
-
-}
diff --git a/systems/jeeves/docker/reverse_proxy.nix b/systems/jeeves/docker/reverse_proxy.nix
index a548223..021a9ee 100644
--- a/systems/jeeves/docker/reverse_proxy.nix
+++ b/systems/jeeves/docker/reverse_proxy.nix
@@ -16,7 +16,6 @@ in
       dependsOn = [
         "audiobookshelf"
         "filebrowser"
-        "grafana"
         "photoprism"
         "uptime_kuma"
       ];