Refactor AIO script and fix for Epoxy#1705

Alex-Welsh wants to merge 2 commits intostackhpc/2025.1stackhpc/stackhpc-kayobe-config:stackhpc/2025.1from

aio-bitsstackhpc/stackhpc-kayobe-config:aio-bitsCopy head branch name to clipboard