diff --git a/roles/desktop/configuration.nix b/roles/desktop/configuration.nix
index 3a10fee..ab3242a 100644
--- a/roles/desktop/configuration.nix
+++ b/roles/desktop/configuration.nix
@@ -8,8 +8,6 @@
 	};
 	users.users.toast.extraGroups = [ "scanner" ];
 
-	networking.networkmanager.enable = true;
-
 	services.xserver.enable = true;
 
 	# Set up fonts
diff --git a/roles/desktop/services/default.nix b/roles/desktop/services/default.nix
index d2031da..c746c38 100644
--- a/roles/desktop/services/default.nix
+++ b/roles/desktop/services/default.nix
@@ -7,5 +7,6 @@
 		./syncthing.nix
 		./pipewire.nix
 		./printing.nix
+		./networkmanager.nix
 	];
 }
diff --git a/roles/desktop/services/networkmanager.nix b/roles/desktop/services/networkmanager.nix
new file mode 100644
index 0000000..7a64922
--- /dev/null
+++ b/roles/desktop/services/networkmanager.nix
@@ -0,0 +1,15 @@
+{ config, ... }:
+
+let
+  tailscaleName = config.services.tailscale.interfaceName;
+in
+
+{
+  networking.networkmanager = {
+    enable = true;
+    unmanaged = [
+      "interface-name:${tailscaleName}"
+    ];
+    wifi.macAddress = "random";
+  };
+}