diff --git a/flake.lock b/flake.lock
index 88c8b0f..f0bd2b3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -68,16 +68,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1772598333,
-        "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
+        "lastModified": 1780203844,
+        "narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
+        "rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 1a38a1f..f805528 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "CCCB services";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
     #flake-utils.url = "github:numtide/flake-utils";
     agenix = {
       url = "github:ryantm/agenix";
@@ -40,7 +40,7 @@
         ];
       };
       nixosConfigurations."matrix" = nixpkgs.lib.nixosSystem {
-        #system = "x86_64-linux";
+        #system = "x86_64-linux";d
         #pkgs = import nixpkgs { inherit system; };
         inherit system;
         modules = [
diff --git a/hosts/common.nix b/hosts/common.nix
index 53d1e86..248fccb 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -88,12 +88,12 @@
     # Cache DNS lookups to improve performance
     resolved = {
       enable = true;
-      dnssec = "allow-downgrade";
-      dnsovertls = "true";
-      extraConfig = ''
-        Cache=true
-        CacheFromLocalhost=true
-      '';
+      settings.Resolve = {
+        DNSSEC = "allow-downgrade";
+        DNSOverTLS = true;
+        Cache = true;
+        CacheFromLocalhost = true;
+      };
     };
   };
 
diff --git a/hosts/matrix/default.nix b/hosts/matrix/default.nix
index 7fc2fac..e4de744 100644
--- a/hosts/matrix/default.nix
+++ b/hosts/matrix/default.nix
@@ -23,17 +23,16 @@
     };
   };
 
-  services = {
-    openssh.banner = ''
-                          __                                               __
-                         /\ \__         __                                /\ \
-        ___ ___      __  \ \ ,_\  _ __ /\_\   __  _      ___    ___    ___\ \ \____
-      /' __` __`\  /'__`\ \ \ \/ /\`'__\/\ \ /\ \/'\    /'___\ /'___\ /'___\ \ '__`\
-      /\ \/\ \/\ \/\ \L\.\_\ \ \_\ \ \/ \ \ \\/>  </   /\ \__//\ \__//\ \__/\ \ \L\ \
-      \ \_\ \_\ \_\ \__/.\_\\ \__\\ \_\  \ \_\/\_/\_\  \ \____\ \____\ \____\\ \_,__/
-       \/_/\/_/\/_/\/__/\/_/ \/__/ \/_/   \/_/\//\/_/   \/____/\/____/\/____/ \/___/
-    '';
-  };
+  environment.etc."ssh/banner" = ''
+                        __                                               __
+                       /\ \__         __                                /\ \
+      ___ ___      __  \ \ ,_\  _ __ /\_\   __  _      ___    ___    ___\ \ \____
+    /' __` __`\  /'__`\ \ \ \/ /\`'__\/\ \ /\ \/'\    /'___\ /'___\ /'___\ \ '__`\
+    /\ \/\ \/\ \/\ \L\.\_\ \ \_\ \ \/ \ \ \\/>  </   /\ \__//\ \__//\ \__/\ \ \L\ \
+    \ \_\ \_\ \_\ \__/.\_\\ \__\\ \_\  \ \_\/\_/\_\  \ \____\ \____\ \____\\ \_,__/
+     \/_/\/_/\/_/\/__/\/_/ \/__/ \/_/   \/_/\//\/_/   \/____/\/____/\/____/ \/___/
+  '';
+  services.openssh.settings.Banner = "/etc/ssh/banner";
 
   system.stateVersion = "25.05";
 }
diff --git a/hosts/md/default.nix b/hosts/md/default.nix
index 3ff5f33..0d659cb 100644
--- a/hosts/md/default.nix
+++ b/hosts/md/default.nix
@@ -21,17 +21,16 @@
     };
   };
 
-  services = {
-    openssh.banner = ''
-                    __
-                   /\ \
-        ___ ___    \_\ \
-      /' __` __`\  /'_` \
-      /\ \/\ \/\ \/\ \L\ \
-      \ \_\ \_\ \_\ \___,_\
-       \/_/\/_/\/_/\/__,_ /
-    '';
-  };
+  environment.etc."ssh/banner" = ''
+                  __
+                 /\ \
+      ___ ___    \_\ \
+    /' __` __`\  /'_` \
+    /\ \/\ \/\ \/\ \L\ \
+    \ \_\ \_\ \_\ \___,_\
+     \/_/\/_/\/_/\/__,__/
+  '';
+  services.openssh.settings.Banner = "/etc/ssh/banner";
 
   system.stateVersion = "25.11";
 }
