Fix issue with container configuration service being instantiated multiple times when is should be a singleton instance