ACS configuration rework for deployment redesign. A temporary place before we merge