diff --git a/nixos/hosts/homeserver/default.nix b/nixos/hosts/homeserver/default.nix
index fd75c8d..76e28e9 100644
--- a/nixos/hosts/homeserver/default.nix
+++ b/nixos/hosts/homeserver/default.nix
@@ -18,16 +18,6 @@
   networking.hostName = "homeserver";
   networking.networkmanager.enable = true;
 
-  fileSystems."/mnt/data" = {
-    device = "172.16.0.1:/volume1/data";
-    fsType = "nfs";
-    options = [
-      "noauto"
-      "x-systemd.automount"
-      "x-systemd.idle-timeout=600"
-    ];
-  };
-
   users.groups.media = { };
   users.users.media = {
     group = "media";
@@ -52,10 +42,6 @@
       addresses = true;
       workstation = true;
     };
-    allowInterfaces = [
-      "end0"
-      "enp2s0u2"
-    ];
   };
 
   services.calibre-server = {
@@ -75,11 +61,6 @@
     settings.PermitRootLogin = "no";
   };
 
-  services.tailscale = {
-    enable = true;
-    useRoutingFeatures = "server";
-  };
-
   networking.firewall.allowedTCPPorts = [ 22 ];
   networking.firewall.allowedUDPPorts = [ ];
 
diff --git a/nixos/hosts/homeserver/hardware-configuration.nix b/nixos/hosts/homeserver/hardware-configuration.nix
index 8693644..aef56ac 100644
--- a/nixos/hosts/homeserver/hardware-configuration.nix
+++ b/nixos/hosts/homeserver/hardware-configuration.nix
@@ -39,15 +39,13 @@
 
   swapDevices = [ ];
 
-  networking.interfaces = {
-    end0.useDHCP = lib.mkDefault true;
-    enp2s0u2.ipv4.addresses = [
-      {
-        address = "172.16.0.2";
-        prefixLength = 24;
-      }
-    ];
-  };
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.end0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
 }