Switch to my manifest for Non-CAF