Adding explicit env variable containers for keys