diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
index 3db2d0a3..6c76232f 100644
--- a/.github/workflows/pr-close.yml
+++ b/.github/workflows/pr-close.yml
@@ -6,54 +6,16 @@ on:
       - closed
 
 concurrency:
-  group: pr-${{ github.ref }}
+  group: ${{ github.event.number }}
   cancel-in-progress: true
 
 jobs:
-  setup:
-    name: Reset the deployment number
-    runs-on: ubuntu-22.04
-    outputs:
-      zone: ${{ steps.calculate.outputs.zone }}
-    steps:
-      - name: Calculate the deployment number
-        id: calculate
-        run: |
-          echo "zone=$((${{ github.event.number }} % 50))" >> $GITHUB_OUTPUT
-
-  # Tag images for promotion on GitHub Container Registry (ghcr.io)
-  image-promotions:
-    name: Tag images
-    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
-    runs-on: ubuntu-22.04
-    needs: setup
-    env:
-      ZONE: ${{ needs.setup.outputs.zone }}
-    strategy:
-      matrix:
-        package: [api, admin, db, public]
-    steps:
-      - uses: shrink/actions-docker-registry-tag@v4
-        with:
-          registry: ghcr.io
-          repository: ${{ github.repository }}/${{ matrix.package }}
-          target: ${{ env.ZONE }}
-          tags: test
-
-  cleanup-openshift:
-    name: Cleanup OpenShift
-    runs-on: ubuntu-22.04
-    needs: setup
-    env:
-      NAME: fom
-      ZONE: ${{ needs.setup.outputs.zone }}      
-    steps:
-      - uses: actions/checkout@v4
-      - name: Remove OpenShift artifacts
-        run: |
-          oc login --token=${{ secrets.OC_TOKEN }} --server=${{ vars.OC_SERVER }}
-          oc project ${{ vars.OC_NAMESPACE }}
-
-          # Remove old build runs, build pods and deployment pods
-          oc delete all,pvc,secret,cm -l app=${{ env.NAME }}-${{ env.ZONE }}
-
+  cleanup:
+    name: Cleanup and Images
+    uses: bcgov/quickstart-openshift-helpers/.github/workflows/.pr-close.yml@v0.8.1
+    secrets:
+      oc_namespace: ${{ vars.OC_NAMESPACE }}
+      oc_token: ${{ secrets.OC_TOKEN }}
+    with:
+      cleanup: label
+      packages: api public admin db
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index cdcd892d..d95eae67 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: pr-${{ github.ref }}
+  group: ${{ github.event.number }}
   cancel-in-progress: true
 
 jobs: