diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 22a1171..7504964 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -21,14 +21,14 @@ jobs:
     name: Set Variables
     outputs:
       pr: ${{ steps.pr.outputs.pr }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     timeout-minutes: 1
     steps: # Get PR number for squash merges to main
       - name: PR Number
         id: pr
         uses: bcgov-nr/action-get-pr@v0.0.1
   semantic-release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs: [vars]
     outputs:
       tag: ${{ steps.changelog.outputs.tag }}
@@ -65,7 +65,7 @@ jobs:
   builds:
     name: Builds
     needs: semantic-release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       packages: write
     strategy:
@@ -95,7 +95,7 @@ jobs:
           build_args: |
             APP_VERSION=${{ needs.semantic-release.outputs.version }}
   helm-release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     needs: [builds,semantic-release]
     if: ${{ needs.semantic-release.outputs.version != '' }}
     steps:
diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
index 9204761..0abbe72 100644
--- a/.github/workflows/pr-close.yml
+++ b/.github/workflows/pr-close.yml
@@ -17,8 +17,13 @@ jobs:
     name: Cleanup OpenShift
     env:
       release: ${{ github.event.repository.name }}-${{ github.event.number }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4.14.37"
+
       - name: Remove OpenShift artifacts
         run: |
           oc login --token=${{ secrets.OC_TOKEN }} --server=${{ vars.OC_SERVER }}
@@ -32,7 +37,7 @@ jobs:
   image-promotions:
     name: Image Promotions
     if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       packages: write
     strategy:
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index f8623df..1da6155 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -13,7 +13,7 @@ jobs:
   builds:
     name: Builds
     if: '!github.event.pull_request.head.repo.fork'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       packages: write
     strategy:
@@ -48,7 +48,7 @@ jobs:
     name: Deploys
     needs:
       - builds
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     environment: test
     env:
       project_name: nr-oracle
@@ -56,6 +56,11 @@ jobs:
       environment: development
       secret_path_env: dev # this path is different from the path in the broker
     steps:
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4.14.37"
+
       - uses: actions/checkout@v4
 
       - name: Deploy to Openshift