diff --git a/hosts/cyberspark/system/hardware/default.nix b/hosts/cyberspark/system/hardware/default.nix
index 1135771..c2f740c 100644
--- a/hosts/cyberspark/system/hardware/default.nix
+++ b/hosts/cyberspark/system/hardware/default.nix
@@ -11,12 +11,12 @@
     initrd = {
       availableKernelModules = [
         "xhci_pci"
-	"ehci_pci"
-	"ahci"
-	"nvme"
-	"usbhid"
-	"sd_mod"
-	"sr_mod"
+        "ehci_pci"
+        "ahci"
+        "nvme"
+        "usbhid"
+        "sd_mod"
+        "sr_mod"
       ];
       kernelModules = [
         "kvm-intel"
@@ -24,9 +24,7 @@
     };
     swraid = {
       enable = true;
-      mdadmConf = ''
-        MAILADDR jimbo@jimbosfiles.com
-      '';
+      mdadmConf = "MAILADDR jimbo@jimbosfiles.com";
     };
   };
 
diff --git a/hosts/lacros/system/boot/default.nix b/hosts/lacros/system/boot/default.nix
index c327671..8b5e01f 100644
--- a/hosts/lacros/system/boot/default.nix
+++ b/hosts/lacros/system/boot/default.nix
@@ -1,12 +1,16 @@
 { ... }:
 {
-  boot.initrd = {
-    systemd.enable = true;
-    luks.devices = {
-      crypt-mmc = {
-        device = "/dev/disk/by-uuid/5906e176-7ad3-41e5-bc45-ae65664eb10c";
-        preLVM = true;
-        allowDiscards = true;
+  boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    kernel.sysctl."vm.max_map_count" = 2147483642;       
+    initrd = {
+      systemd.enable = true;
+      luks.devices = {
+        crypt-mmc = {
+          device = "/dev/disk/by-uuid/5906e176-7ad3-41e5-bc45-ae65664eb10c";
+          preLVM = true;
+          allowDiscards = true;
+        };
       };
     };
   };
diff --git a/hosts/redmond/system/boot/default.nix b/hosts/redmond/system/boot/default.nix
new file mode 100644
index 0000000..8022416
--- /dev/null
+++ b/hosts/redmond/system/boot/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    kernel.sysctl."vm.max_map_count" = 2147483642;       
+  };
+}
diff --git a/hosts/redmond/system/default.nix b/hosts/redmond/system/default.nix
index cb94503..2844205 100644
--- a/hosts/redmond/system/default.nix
+++ b/hosts/redmond/system/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ./hardware
+    ./boot
 
     # Apps and programs
     ../../../modules/system
diff --git a/hosts/shuttleworth/system/boot/default.nix b/hosts/shuttleworth/system/boot/default.nix
new file mode 100644
index 0000000..8022416
--- /dev/null
+++ b/hosts/shuttleworth/system/boot/default.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    kernel.sysctl."vm.max_map_count" = 2147483642;       
+  };
+}
diff --git a/hosts/shuttleworth/system/default.nix b/hosts/shuttleworth/system/default.nix
index cc8fbca..06ca1a7 100644
--- a/hosts/shuttleworth/system/default.nix
+++ b/hosts/shuttleworth/system/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ./hardware
+    ./boot
 
     # Apps and programs
     ../../../modules/system