Reduce config duplication

Change-Id: I87d79e6e115fab338f30c864eaf9b379ecc9f828