diff --git a/configuration.nix b/configuration.nix
index 37c3f34..d90d84e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -4,8 +4,12 @@
 
   # A bunch of boot parameters needed for optimal runtime on RPi 4B
   boot.kernelPackages = pkgs.linuxPackages_rpi4;
-  boot.kernelParams =
-    [ "zfs.zfs_arc_max=134217728" "console=TTYAMA0,115200" "console=tty1" ];
+  boot.kernelParams = [
+    "zfs.zfs_arc_max=134217728"
+    "console=TTYAMA0,115200"
+    "console=tty1"
+    "8250.nr_uarts=1"
+  ];
   boot.loader.raspberryPi = {
     enable = true;
     version = 4;
diff --git a/modules/hardware-configuration.nix b/modules/hardware-configuration.nix
index 469ceee..1b5bc67 100644
--- a/modules/hardware-configuration.nix
+++ b/modules/hardware-configuration.nix
@@ -16,6 +16,11 @@
     fsType = "ext4";
   };
 
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/2178-694E";
+    fsType = "vfat";
+  };
+
   fileSystems."/vault" = {
     device = "vault";
     fsType = "zfs";