Modified env vars to UPPERCASE and removed {} around referenced to them