Adjust config

Change-Id: I157f29936db97a5f85ef1258acb6ed93e6087fe8