Refactor organize variables See merge request areas/software-networks/operator-platform/op-automation!8