Improves Environment Variable-enabled deployment