diff --git a/.github/workflows/auto-retry.yml b/.github/workflows/auto-retry.yml
deleted file mode 100644
index e9f61c2..0000000
--- a/.github/workflows/auto-retry.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Auto Retry Failed Jobs
-# This is to handle the case where the oc-login setup action fails due to intermittent network blocks (reputation issues on the IP). 
-#The workflow will re-run the failed jobs up to 3 times.
-
-on:
-  workflow_run:
-    workflows:
-      - "1. Build & Deploy to Dev"
-      - "2. Build & Deploy to Test"
-      - "3. Build & Deploy to UAT"
-    types: [completed]
-jobs:
-  retry-failed-job:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.run_attempt < 3 }}
-    permissions:
-      actions: write
-    steps:
-      - name: Re-run failed jobs
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GH_REPO: ${{ github.repository }}
-          RUN_ID: ${{ github.event.workflow_run.id }}
-        run: |
-          gh run rerun "$RUN_ID" --failed
\ No newline at end of file
diff --git a/.github/workflows/crunchy-dr-failover.yaml b/.github/workflows/crunchy-dr-failover.yaml
index 14d4514..41e8083 100644
--- a/.github/workflows/crunchy-dr-failover.yaml
+++ b/.github/workflows/crunchy-dr-failover.yaml
@@ -29,7 +29,8 @@ permissions:
 jobs:
   shutdown-gold-db:
     if: ${{ github.event.inputs.step == '1. Shutdown Gold DB' }}
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: 1. Shutdown Gold DB
     environment:
       name: ${{ github.event.inputs.environment }}
@@ -72,7 +73,8 @@ jobs:
 
   set-golddr-primary:
     if: ${{ github.event.inputs.step == '2. Set Gold DR as Primary DB' }}
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: 2. Set Gold DR as Primary DB
     environment:
       name: ${{ github.event.inputs.environment }}
@@ -124,7 +126,8 @@ jobs:
 
   delete-gold-db:
     if: ${{ github.event.inputs.step == '3. Delete Gold DB' }}
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: 3. Delete Gold DB
     environment:
       name: ${{ github.event.inputs.environment }}
@@ -161,7 +164,8 @@ jobs:
 
   rebuild-gold-standby:
     if: ${{ github.event.inputs.step == '4. Rebuild Gold as Standby' }}
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: 4. Rebuild Gold as Standby
     environment:
       name: ${{ github.event.inputs.environment }}
@@ -215,7 +219,8 @@ jobs:
 
   shutdown-golddr-db:
     if: ${{ github.event.inputs.step == '5. Shutdown Gold DR DB' }}
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: 5. Shutdown Gold DR DB
     environment:
       name: ${{ github.event.inputs.environment }}
@@ -259,7 +264,8 @@ jobs:
 
   set-gold-primary:
     if: ${{ github.event.inputs.step == '6. Set Gold as Primary' }}
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: 6. Set Gold as Primary
     environment:
       name: ${{ github.event.inputs.environment }}
@@ -310,7 +316,8 @@ jobs:
         
   delete-golddr-db:
     if: ${{ github.event.inputs.step == '7. Delete Gold DR DB' }}
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: 7. Delete Gold DR DB
     environment:
       name: ${{ github.event.inputs.environment }}
@@ -348,7 +355,8 @@ jobs:
 
   rebuild-golddr-standby:
     if: ${{ github.event.inputs.step == '8. Rebuild Gold DR as Standby' }}
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: 8. Rebuild Gold DR as Standby
     environment:
       name: ${{ github.event.inputs.environment }}
@@ -404,7 +412,8 @@ jobs:
   sync-monitoring-password:
     if: ${{ github.event.inputs.step == '9. Set Monitoring Password' }}
     name: 9. Sync Monitoring Password
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     environment:
       name: ${{ github.event.inputs.environment }}
     steps:
diff --git a/.github/workflows/crunchy.yml b/.github/workflows/crunchy.yml
index f5708bd..03623d8 100644
--- a/.github/workflows/crunchy.yml
+++ b/.github/workflows/crunchy.yml
@@ -23,7 +23,8 @@ env:
 jobs:
   deploy-gold:
     if: ${{ github.event.inputs.cluster == 'gold' || github.event.inputs.cluster == 'both' }}
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Deploy to Gold (${{ github.event.inputs.environment }})
     environment:
       name: ${{ github.event.inputs.environment }}
