Merge: Ci: move services to specific hostnames