Fix problem with environment variable loading during deployment