ci: apply cherry-pick fixes for new runner version#19222

johnstcn wants to merge 2 commits intorelease/2.23coder/coder:release/2.23from

cj/release-2.23-ci-fixescoder/coder:cj/release-2.23-ci-fixesCopy head branch name to clipboard