add support for different envs

Change-Id: I92e0facdcd20b0e836a6675146850e1fd11d1c4e