Fix CI issues

Merged Thomas Schneider requested to merge th/ci into main

Merge request reports