diff --git a/root/etc/NetworkManager/NetworkManager.conf b/root/etc/NetworkManager/NetworkManager.conf
deleted file mode 100644
index efbd970a6..000000000
--- a/root/etc/NetworkManager/NetworkManager.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[main]
-plugins=ifupdown,keyfile,ofono
-#dns=dnsmasq
-
-[ifupdown]
-managed=false
-
-[connection]
-wifi.powersave = 2
-
-[device]
-wifi.scan-rand-mac-address=false
diff --git a/root/etc/NetworkManager/conf.d/99-surface.conf b/root/etc/NetworkManager/conf.d/99-surface.conf
new file mode 100644
index 000000000..c34a6825c
--- /dev/null
+++ b/root/etc/NetworkManager/conf.d/99-surface.conf
@@ -0,0 +1,5 @@
+[connection]
+wifi.powersave = 2
+
+[device]
+wifi.scan-rand-mac-address=false
diff --git a/root/etc/NetworkManager/conf.d/default-wifi-powersave-on.conf b/root/etc/NetworkManager/conf.d/default-wifi-powersave-on.conf
deleted file mode 100644
index 111af0beb..000000000
--- a/root/etc/NetworkManager/conf.d/default-wifi-powersave-on.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[connection]
-wifi.powersave = 2