diff --git a/hosts/xlab-gateway/default.nix b/hosts/xlab-gateway/default.nix
index ea1451d..3325d2a 100644
--- a/hosts/xlab-gateway/default.nix
+++ b/hosts/xlab-gateway/default.nix
@@ -5,6 +5,7 @@
 
 {
   imports = [
+    ./hardware-configuration.nix
     ./networking.nix
     ./dhcp.nix
   ];
@@ -24,6 +25,9 @@
     };
   };
 
+  # Gateway doesn't need to block boot waiting for all interfaces
+  systemd.network.wait-online.enable = false;
+
   users.users.ldx = {
     extraGroups = [ "networkmanager" ];
   };
diff --git a/hosts/xlab-gateway/hardware-configuration.nix b/hosts/xlab-gateway/hardware-configuration.nix
new file mode 100644
index 0000000..561bef5
--- /dev/null
+++ b/hosts/xlab-gateway/hardware-configuration.nix
@@ -0,0 +1,21 @@
+# Do not modify this file!  It was generated by 'nixos-generate-config'
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  # Disk and filesystem declarations managed by disko.nix
+  # networking.useDHCP managed by networking.nix (systemd-networkd)
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}