Make the production firmware properly wait with the right timeouts