Update to new inline defconfig