Fix to jobs that uses STORAGE and changed Doctor to clean jobs after
execution