diff --git a/packages/bsp/common/etc/NetworkManager/conf.d/default-wifi-powersave-on.conf b/packages/bsp/common/etc/NetworkManager/conf.d/default-wifi-powersave-on.conf
new file mode 100644
index 0000000000..21aeabdded
--- /dev/null
+++ b/packages/bsp/common/etc/NetworkManager/conf.d/default-wifi-powersave-on.conf
@@ -0,0 +1,3 @@
+[connection]
+# Values are 0 (use default), 1 (ignore/don't touch), 2 (disable) or 3 (enable).
+wifi.powersave = 2
diff --git a/packages/bsp/common/etc/udev/rules.d/10-wifi-disable-powermanagement.rules b/packages/bsp/common/etc/udev/rules.d/10-wifi-disable-powermanagement.rules
new file mode 100644
index 0000000000..54571da312
--- /dev/null
+++ b/packages/bsp/common/etc/udev/rules.d/10-wifi-disable-powermanagement.rules
@@ -0,0 +1 @@
+KERNEL=="wlan*", ACTION=="add", RUN+="/sbin/iwconfig wlan0 power off"