diff --git a/hosts/goldberg/configuration.nix b/hosts/goldberg/configuration.nix
index 8bb417a..b7af7da 100644
--- a/hosts/goldberg/configuration.nix
+++ b/hosts/goldberg/configuration.nix
@@ -12,16 +12,20 @@
 
   system.stateVersion = "23.05";
   networking.hostName = "goldberg";
-  # Fallback / for the monitoring v(x)lan
-  networking.useDHCP = true;
 
-  # We need to configure IPv6 statically, and if we start with that we can just also do it for IPv4
-  networking.interfaces.ens3.useDHCP = false;
-  networking.interfaces.ens3.ipv4.addresses = [ { address = "5.75.181.252"; prefixLength = 32; } ];
-  networking.interfaces.ens3.ipv6.addresses = [ { address = "2a01:4f8:1c1e:9e75::1"; prefixLength = 64; } ];
-  networking.defaultGateway = { address = "172.31.1.1"; interface = "ens3"; };
-  networking.defaultGateway6 = { address = "fe80::1"; interface = "ens3"; };
-  networking.nameservers = [ "213.133.98.98" "213.133.99.99" "213.133.100.100" ];
+  networking = {
+    # Fallback / for the monitoring v(x)lan
+    useDHCP = true;
+    defaultGateway = { address = "172.31.1.1"; interface = "ens3"; };
+    defaultGateway6 = { address = "fe80::1"; interface = "ens3"; };
+    nameservers = [ "213.133.98.98" "213.133.99.99" "213.133.100.100" ];
+
+    interfaces.ens3 = {
+      useDHCP = false;
+      ipv4.addresses = [ { address = "5.75.181.252"; prefixLength = 32; } ];
+      ipv6.addresses = [ { address = "2a01:4f8:1c1e:9e75::1"; prefixLength = 64; } ];
+    };
+  };
 
   services.murmur = {
     registerPassword = lib.mkForce "";
diff --git a/hosts/goldberg/hardware-config.nix b/hosts/goldberg/hardware-config.nix
index 511bd8a..78f7f36 100644
--- a/hosts/goldberg/hardware-config.nix
+++ b/hosts/goldberg/hardware-config.nix
@@ -22,7 +22,6 @@
 
   # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
   # boot.loader.grub.efiSupport = true;
   # boot.loader.grub.efiInstallAsRemovable = true;
   # boot.loader.efi.efiSysMountPoint = "/boot/efi";
diff --git a/hosts/shirley/configuration.nix b/hosts/shirley/configuration.nix
index 061d246..dc35ca8 100644
--- a/hosts/shirley/configuration.nix
+++ b/hosts/shirley/configuration.nix
@@ -12,14 +12,18 @@
 
   system.stateVersion = "23.05";
   networking.hostName = "shirley";
-  # Fallback / for the monitoring v(x)lan
-  networking.useDHCP = true;
 
-  # We need to configure IPv6 statically, and if we start with that we can just also do it for IPv4
-  networking.interfaces.ens3.useDHCP = false;
-  networking.interfaces.ens3.ipv4.addresses = [ { address = "94.130.107.245"; prefixLength = 32; } ];
-  networking.interfaces.ens3.ipv6.addresses = [ { address = "2a01:4f8:c0c:83eb::1"; prefixLength = 64; } ];
-  networking.defaultGateway = { address = "172.31.1.1"; interface = "ens3"; };
-  networking.defaultGateway6 = { address = "fe80::1"; interface = "ens3"; };
-  networking.nameservers = [ "213.133.98.98" "213.133.99.99" "213.133.100.100" ];
+  networking = {
+    # Fallback / for the monitoring v(x)lan
+    useDHCP = true;
+    defaultGateway = { address = "172.31.1.1"; interface = "ens3"; };
+    defaultGateway6 = { address = "fe80::1"; interface = "ens3"; };
+    nameservers = [ "213.133.98.98" "213.133.99.99" "213.133.100.100" ];
+
+    interfaces.ens3 = {
+      useDHCP = false;
+      ipv4.addresses = [ { address = "94.130.107.245"; prefixLength = 32; } ];
+      ipv6.addresses = [ { address = "2a01:4f8:c0c:83eb::1"; prefixLength = 64; } ];
+    };
+  };
 }
diff --git a/hosts/shirley/hardware-config.nix b/hosts/shirley/hardware-config.nix
index 0ce4be1..962e944 100644
--- a/hosts/shirley/hardware-config.nix
+++ b/hosts/shirley/hardware-config.nix
@@ -22,7 +22,6 @@
 
   # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
   # boot.loader.grub.efiSupport = true;
   # boot.loader.grub.efiInstallAsRemovable = true;
   # boot.loader.efi.efiSysMountPoint = "/boot/efi";