Improve crtct.yml 2