diff --git a/kiosk_skeleton/build.sh b/kiosk_skeleton/build.sh
index 985e0f2..459501b 100755
--- a/kiosk_skeleton/build.sh
+++ b/kiosk_skeleton/build.sh
@@ -81,6 +81,7 @@ systemctl enable ssh
 systemctl enable kiosk-sechedule-screen.service
 systemctl enable schedule-reboot.service
 systemctl enable setup-refresh-timer.service
+systemctl enable hyperiond
 
 # Install Hyperion
 curl -sSL https://apt.hyperion-project.org/hyperion.pub.key | gpg --dearmor -o /usr/share/keyrings/hyperion.pub.gpg
@@ -88,6 +89,13 @@ echo "deb [signed-by=/usr/share/keyrings/hyperion.pub.gpg] https://apt.hyperion-
 apt update
 apt install -y hyperion
 
+# Run Hyperion as the 'pi' user
+mkdir -p /etc/systemd/system/hyperiond.service.d
+echo -e "[Service]\nUser=pi\nGroup=pi" > /etc/systemd/system/hyperiond.service.d/override.conf
+chown -R pi:pi /var/lib/hyperion || true
+chown -R pi:pi /etc/hyperion
+usermod -a -G video pi
+
 # generate a version info/build info file
 echo -n "Chromium version: " >> /version-info
 dpkg --list | grep "ii  chromium " >> /version-info