@@ -58,7 +59,8 @@ jobs:
 
   deploy-golddr:
     if: ${{ github.event.inputs.cluster == 'golddr' || github.event.inputs.cluster == 'both' }}
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Deploy to GoldDR (${{ github.event.inputs.environment }})
     environment:
       name: ${{ github.event.inputs.environment }}
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 1fac854..44f165e 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -107,7 +107,8 @@ jobs:
 
   update-openshift-gold:
     needs: [setup, build-and-push]
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Deploy to Gold. Tag ${{ needs.setup.outputs.tag_for_helm }}
     environment:
       name: ${{ needs.setup.outputs.environment_name }}
@@ -130,7 +131,8 @@ jobs:
   # GoldDR Runs after Gold Deployment due to GoldDR DB being read-only replica of Gold
   update-openshift-golddr:
     needs: [setup, update-openshift-gold] 
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Deploy to GoldDR. Tag ${{ needs.setup.outputs.tag_for_helm }}
     environment:
       name: ${{ needs.setup.outputs.environment_name }}
diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
index 334e9e4..62da35a 100644
--- a/.github/workflows/prod.yml
+++ b/.github/workflows/prod.yml
@@ -65,7 +65,8 @@ jobs:
 
   update-openshift-gold:
     needs: [setup]
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Deploy to Gold. Tag ${{ needs.setup.outputs.tag_for_helm }}
     environment:
       name: ${{ needs.setup.outputs.environment_name }}
@@ -89,7 +90,8 @@ jobs:
   # GoldDR Runs after Gold Deployment due to GoldDR DB being read-only replica of Gold
   update-openshift-golddr:
     needs: [setup, update-openshift-gold] 
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Deploy to GoldDR. Tag ${{ needs.setup.outputs.tag_for_helm }}
     environment:
       name: ${{ needs.setup.outputs.environment_name }}
diff --git a/.github/workflows/ride-failover.yaml b/.github/workflows/ride-failover.yaml
index c88a71d..9f424a3 100644
--- a/.github/workflows/ride-failover.yaml
+++ b/.github/workflows/ride-failover.yaml
@@ -20,7 +20,8 @@ on:
 jobs:
   scale-down-gold:
     if: ${{ github.event.inputs.step == 'Scale down RIDE in Gold' }}
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Scale down RIDE in Gold (${{ github.event.inputs.environment }})
     environment:
       name: ${{ github.event.inputs.environment }}
@@ -46,7 +47,8 @@ jobs:
 
   scale-down-golddr:
     if: ${{ github.event.inputs.step == 'Scale down RIDE in Gold DR' }}
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Scale down RIDE in Gold DR (${{ github.event.inputs.environment }})
     environment:
       name: ${{ github.event.inputs.environment }}
@@ -71,7 +73,8 @@ jobs:
 
   scale-up-gold:
     if: ${{ github.event.inputs.step == 'Scale up RIDE in Gold' }}
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Scale up RIDE in Gold (${{ github.event.inputs.environment }})
     environment:
       name: ${{ github.event.inputs.environment }}
@@ -100,7 +103,8 @@ jobs:
 
   scale-up-golddr:
     if: ${{ github.event.inputs.step == 'Scale up RIDE in Gold DR' }}
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Scale up RIDE in Gold DR (${{ github.event.inputs.environment }})
     environment:
       name: ${{ github.event.inputs.environment }}
diff --git a/.github/workflows/standbycheck.yml b/.github/workflows/standbycheck.yml
index 7271d3a..87ddf46 100644
--- a/.github/workflows/standbycheck.yml
+++ b/.github/workflows/standbycheck.yml
@@ -63,27 +63,22 @@ jobs:
 
   update-openshift-gold:
     needs: build-and-push-standbycheck
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Deploy Latest Helm Chart to ${{ github.event.inputs.environment }} in Gold
     environment:
       name: ${{ github.event.inputs.environment }}
       url: https://${{ github.event.inputs.environment }}-ride.apps.gold.devops.gov.bc.ca/lbhealth/
     steps:
     - name: Checkout code
