Add modifications for the Cloudbase CI