diff --git a/nixops/rpi-server.nix b/nixops/rpi-server.nix
index 9d15ac4f..8ea67c70 100644
--- a/nixops/rpi-server.nix
+++ b/nixops/rpi-server.nix
@@ -7,8 +7,7 @@
   nixpkgs.system = "aarch64-linux";
 
   boot.loader.grub.enable = false;
-
-  boot.loader.generic-extlinux-compatible.enable = !rpi4;
+  boot.loader.generic-extlinux-compatible.enable = true;
   boot.loader.raspberryPi = pkgs.lib.mkIf rpi4 {
     enable = true;
     version = 4;
@@ -21,16 +20,7 @@
   hardware.deviceTree.base = pkgs.device-tree_rpi;
   hardware.deviceTree.overlays = [ "${pkgs.device-tree_rpi.overlays}/rpi-poe.dtbo" ];
 
-  fileSystems = if rpi4 then {
-    "/boot" = {
-      device = "/dev/disk/by-label/FIRMWARE";
-      fsType = "vfat";
-    };
-    "/" = {
-      device = "/dev/disk/by-label/NIXOS_SD";
-      fsType = "ext4";
-    };
-  } else {
+  fileSystems = {
     "/" = {
       device = "/dev/disk/by-label/NIXOS_SD";
       fsType = "ext4";
diff --git a/nixops/rpi.nix b/nixops/rpi.nix
index 8ed56b38..5ea4e7e7 100644
--- a/nixops/rpi.nix
+++ b/nixops/rpi.nix
@@ -10,27 +10,13 @@ in
   nixpkgs.system = "aarch64-linux";
 
   boot.loader.grub.enable = false;
-
-  boot.loader.generic-extlinux-compatible.enable = !rpi4;
-  boot.loader.raspberryPi = pkgs.lib.mkIf rpi4 {
-    enable = true;
-    version = 4;
-  };
+  boot.loader.generic-extlinux-compatible.enable = true;
   boot.kernelPackages = if rpi4 then pkgs.linuxPackages_rpi4 else pkgs.linuxPackages_rpi3;
   hardware.deviceTree.enable = true;
   hardware.deviceTree.base = pkgs.device-tree_rpi;
   hardware.deviceTree.overlays = [ "${pkgs.device-tree_rpi.overlays}/rpi-poe.dtbo" ];
 
-  fileSystems = if rpi4 then {
-    "/boot" = {
-      device = "/dev/disk/by-label/FIRMWARE";
-      fsType = "vfat";
-    };
-    "/" = {
-      device = "/dev/disk/by-label/NIXOS_SD";
-      fsType = "ext4";
-    };
-  } else {
+  fileSystems = {
     "/" = {
       device = "/dev/disk/by-label/NIXOS_SD";
       fsType = "ext4";