diff --git a/files/etc/systemd/system/firstboot-brew-install.service b/files/etc/systemd/system/firstboot-brew-install.service
index 27d987d..2d82703 100644
--- a/files/etc/systemd/system/firstboot-brew-install.service
+++ b/files/etc/systemd/system/firstboot-brew-install.service
@@ -1,9 +1,12 @@
 [Unit]
-Description=Install Homebrew for user
+Description=Install Homebrew for user %i
+After=network-online.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/local/bin/install-homebrew.sh %i
+User=root
+ExecStart=/usr/local/sbin/install-homebrew.sh %i
+RemainAfterExit=yes
 
 [Install]
 WantedBy=multi-user.target