diff --git a/hosts/h001/containers/dawarich.nix b/hosts/h001/containers/dawarich.nix
deleted file mode 100644
index d62be2b3..00000000
--- a/hosts/h001/containers/dawarich.nix
+++ /dev/null
@@ -1,248 +0,0 @@
-{
-  config,
-  lib,
-  inputs,
-  ...
-}:
-let
-  name = "dawarich";
-
-  # Data stored on the wd10 drive as requested
-  hostDataDir = "/drives/wd10/${name}";
-
-  hostAddress = "10.0.0.1";
-  containerAddress = "10.0.0.4";
-  hostAddress6 = "fc00::1";
-  containerAddress6 = "fc00::4";
-
-  dawarichNixpkgs = inputs.dawarich-nixpkgs;
-
-  domain = "location.joshuabell.xyz";
-  webPort = 3001;
-
-  binds = [
-    # Postgres data, must use postgres user in container and host
-    {
-      host = "${hostDataDir}/postgres";
-      container = "/var/lib/postgresql/17";
-      user = "postgres";
-      uid = config.ids.uids.postgres;
-      gid = config.ids.gids.postgres;
-    }
-    # Postgres backups
-    {
-      host = "${hostDataDir}/backups/postgres";
-      container = "/var/backup/postgresql";
-      user = "postgres";
-      uid = config.ids.uids.postgres;
-      gid = config.ids.gids.postgres;
-    }
-    # Redis data
-    {
-      host = "${hostDataDir}/redis";
-      container = "/var/lib/redis-dawarich";
-      user = "redis-dawarich";
-      uid = 976;
-      gid = 976;
-    }
-    # Dawarich app data (uploads, cache, etc.)
-    {
-      host = "${hostDataDir}/data";
-      container = "/var/lib/dawarich";
-      user = "dawarich";
-      uid = 977;
-      gid = 977;
-    }
-    # Secret key base file - manual setup
-    # Uncomment when you have created the secret file
-    # {
-    #   host = "${hostDataDir}/secrets/secret_key_base";
-    #   container = "/var/secrets/secret_key_base";
-    #   readOnly = true;
-    # }
-  ];
-
-  bindsWithUsers = lib.filter (b: b ? user) binds;
-  uniqueUsers = lib.foldl' (
-    acc: bind: if lib.lists.any (item: item.user == bind.user) acc then acc else acc ++ [ bind ]
-  ) [ ] bindsWithUsers;
-
-  users = {
-    users = lib.listToAttrs (
-      lib.map (u: {
-        name = u.user;
-        value = {
-          isSystemUser = true;
-          name = u.user;
-          uid = u.uid;
-          group = u.user;
-        };
-      }) uniqueUsers
-    );
-
-    groups = lib.listToAttrs (
-      lib.map (g: {
-        name = g.user;
-        value.gid = g.gid;
-      }) uniqueUsers
-    );
-  };
-in
-{
-  options = { };
-
-  config = {
-    services.nginx.virtualHosts."${domain}" = {
-      addSSL = true;
-      sslCertificate = "/var/lib/acme/joshuabell.xyz/fullchain.pem";
-      sslCertificateKey = "/var/lib/acme/joshuabell.xyz/key.pem";
-      locations = {
-        "/" = {
-          proxyWebsockets = true;
-          recommendedProxySettings = true;
-          proxyPass = "http://${containerAddress}:${toString webPort}";
-          extraConfig = ''
-            proxy_set_header X-Forwarded-Proto https;
-          '';
-        };
-      };
-    };
-
-    # Ensure users exist on host machine
-    inherit users;
-
-    # Ensure directories exist on host machine
-    system.activationScripts."createDirsFor${name}" = ''
-      ${lib.concatStringsSep "\n" (
-        lib.map (bind: ''
-          mkdir -p ${bind.host}
-          chown -R ${toString bind.user}:${toString bind.gid} ${bind.host}
-          chmod -R 750 ${bind.host}
-        '') bindsWithUsers
-      )}
-      # Create secrets directory (for manual secret key base setup)
-      mkdir -p ${hostDataDir}/secrets
-      chmod 700 ${hostDataDir}/secrets
-    '';
-
-    containers.${name} = {
-      ephemeral = true;
-      autoStart = true;
-      privateNetwork = true;
-      hostAddress = hostAddress;
-      localAddress = containerAddress;
-      hostAddress6 = hostAddress6;
-      localAddress6 = containerAddress6;
-      bindMounts = lib.foldl (
-        acc: bind:
-        {
-          "${bind.container}" = {
-            hostPath = bind.host;
-            isReadOnly = bind.readOnly or false;
-          };
-        }
-        // acc
-      ) { } binds;
-      nixpkgs = dawarichNixpkgs;
-      config =
-        {
-          config,
-          pkgs,
-          lib,
-          ...
-        }:
-        {
-          config = {
-            system.stateVersion = "25.05";
-
-            networking = {
-              firewall = {
-                enable = true;
-                allowedTCPPorts = [ webPort ];
-              };
-              # Use systemd-resolved inside the container
-              # Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686
-              useHostResolvConf = lib.mkForce false;
-            };
-            services.resolved.enable = true;
-
-            # Ensure users exist on container
-            inherit users;
-
-            services.postgresql = {
-              enable = true;
-              package = pkgs.postgresql_17.withJIT;
-              enableJIT = true;
-              authentication = ''
-                local all all trust
-                host all all 127.0.0.1/8 trust
-                host all all ::1/128 trust
-                host all all fc00::1/128 trust
-              '';
-              ensureDatabases = [ "dawarich" ];
-              ensureUsers = [
-                {
-                  name = "dawarich";
-                  ensureDBOwnership = true;
-                  ensureClauses.login = true;
-                }
-              ];
-            };
-
-            # Backup database
-            services.postgresqlBackup = {
-              enable = true;
-            };
-
-            services.dawarich = {
-              enable = true;
-              webPort = webPort;
-              localDomain = domain;
-
-              # Database configuration (using local postgres)
-              database = {
-                createLocally = false; # We create it via ensureDatabases
-                host = "/var/run/postgresql";
-                name = "dawarich";
-                user = "dawarich";
-                # passwordFile not needed with socket auth
-              };
-
-              # Redis configuration
-              redis = {
-                createLocally = true;
-              };
-
-              # Secret key base - create this file manually:
-              # Generate with: openssl rand -hex 64 > /drives/wd10/dawarich/secrets/secret_key_base
-              # Then update bind mount above to include it
-              # secretKeyBaseFile = "/var/secrets/secret_key_base";
-
-              # Enable automatic migrations
-              automaticMigrations = true;
-
-              # Sidekiq configuration for background jobs
-              sidekiqThreads = 5;
-
-              # Environment variables for additional configuration
-              environment = {
-                # Set timezone if needed
-                # TIME_ZONE = "America/Chicago";
-              };
-            };
-
-            systemd.services.dawarich = {
-              requires = [
-                "postgresql.service"
-                "redis-dawarich.service"
-              ];
-              after = [
-                "postgresql.service"
-                "redis-dawarich.service"
-              ];
-            };
-          };
-        };
-    };
-  };
-}
diff --git a/hosts/h001/containers/default.nix b/hosts/h001/containers/default.nix
index d93d7073..37c50cdb 100644
--- a/hosts/h001/containers/default.nix
+++ b/hosts/h001/containers/default.nix
@@ -3,9 +3,7 @@
 }:
 {
   imports = [
-    ./dawarich.nix
     ./forgejo.nix
-    ./immich.nix
     ./opengist.nix
     ./zitadel.nix
   ];
diff --git a/hosts/h001/containers/immich.nix b/hosts/h001/containers/immich.nix
deleted file mode 100644
index 04a6f3d8..00000000
--- a/hosts/h001/containers/immich.nix
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-  config,
-  lib,
-  inputs,
-  ...
-}:
-let
-  name = "immich";
-
-  # Data stored on the wd10 drive
-  hostDataDir = "/drives/wd10/immich";
-  # Var lib for postgres and other state
-  hostVarLibDir = "/var/lib/${name}";
-
-  hostAddress = "10.0.0.1";
-  containerAddress = "10.0.0.4";
-  hostAddress6 = "fc00::1";
-  containerAddress6 = "fc00::4";
-
-  immichNixpkgs = inputs.immich-nixpkgs;
-
-  # Secret file path (if using secrets)
-  hasSecret =
-    secret:
-    let
-      secrets = config.age.secrets or { };
-    in
-    secrets ? ${secret} && secrets.${secret} != null;
-
-  binds = [
-    # Postgres data, must use postgres user in container and host
-    {
-      host = "${hostVarLibDir}/postgres";
-      # Adjust based on container postgres data dir
-      container = "/var/lib/postgresql/17";
-      user = "postgres";
-      uid = config.ids.uids.postgres;
-      gid = config.ids.gids.postgres;
-    }
-    # Postgres backups
-    {
-      host = "${hostVarLibDir}/backups/postgres";
-      container = "/var/backup/postgresql";
-      user = "postgres";
-      uid = config.ids.uids.postgres;
-      gid = config.ids.gids.postgres;
-    }
-    # Immich media data on external drive
-    {
-      host = "${hostDataDir}/media";
-      container = "/var/lib/immich";
-      user = "immich";
-      uid = 916;
-      gid = 916;
-    }
-    # Immich machine learning cache
-    {
-      host = "${hostVarLibDir}/ml-cache";
-      container = "/var/cache/immich";
-      user = "immich";
-      uid = 916;
-      gid = 916;
-    }
-  ];
-
-  bindsWithUsers = lib.filter (b: b ? user) binds;
-  uniqueUsers = lib.foldl' (
-    acc: bind: if lib.lists.any (item: item.user == bind.user) acc then acc else acc ++ [ bind ]
-  ) [ ] bindsWithUsers;
-  users = {
-    users = lib.listToAttrs (
-      lib.map (u: {
-        name = u.user;
-        value = {
-          isSystemUser = true;
-          name = u.user;
-          uid = u.uid;
-          group = u.user;
-        };
-      }) uniqueUsers
-    );
-
-    groups = lib.listToAttrs (
-      lib.map (g: {
-        name = g.user;
-        value.gid = g.gid;
-      }) uniqueUsers
-    );
-  };
-in
-{
-  options = { };
-  config = {
-    services.nginx.virtualHosts."photos.joshuabell.xyz" = {
-      addSSL = true;
-      sslCertificate = "/var/lib/acme/joshuabell.xyz/fullchain.pem";
-      sslCertificateKey = "/var/lib/acme/joshuabell.xyz/key.pem";
-      locations = {
-        "/" = {
-          proxyWebsockets = true;
-          recommendedProxySettings = true;
-          proxyPass = "http://${containerAddress}:2283";
-          extraConfig = ''
-            proxy_set_header X-Forwarded-Proto https;
-            client_max_body_size 50G;
-          '';
-        };
-      };
-    };
-
-    # Ensure users exist on host machine
-    inherit users;
-
-    # Ensure directories exist on host machine
-    system.activationScripts."createDirsFor${name}" = ''
-      ${lib.concatStringsSep "\n" (
-        lib.map (bind: ''
-          mkdir -p ${bind.host}
-          chown -R ${toString bind.uid}:${toString bind.gid} ${bind.host}
-          chmod -R 750 ${bind.host}
-        '') bindsWithUsers
-      )}
-    '';
-
-    containers.${name} = {
-      ephemeral = true;
-      autoStart = true;
-      privateNetwork = true;
-      hostAddress = hostAddress;
-      localAddress = containerAddress;
-      hostAddress6 = hostAddress6;
-      localAddress6 = containerAddress6;
-      bindMounts = lib.foldl (
-        acc: bind:
-        {
-          "${bind.container}" = {
-            hostPath = bind.host;
-            isReadOnly = bind.readOnly or false;
-          };
-        }
-        // acc
-      ) { } binds;
-      nixpkgs = immichNixpkgs;
-      config =
-        {
-          config,
-          pkgs,
-          lib,
-          ...
-        }:
-        {
-          config = {
-            system.stateVersion = "25.05";
-
-            networking = {
-              firewall = {
-                enable = true;
-                allowedTCPPorts = [
-                  2283
-                ];
-              };
-              # Use systemd-resolved inside the container
-              # Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686
-              useHostResolvConf = lib.mkForce false;
-            };
-            services.resolved.enable = true;
-
-            # Ensure users exist on container
-            inherit users;
-
-            services.postgresql = {
-              enable = true;
-              package = pkgs.postgresql_17.withPackages (ps: [ ps.pgvecto-rs ]);
-              enableJIT = true;
-              authentication = ''
-                local all all trust
-                host all all 127.0.0.1/8 trust
-                host all all ::1/128 trust
-                host all all fc00::1/128 trust
-              '';
-              ensureDatabases = [ "immich" ];
-              ensureUsers = [
-                {
-                  name = "immich";
-                  ensureDBOwnership = true;
-                  ensureClauses.login = true;
-                }
-              ];
-              settings = {
-                shared_preload_libraries = [ "vectors.so" ];
-              };
-            };
-
-            # Backup database
-            services.postgresqlBackup = {
-              enable = true;
-            };
-
-            services.immich = {
-              enable = true;
-              host = "0.0.0.0";
-              port = 2283;
-              openFirewall = true;
-              mediaLocation = "/var/lib/immich";
-              database = {
-                enable = true;
-                createDB = false; # We create it manually above
-                name = "immich";
-                user = "immich";
-              };
-              redis.enable = true;
-              machine-learning.enable = true;
-              settings = {
-                server.externalDomain = "https://photos.joshuabell.xyz";
-                newVersionCheck.enabled = false;
-              };
-            };
-
-            systemd.services.immich-server = {
-              requires = [ "postgresql.service" ];
-              after = [ "postgresql.service" ];
-            };
-
-            # Allow Immich user to access the media directory
-            users.users.immich.extraGroups = [ "video" "render" ];
-          };
-        };
-    };
-  };
-}
diff --git a/hosts/h001/flake.nix b/hosts/h001/flake.nix
index 24dc6b6a..0b73198d 100644
--- a/hosts/h001/flake.nix
+++ b/hosts/h001/flake.nix
@@ -13,8 +13,6 @@
     beszel-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     forgejo-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     n8n-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    dawarich-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    immich-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
     # Use relative to get current version for testing
     # common.url = "path:../../flakes/common";