Automatically resolve service mapping for all services

Automatically resolve service mapping for all services