refactored the services yamls for the different service types