refine config; adequate usage of services-client
refine CA-Handling