More work for Continuous delivery #6