Fixes in the env variables

Related-PROD: K0RQA-15
Change-Id: Ib4693ede9a554aa5ade8ebdbec0765e94321a90e
3 files changed