HCSVLAB-664 More updates to environment config