CDK-421: Use CLI in demo