Fix base-files CI references
This is a cherry pick of commits already applied to v2021dev2
Edited by Ritesh Raj Sarraf
🟠 v2026dev0 entered Soft Code Freeze/Hard Feature Freeze, only bug fixes will be accepted • schedule
This is a cherry pick of commits already applied to v2021dev2