Start refactoring towards including dea config into manifests