Use correct environment to get baseURL
Merge pull request #2496 from teddyzeenny/base-url-env

Use correct environment to get baseURL