Configure interfaces to match CI's setup

Change-Id: I2f2285a502f495709db31e153789df37aec44137