diff --git a/nixops/desktop.nix b/nixops/desktop.nix
index 9f929474..77a9e0f0 100644
--- a/nixops/desktop.nix
+++ b/nixops/desktop.nix
@@ -75,7 +75,7 @@ in
     PKCS11Provider "${pkgs.opensc}/lib/opensc-pkcs11.so"
     '';
   programs.ssh.startAgent = true;
-  services.gnome3.gnome-keyring.enable = pkgs.lib.mkForce false;
+  services.gnome.gnome-keyring.enable = pkgs.lib.mkForce false;
   programs.ssh.agentPKCS11Whitelist = "${pkgs.opensc}/lib/opensc-pkcs11.so";
   security.pam.p11.enable = true;
 
@@ -118,8 +118,8 @@ in
   services.xserver.xkbOptions = "eurosign:e";
 
   services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome3.enable = true;
-  environment.gnome3.excludePackages = [ pkgs.epiphany pkgs.gnome3.geary ];
+  services.xserver.desktopManager.gnome.enable = true;
+  environment.gnome.excludePackages = [ pkgs.epiphany pkgs.gnome3.geary ];
 
   systemd.suppressedSystemUnits = [
       "hibernate.target"
diff --git a/nixops/rpi-server.nix b/nixops/rpi-server.nix
index ffe9ff55..9db7b77a 100644
--- a/nixops/rpi-server.nix
+++ b/nixops/rpi-server.nix
@@ -19,9 +19,10 @@
   };
   boot.kernelParams = ["cma=64M"]; # work around https://github.com/raspberrypi/linux/issues/3208
   boot.kernelPackages = if rpi4 then pkgs.linuxPackages_rpi4 else pkgs.linuxPackages_rpi3;
+  boot.initrd.includeDefaultModules = false;
   hardware.deviceTree.enable = true;
-  hardware.deviceTree.base = pkgs.device-tree_rpi;
-  hardware.deviceTree.overlays = [ "${pkgs.device-tree_rpi.overlays}/rpi-poe.dtbo" ];
+  hardware.deviceTree.filter = "*rpi*.dtb";
+  hardware.deviceTree.overlays = [ { name = "poe"; dtboFile = "${pkgs.device-tree_rpi.overlays}/rpi-poe.dtbo"; } ];
 
   fileSystems = {
     "/" = {
diff --git a/nixops/rpi.nix b/nixops/rpi.nix
index 1252cad5..16e92d3b 100644
--- a/nixops/rpi.nix
+++ b/nixops/rpi.nix
@@ -15,9 +15,10 @@ in
   boot.loader.generic-extlinux-compatible.enable = true;
   boot.kernelParams = if rpi4 then ["cma=64M"] else []; # work around https://github.com/raspberrypi/linux/issues/3208
   boot.kernelPackages = if rpi4 then pkgs.linuxPackages_rpi4 else pkgs.linuxPackages_rpi3;
+  boot.initrd.includeDefaultModules = false;
   hardware.deviceTree.enable = true;
-  hardware.deviceTree.base = pkgs.device-tree_rpi;
-  hardware.deviceTree.overlays = [ "${pkgs.device-tree_rpi.overlays}/rpi-poe.dtbo" ];
+  hardware.deviceTree.filter = "*rpi*.dtb";
+  hardware.deviceTree.overlays = [ { name = "poe"; dtboFile = "${pkgs.device-tree_rpi.overlays}/rpi-poe.dtbo"; } ];
 
   fileSystems = {
     "/" = {