Override default config values correctly

Change-Id: If00c23892611ad3db7782315993e392a8f015da0