CI: Some more fixes + cleanup
Continuation of the CI fixes in !1068 (merged) with some more refactoring.
Keeping this separate since the other MR is a rather "critical" fix and should be merged ASAP. This one is nice to have but not critical at the moment. See commit log for details.
Edited by Administrator