Better environment configuration

Change-Id: I0abd18470fde31d63524dcc6ec896fdf767565c4