Refactor helm values files (this is used to determine the deployment name...

3 jobs for master in 1 minute and 44 seconds (queued for 1 second)