Fix env var creation
General MR
Summary
(Summarize the purpose of the MR)
Relevant logs/screenshots
(Include any relevant logs/screenshots)
Linked Issue
Upgrade Notices
(Include any relevant notes about upgrades here or write "N/A" if there are none)