diff --git a/system/nixinator/default.nix b/system/nixinator/default.nix
index 73f170e6..2cd69658 100644
--- a/system/nixinator/default.nix
+++ b/system/nixinator/default.nix
@@ -30,8 +30,10 @@
 
   # TODO: System module for this
   systemd.network = let
-    eth-interface = "enp0s31f6";
-    wireless-interface = "wlp5s0";
+    # eth-interface = "enp0s31f6";
+    eth-interface = "enp*";
+    # wireless-interface = "wlp5s0";
+    wireless-interface = "wlp*";
   in {
     enable = true;
 
diff --git a/system/nixtop/default.nix b/system/nixtop/default.nix
index a1f6c027..8d1c2b32 100644
--- a/system/nixtop/default.nix
+++ b/system/nixtop/default.nix
@@ -22,14 +22,13 @@
 
   
   systemd.network = let
-    eth-interface = "enp0s20u2";
-    wireless-interface = "wlp3s0";
+    eth-interface = "enp*";
+    wireless-interface = "wlp*";
   in {
     enable = true;
 
     # LAN
-    networks."50-tether" = {
-      # name = "enp0s31f6"; # Network interface name?
+    networks."50-ether" = {
       enable = true;
 
       # See man systemd.link, man systemd.netdev, man systemd.network
@@ -42,12 +41,6 @@
       networkConfig = {
         # This corresponds to the [NETWORK] section
         DHCP = "yes";
-
-        # TODO: What does this all do?
-        # IPv6AcceptRA = true;
-        # MulticastDNS = "yes"; # Needed?
-        # LLMNR = "no"; # Needed?
-        # LinkLocalAddressing = "no"; # Needed?
       };
 
       linkConfig = {