Attempting to cleanup services
Changed config to custom services