Switch to new defconfig