Update CLI smoke to latest upstream updates

Be aware that this breaks compatibility with compose, at least for now.