manifest: Track these from CM instead