switch to using new environment variable feature in gordon