cleanup, add environment variable to containers