Merge pull request #1998 from antmicro/umarcor/organise

ci: organise