use cfg flag instead of evironment variable

Walter Lamplrequested to merge
wlampl/athena:FollowUp46801 into master

Implement @tadej 's suggestion on !46835 (merged)

Merge request reports