Simplify CI Helper script for better interop