Fix the tasks for prod mode