diff --git a/images/macos/scripts/build/configure-machine.sh b/images/macos/scripts/build/configure-machine.sh
index 11fe6cfe3..cd28fc040 100644
--- a/images/macos/scripts/build/configure-machine.sh
+++ b/images/macos/scripts/build/configure-machine.sh
@@ -10,9 +10,12 @@ echo "Enabling developer mode..."
 sudo /usr/sbin/DevToolsSecurity --enable
 
 # Turn off hibernation and get rid of the sleepimage
-sudo pmset hibernatemode 0
+sudo pmset -a hibernatemode 0
 sudo rm -f /var/vm/sleepimage
 
+# Set computer, disk, and display sleep to never
+sudo pmset -a sleep 0 disksleep 0 displaysleep 0
+
 # Disable App Nap System Wide
 defaults write NSGlobalDomain NSAppSleepDisabled -bool YES