Finish Adjusting Configuration to rely upon env variables, rather than containerization, in short-term