DEPLOY-14: Remove multiple when in tasks