<!--IssueSummary start--> <details> <summary> Everyone can contribute. [Help move this issue forward](https://handbook.gitlab.com/handbook/marketing/developer-relations/contributor-success/community-contributors-workflows/#contributor-links) while earning points, leveling up and collecting rewards. </summary> - [Close this issue](https://contributors.gitlab.com/manage-issue?action=close&projectId=278964&issueIid=421670) </details> <!--IssueSummary end--> ## Problem Statement This is a follow-up issue based on a discussion started [here](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/merge_requests/1033#note_1502332170). Since the original MR was merged, this refactor can be done as a standalone task.