Merge "Make all services independent of helm Release.Name"