Cleanup and Simplify ci code structure

Jan Kienerequested to merge
knj/cleanup-and-simplification into main

Based on branch from !62 (merged)

Merge request reports