diff --git a/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot b/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot
index 0620700f..65706a33 100644
--- a/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot
+++ b/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot
@@ -87,6 +87,8 @@ systemctl enable NetworkManager
 
 # Enable iperf3 for speed testing.
 systemctl enable iperf3
+# Enable Controller service to start on boot.
+systemctl enable wrolpi-controller.service
 
 set +x
 
diff --git a/pi-gen/stage2/04-wrolpi/03-run-chroot.sh b/pi-gen/stage2/04-wrolpi/03-run-chroot.sh
index a6b954ac..e36132f3 100755
--- a/pi-gen/stage2/04-wrolpi/03-run-chroot.sh
+++ b/pi-gen/stage2/04-wrolpi/03-run-chroot.sh
@@ -68,6 +68,8 @@ cp /opt/wrolpi/etc/raspberrypios/wrolpi-*.service /etc/systemd/system/
 cp /opt/wrolpi/etc/raspberrypios/wrolpi.target /etc/systemd/system/
 # Enable first startup script.
 systemctl enable wrolpi-first-startup.service
+# Enable Controller service to start on boot.
+systemctl enable wrolpi-controller.service
 
 # Copy MOTD scripts, delete original.
 cp /opt/wrolpi/etc/raspberrypios/motd/20-wrolpi.motd /etc/update-motd.d/20-wrolpi