diff --git a/setup.sh b/setup.sh
index 7b523bd..60a681a 100755
--- a/setup.sh
+++ b/setup.sh
@@ -73,6 +73,13 @@ echo "Editing OpenSSH daemon config..."
 sed -i -e "s/#PasswordAuthentication yes/PasswordAuthentication no/g" /etc/ssh/sshd_config
 sed -i -e "s/PermitRootLogin yes/PermitRootLogin no/g" /etc/ssh/sshd_config
 
+# NetworkManager Wi-Fi config
+if [[ $sbc = 'orangepizero' ]]; then # TODO other SBCs?
+  echo "Disabling Wi-Fi MAC address randomization"
+  sed -i -e "s/wifi.mac-address-randomization=1/wifi.mac-address-randomization=no/g" /etc/NetworkManager/conf.d/10-override-wifi-random-mac-disable.conf
+fi
+
+
 # specific setting for orangepizero
 if [[ $sbc = 'orangepizero' ]]; then
   echo "Setting CPU frequency to performance"