diff --git a/hosts/monitoring/default.nix b/hosts/monitoring/default.nix
index 21b93ae..161b122 100644
--- a/hosts/monitoring/default.nix
+++ b/hosts/monitoring/default.nix
@@ -22,19 +22,18 @@
     };
   };
 
-  services = {
-    openssh.banner = ''
-                                    __
-                                 __/\ \__                __
-        ___ ___     ___     ___ /\_\ \ ,_\   ___   _ __ /\_\    ___      __
-      /' __` __`\  / __`\ /' _ `\/\ \ \ \/  / __`\/\`'__\/\ \ /' _ `\  /'_ `\
-      /\ \/\ \/\ \/\ \L\ \/\ \/\ \ \ \ \ \_/\ \L\ \ \ \/ \ \ \/\ \/\ \/\ \L\ \
-      \ \_\ \_\ \_\ \____/\ \_\ \_\ \_\ \__\ \____/\ \_\  \ \_\ \_\ \_\ \____ \
-       \/_/\/_/\/_/\/___/  \/_/\/_/\/_/\/__/\/___/  \/_/   \/_/\/_/\/_/\/___L\ \
-                                                                         /\____/
-                                                                         \_/__/
-    '';
-  };
+  environment.etc."ssh/banner" = ''
+                                  __
+                               __/\ \__                __
+      ___ ___     ___     ___ /\_\ \ ,_\   ___   _ __ /\_\    ___      __
+    /' __` __`\  / __`\ /' _ `\/\ \ \ \/  / __`\/\`'__\/\ \ /' _ `\  /'_ `\
+    /\ \/\ \/\ \/\ \L\ \/\ \/\ \ \ \ \ \_/\ \L\ \ \ \/ \ \ \/\ \/\ \/\ \L\ \
+    \ \_\ \_\ \_\ \____/\ \_\ \_\ \_\ \__\ \____/\ \_\  \ \_\ \_\ \_\ \____ \
+     \/_/\/_/\/_/\/___/  \/_/\/_/\/_/\/__/\/___/  \/_/   \/_/\/_/\/_/\/___L\ \
+                                                                       /\____/
+                                                                       \_/__/
+  '';
+  services.openssh.settings.Banner = "/etc/ssh/banner";
 
   system.stateVersion = "25.11";
 }
diff --git a/hosts/sql/default.nix b/hosts/sql/default.nix
index 5058379..623b418 100644
--- a/hosts/sql/default.nix
+++ b/hosts/sql/default.nix
@@ -17,19 +17,18 @@
     '';
   };
 
-  services = {
-    openssh.banner = ''
-                     ___
-                    /\_ \
-        ____     __ \//\ \
-       /',__\  /'__`\ \ \ \
-      /\__, `\/\ \L\ \ \_\ \_
-      \/\____/\ \___, \/\____\
-       \/___/  \/___/\ \/____/
-                    \ \_\
-                     \/_/
-    '';
-  };
+  environment.etc."ssh/banner" = ''
+                   ___
+                  /\_ \
+      ____     __ \//\ \
+     /',__\  /'__`\ \ \ \
+    /\__, `\/\ \L\ \ \_\ \_
+    \/\____/\ \___, \/\____\
+     \/___/  \/___/\ \/____/
+                  \ \_\
+                   \/_/
+  '';
+  services.openssh.settings.Banner = "/etc/ssh/banner";
 
   system.stateVersion = "25.11";
 }
diff --git a/hosts/www/default.nix b/hosts/www/default.nix
index 0921a3b..47326ec 100644
--- a/hosts/www/default.nix
+++ b/hosts/www/default.nix
@@ -22,15 +22,14 @@
     };
   };
 
-  services = {
-    openssh.banner = ''
-       __  __  __  __  __  __  __  __  __
-      /\ \/\ \/\ \/\ \/\ \/\ \/\ \/\ \/\ \
-      \ \ \_/ \_/ \ \ \_/ \_/ \ \ \_/ \_/ \
-       \ \___x___/'\ \___x___/'\ \___x___/'
-        \/__//__/   \/__//__/   \/__//__/
-    '';
-  };
+  environment.etc."ssh/banner" = ''
+     __  __  __  __  __  __  __  __  __
+    /\ \/\ \/\ \/\ \/\ \/\ \/\ \/\ \/\ \
+    \ \ \_/ \_/ \ \ \_/ \_/ \ \ \_/ \_/ \
+     \ \___x___/'\ \___x___/'\ \___x___/'
+      \/__//__/   \/__//__/   \/__//__/
+  '';
+  services.openssh.settings.Banner = "/etc/ssh/banner";
 
   system.stateVersion = "25.11";
 }