SCRUM#580: Refactor the deploy code

2 jobs for issue/580 in 26 minutes and 18 seconds (queued for 1 second)