Fix ENV issues with automation suite