Merge "Fix ocata-cicd model"