HG-17: Added support for different environments