diff --git a/hosts/jupiter/services/default.nix b/hosts/jupiter/services/default.nix
index f8518ca3..c9fea6b7 100644
--- a/hosts/jupiter/services/default.nix
+++ b/hosts/jupiter/services/default.nix
@@ -1,6 +1,8 @@
 { config, lib, ... }:
 {
   config = lib.mkIf (!config.system.steamdeck.enable) {
+    networking.useNetworkd = lib.mkForce false;
+
     services.globalprotect.enable = true;
 
     virtualisation.vmware.host.enable = true;
diff --git a/modules/system/devices/networking/default.nix b/modules/system/devices/networking/default.nix
index 05f8513f..8e6944f9 100644
--- a/modules/system/devices/networking/default.nix
+++ b/modules/system/devices/networking/default.nix
@@ -1,25 +1,19 @@
 { config, ... }:
 {
+  imports = [
+    ./nameservers
+    ./wireless
+  ];
+
   networking = {
     useNetworkd = true;
-    dhcpcd.enable = false;
+    dhcpcd.enable = !config.networking.useNetworkd;
     nftables.enable = true;
     firewall.allowPing = false;
-    wireless = {
-      enable = config.system.desktop.enable;
-      userControlled.enable = true;
-    };
-    nameservers = [
-      "2620:fe::11#dns11.quad9.net"
-      "2620:fe::fe:11#dns11.quad9.net"
-      "9.9.9.11#dns11.quad9.net"
-      "149.112.112.11#dns11.quad9.net"
-    ];
   };
 
   services.resolved = {
-    enable = true;
+    enable = config.networking.useNetworkd;
     dnsovertls = "true";
-    fallbackDns = config.networking.nameservers;
   };
 }
diff --git a/modules/system/devices/networking/nameservers/default.nix b/modules/system/devices/networking/nameservers/default.nix
new file mode 100644
index 00000000..ac45eb16
--- /dev/null
+++ b/modules/system/devices/networking/nameservers/default.nix
@@ -0,0 +1,11 @@
+{ config, lib, ... }:
+{
+  networking.nameservers = lib.mkIf config.networking.useNetworkd [
+    "2620:fe::11#dns11.quad9.net"
+    "2620:fe::fe:11#dns11.quad9.net"
+    "9.9.9.11#dns11.quad9.net"
+    "149.112.112.11#dns11.quad9.net"
+  ];
+
+  services.resolved.fallbackDns = config.networking.nameservers;
+}
diff --git a/modules/system/devices/networking/wireless/default.nix b/modules/system/devices/networking/wireless/default.nix
new file mode 100644
index 00000000..2bddfeef
--- /dev/null
+++ b/modules/system/devices/networking/wireless/default.nix
@@ -0,0 +1,7 @@
+{ config, ... }:
+{
+  networking.wireless = {
+    enable = config.system.desktop.enable;
+    userControlled.enable = true;
+  };
+}
diff --git a/modules/system/secrets/networks/default.nix b/modules/system/secrets/networks/default.nix
index 790514d4..e8355d47 100644
Binary files a/modules/system/secrets/networks/default.nix and b/modules/system/secrets/networks/default.nix differ