Use installed version for CFN too