diff --git a/hosts/microserver.home.ts.hillion.co.uk/default.nix b/hosts/microserver.home.ts.hillion.co.uk/default.nix
index 774664f..ecc3bd9 100644
--- a/hosts/microserver.home.ts.hillion.co.uk/default.nix
+++ b/hosts/microserver.home.ts.hillion.co.uk/default.nix
@@ -9,14 +9,9 @@
   imports = [
     ./hardware-configuration.nix
     ../../modules/common/default.nix
+    ../../modules/rpi/rpi4.nix
   ];
 
-  config.boot.loader.grub.enable = false;
-  config.boot.loader.raspberryPi = {
-    enable = true;
-    version = 4;
-  };
-
   # Networking
   ## Tailscale
   config.tailscaleAdvertiseRoutes = "10.64.50.0/24,10.239.19.0/24";
diff --git a/hosts/microserver.parents.ts.hillion.co.uk/default.nix b/hosts/microserver.parents.ts.hillion.co.uk/default.nix
index 29f60a3..f1a3cec 100644
--- a/hosts/microserver.parents.ts.hillion.co.uk/default.nix
+++ b/hosts/microserver.parents.ts.hillion.co.uk/default.nix
@@ -9,14 +9,9 @@
   imports = [
     ./hardware-configuration.nix
     ../../modules/common/default.nix
+    ../../modules/rpi/rpi4.nix
   ];
 
-  config.boot.loader.grub.enable = false;
-  config.boot.loader.raspberryPi = {
-    enable = true;
-    version = 4;
-  };
-
   # Networking
   ## Tailscale
   config.tailscaleAdvertiseRoutes = "10.10.0.0/24";
diff --git a/modules/rpi/rpi4.nix b/modules/rpi/rpi4.nix
new file mode 100644
index 0000000..887a892
--- /dev/null
+++ b/modules/rpi/rpi4.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, lib, ... }:
+
+{
+  config.boot.loader.grub.enable = false;
+  config.boot.loader.generic-extlinux-compatible.enable = true;
+  config.boot.kernelPackages = pkgs.linuxPackages_rpi4;
+}