Fix configuration process

Change-Id: I1cf2ccc86cc1ab1f83cff45963a87e65ff59d9b4