Ensure service name uniqueness + clean up Docker build