-      uses: actions/checkout@v7 
+      uses: actions/checkout@v7
 
-    - name: Install CLI tools from OpenShift Mirror
-      uses: redhat-actions/openshift-tools-installer@v2
-      with:
-        oc: "4"
-          
-    - name: Authenticate and set context for Gold
-      uses: redhat-actions/oc-login@v2
+    - name: OC Setup
+      uses: ./.github/actions/oc-setup
       with:
-        openshift_server_url: ${{ vars.OPENSHIFT_GOLD_SERVER }}
-        openshift_token: ${{ secrets.OPENSHIFT_GOLD_TOKEN }}
+        server: ${{ vars.OPENSHIFT_GOLD_SERVER }}
+        token: ${{ secrets.OPENSHIFT_GOLD_TOKEN }}
         namespace: ${{ vars.OPENSHIFT_NAMESPACE }}
-        insecure_skip_tls_verify: false
 
     - name: Helm upgrade on OpenShift ${{ github.event.inputs.environment }} Environment
       run: |
@@ -95,27 +90,22 @@ jobs:
 
   update-openshift-golddr:
     needs: build-and-push-standbycheck
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Deploy Latest Helm Chart to ${{ github.event.inputs.environment }} in GoldDR
     environment:
       name: ${{ github.event.inputs.environment }}
       url: https://${{ github.event.inputs.environment }}-ride.apps.golddr.devops.gov.bc.ca/lbhealth/
     steps:
     - name: Checkout code
-      uses: actions/checkout@v7 
-
-    - name: Install CLI tools from OpenShift Mirror
-      uses: redhat-actions/openshift-tools-installer@v2
-      with:
-        oc: "4"
+      uses: actions/checkout@v7
 
-    - name: Authenticate and set context for GoldDR
-      uses: redhat-actions/oc-login@v2
+    - name: OC Setup
+      uses: ./.github/actions/oc-setup
       with:
-        openshift_server_url: ${{ vars.OPENSHIFT_GOLDDR_SERVER }}
-        openshift_token: ${{ secrets.OPENSHIFT_GOLDDR_TOKEN }}
+        server: ${{ vars.OPENSHIFT_GOLDDR_SERVER }}
+        token: ${{ secrets.OPENSHIFT_GOLDDR_TOKEN }}
         namespace: ${{ vars.OPENSHIFT_NAMESPACE }}
-        insecure_skip_tls_verify: false
   
     - name: Helm upgrade on OpenShift ${{ github.event.inputs.environment }} Environment
       run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index af8e5c8..bb95852 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -145,7 +145,8 @@ jobs:
 
   update-openshift-gold:
     needs: [setup, build-and-push]
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Deploy to Gold. Tag ${{ needs.setup.outputs.tag_for_helm }}
     environment:
       name: ${{ needs.setup.outputs.environment_name }}
@@ -169,7 +170,8 @@ jobs:
   # GoldDR Runs after Gold Deployment due to GoldDR DB being read-only replica of Gold
   update-openshift-golddr:
     needs: [setup, update-openshift-gold] 
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Deploy to GoldDR. Tag ${{ needs.setup.outputs.tag_for_helm }}
     environment:
       name: ${{ needs.setup.outputs.environment_name }}
diff --git a/.github/workflows/uat.yml b/.github/workflows/uat.yml
index 446f116..1e6fcca 100644
--- a/.github/workflows/uat.yml
+++ b/.github/workflows/uat.yml
@@ -151,7 +151,8 @@ jobs:
 
   update-openshift-gold:
     needs: [setup, build-and-push]
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Deploy to Gold. Tag ${{ needs.setup.outputs.tag_for_helm }}
     environment:
       name: ${{ needs.setup.outputs.environment_name }}
@@ -175,7 +176,8 @@ jobs:
   # GoldDR Runs after Gold Deployment due to GoldDR DB being read-only replica of Gold
   update-openshift-golddr:
     needs: [setup, update-openshift-gold] 
-    runs-on: ubuntu-latest
+    runs-on:
+        group: Larger Runners - OpenShift Static-IP
     name: Deploy to GoldDR. Tag ${{ needs.setup.outputs.tag_for_helm }}
     environment:
       name: ${{ needs.setup.outputs.environment_name }}