GONRG-6466: Update env_var
See merge request !923 (merged)
(cherry picked from commit fb765ab8)
20588bf5 Update env_var