Ensured env vars were global so as to not trigger separate builds