Make production to use everything that’s in place so we do not maintain to very separate configuration codebase anymore.