Merge branch 'ci/change-order-of-includes' into 'main'

[CI]change order of includes to allow overwriting variables

See merge request !1986