diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index 8ba1e270..b75e4c32 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -15,7 +15,7 @@ jobs:
   tests-backend:
     name: Tests (Backend)
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: bcgov-nr/action-test-and-analyse-java@v1.0.2
         with:
@@ -37,7 +37,7 @@ jobs:
   lint-frontend:
     name: Lint (Frontend)
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: bcgov-nr/action-test-and-analyse@v1.2.1
         with:
@@ -52,7 +52,7 @@ jobs:
   tests-frontend:
     name: Tests (Frontend)
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: bcgov-nr/action-test-and-analyse@v1.2.1
         with:
@@ -76,7 +76,7 @@ jobs:
   codeql:
     name: CodeQL
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: github/codeql-action/init@v3
@@ -105,7 +105,7 @@ jobs:
   trivy:
     name: Trivy Security Scan
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 0166ad1e..5d088f05 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -14,10 +14,10 @@ jobs:
   init-test:
     name: TEST Init
     environment: test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: OpenShift Init
-        uses: bcgov-nr/action-deployer-openshift@v3.0.0
+        uses: bcgov-nr/action-deployer-openshift@v3.0.1
         with:
           oc_namespace: ${{ vars.OC_NAMESPACE }}
           oc_server: ${{ vars.OC_SERVER }}
@@ -38,7 +38,7 @@ jobs:
     name: TEST Deployments
     needs: [init-test]
     environment: test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       issues: write
     strategy:
@@ -66,7 +66,7 @@ jobs:
             file: common/openshift.fluentbit.yml
             overwrite: true
     steps:
-      - uses: bcgov-nr/action-deployer-openshift@v3.0.0
+      - uses: bcgov-nr/action-deployer-openshift@v3.0.1
         with:
           file: ${{ matrix.file }}
           oc_namespace: ${{ vars.OC_NAMESPACE }}
@@ -83,10 +83,10 @@ jobs:
     name: PROD Init
     needs: [deploys-test]
     environment: prod
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: OpenShift Init
-        uses: bcgov-nr/action-deployer-openshift@v3.0.0
+        uses: bcgov-nr/action-deployer-openshift@v3.0.1
         with:
           oc_namespace: ${{ vars.OC_NAMESPACE }}
           oc_server: ${{ vars.OC_SERVER }}
@@ -106,7 +106,7 @@ jobs:
   image-promotions:
     name: Promote images to PROD
     needs: [deploys-test]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       packages: write
     strategy:
@@ -124,7 +124,7 @@ jobs:
     name: PROD Deployments
     needs: [init-prod, image-promotions]
     environment: prod
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         name: [database, backend, frontend, fluentbit]
@@ -150,7 +150,7 @@ jobs:
             file: common/openshift.fluentbit.yml
             overwrite: true
     steps:
-      - uses: bcgov-nr/action-deployer-openshift@v3.0.0
+      - uses: bcgov-nr/action-deployer-openshift@v3.0.1
         with:
           file: ${{ matrix.file }}
           oc_namespace: ${{ vars.OC_NAMESPACE }}
diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
index 802620ff..d6695786 100644
--- a/.github/workflows/pr-close.yml
+++ b/.github/workflows/pr-close.yml
@@ -15,8 +15,11 @@ jobs:
   cleanup-openshift:
     name: Cleanup OpenShift
     if: '!github.event.pull_request.head.repo.fork'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
+      - uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Remove OpenShift artifacts
         run: |
           oc login --token=${{ secrets.OC_TOKEN }} --server=${{ vars.OC_SERVER }}
@@ -29,7 +32,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-24.04
     strategy:
       matrix:
         package: [database, backend, frontend]
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index b1710ef0..1455f75f 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -17,7 +17,7 @@ jobs:
     if: "!github.event.pull_request.head.repo.fork"
     outputs:
       route: ${{ github.event.number }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       pull-requests: write
     steps:
@@ -47,7 +47,7 @@ jobs:
             [Main Merge Workflow](https://github.com/${{ github.repository }}/actions/workflows/merge-main.yml)
 
       - name: OpenShift Init
-        uses: bcgov-nr/action-deployer-openshift@v3.0.0
+        uses: bcgov-nr/action-deployer-openshift@v3.0.1
         with:
           oc_namespace: ${{ vars.OC_NAMESPACE }}
           oc_server: ${{ vars.OC_SERVER }}
@@ -69,7 +69,7 @@ jobs:
     name: Builds
     needs: [init]
     if: "!github.event.pull_request.head.repo.fork"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       packages: write
     strategy:
@@ -96,7 +96,7 @@ jobs:
     name: Deploys
     if: "!github.event.pull_request.head.repo.fork"
     needs: [builds]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         name: [database, backend, frontend, fluentbit]
@@ -127,7 +127,7 @@ jobs:
           - name: fluentbit
             file: common/openshift.fluentbit.yml
     steps:
-      - uses: bcgov-nr/action-deployer-openshift@v3.0.0
+      - uses: bcgov-nr/action-deployer-openshift@v3.0.1
         with:
           file: ${{ matrix.file }}
           oc_namespace: ${{ vars.OC_NAMESPACE }}