From a9ad8b01013256d18b98aad06348422505b78785 Mon Sep 17 00:00:00 2001
From: Om Mishra <32200996+mishraomp@users.noreply.github.com>
Date: Wed, 11 Mar 2026 11:41:03 -0700
Subject: [PATCH 1/3] chore: upgrade crunchy action and needed parameters

---
 .github/workflows/.deployer.yml | 2 +-
 charts/crunchy/values.yml       | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/.deployer.yml b/.github/workflows/.deployer.yml
index 9077b12d6..a5dc44c0b 100644
--- a/.github/workflows/.deployer.yml
+++ b/.github/workflows/.deployer.yml
@@ -92,7 +92,7 @@ jobs:
       tag: ${{ inputs.tag || steps.pr.outputs.pr }}
       triggered: ${{ steps.deploy.outputs.triggered }}
     steps:
-      - uses: bcgov/action-crunchy@a109166ff26880dc75676492a33b816ac0ce392f # v1.2.6
+      - uses: bcgov/action-crunchy@v2.0.0
         name: Deploy Crunchy
         id: deploy_crunchy
         with:
diff --git a/charts/crunchy/values.yml b/charts/crunchy/values.yml
index 93b5f3783..82ba0eff2 100644
--- a/charts/crunchy/values.yml
+++ b/charts/crunchy/values.yml
@@ -4,8 +4,9 @@ global:
     dbName: app #test
 crunchy: # enable it for TEST and PROD, for PR based pipelines simply use single postgres
   enabled: true
-  postgresVersion: 17
-  postGISVersion: 3.4
+  postgresVersion: 18
+  postGISVersion: '3.6'
+  image: "artifacts.developer.gov.bc.ca/bcgov-docker-local/crunchy-postgres-gis:ubi9-18.1-3.6-2547"
   openshift: true
   imagePullPolicy: IfNotPresent
   # enable below to start a new crunchy cluster after disaster from a backed-up location, crunchy will choose the best place to recover from.

From d834b6dcc8964528f95bcbf179b1c33ecb864d85 Mon Sep 17 00:00:00 2001
From: Om Mishra <32200996+mishraomp@users.noreply.github.com>
Date: Wed, 11 Mar 2026 12:07:23 -0700
Subject: [PATCH 2/3] use sha

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Om Mishra <32200996+mishraomp@users.noreply.github.com>
---
 .github/workflows/.deployer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/.deployer.yml b/.github/workflows/.deployer.yml
index a5dc44c0b..bed7f8058 100644
--- a/.github/workflows/.deployer.yml
+++ b/.github/workflows/.deployer.yml
@@ -92,7 +92,7 @@ jobs:
       tag: ${{ inputs.tag || steps.pr.outputs.pr }}
       triggered: ${{ steps.deploy.outputs.triggered }}
     steps:
-      - uses: bcgov/action-crunchy@v2.0.0
+      - uses: bcgov/action-crunchy@3f8a74a8a798edc2cc74e07bcb35c50a7611d0bb # v2.0.0
         name: Deploy Crunchy
         id: deploy_crunchy
         with:

From f43699d21064abb70bcb72ce472bcd6b0a0277f3 Mon Sep 17 00:00:00 2001
From: Om Mishra <32200996+mishraomp@users.noreply.github.com>
Date: Wed, 11 Mar 2026 12:13:08 -0700
Subject: [PATCH 3/3] fix: move back to v2 copilot suggestion was incorrect

---
 .github/workflows/.deployer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/.deployer.yml b/.github/workflows/.deployer.yml
index bed7f8058..a5dc44c0b 100644
--- a/.github/workflows/.deployer.yml
+++ b/.github/workflows/.deployer.yml
@@ -92,7 +92,7 @@ jobs:
       tag: ${{ inputs.tag || steps.pr.outputs.pr }}
       triggered: ${{ steps.deploy.outputs.triggered }}
     steps:
-      - uses: bcgov/action-crunchy@3f8a74a8a798edc2cc74e07bcb35c50a7611d0bb # v2.0.0
+      - uses: bcgov/action-crunchy@v2.0.0
         name: Deploy Crunchy
         id: deploy_crunchy
         with: