Improved worker reboot behaviour