diff --git a/gitops/charts/traffic-court-online/charts/staff-web/templates/configmap.yaml b/gitops/charts/traffic-court-online/charts/staff-web/templates/configmap.yaml
index 47475cd14..c1463485b 100644
--- a/gitops/charts/traffic-court-online/charts/staff-web/templates/configmap.yaml
+++ b/gitops/charts/traffic-court-online/charts/staff-web/templates/configmap.yaml
@@ -14,3 +14,7 @@ data:
       client_max_body_size 10M;
     }
     error_log stderr warn;
+  {{ if .Values.courtHouseDataConfig }}
+  courthouse-data.json: |-
+{{ include "staff-web.tplvalues.render" ( dict "value" .Values.courtHouseDataConfig "context" $ ) | indent 4 }}
+  {{- end }}
diff --git a/gitops/charts/traffic-court-online/charts/staff-web/templates/deployment.yaml b/gitops/charts/traffic-court-online/charts/staff-web/templates/deployment.yaml
index e1459f62d..887f53679 100644
--- a/gitops/charts/traffic-court-online/charts/staff-web/templates/deployment.yaml
+++ b/gitops/charts/traffic-court-online/charts/staff-web/templates/deployment.yaml
@@ -45,6 +45,12 @@ spec:
               mountPath: /usr/share/nginx/html/assets/app.config.json
               readOnly: true
               subPath: app.config.json
+            {{- if .Values.courtHouseDataConfig }}
+            - name: court-house-data
+              mountPath: /usr/share/nginx/html/assets/courthouse-data.json
+              readOnly: true
+              subPath: courthouse-data.json
+            {{- end }}
             - name: configuration
               mountPath: /usr/share/nginx/html/assets/config/keycloak.config.json
               readOnly: true
@@ -60,6 +66,10 @@ spec:
             items:
               - key: app.config.json
                 path: app.config.json
+              {{- if .Values.courtHouseDataConfig }}
+              - key: courthouse-data.json
+                path: courthouse-data.json
+              {{- end }}
               - key: keycloak.config.json
                 path: keycloak.config.json
               - key: nginx-api-proxy-pass.conf
diff --git a/gitops/charts/traffic-court-online/charts/staff-web/values.yaml b/gitops/charts/traffic-court-online/charts/staff-web/values.yaml
index 6ecb48f7a..dad2cb111 100644
--- a/gitops/charts/traffic-court-online/charts/staff-web/values.yaml
+++ b/gitops/charts/traffic-court-online/charts/staff-web/values.yaml
@@ -81,6 +81,16 @@ appConfig: ""
 ##
 keycloakConfig: ""
 
+## @param court house data configuration file
+## courtHouseDataConfig: | -
+##   {
+##     "courthouses": [
+##        { "id": "10264.0007", "name": "100 Mile House Law Courts", "typeCode": "CTH", "__team": "D"},
+##        { "id": "9393.0007", "name": "Abbotsford Provincial Court", "typeCode": "CTH", "__team": "C"}
+##     ]
+##   }
+##
+courtHouseDataConfig: ""
 
 ## Pod Disruption Budget configuration
 ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
diff --git a/gitops/charts/traffic-court-prod-values.yaml b/gitops/charts/traffic-court-prod-values.yaml
index 340e9fe3f..352c40713 100644
--- a/gitops/charts/traffic-court-prod-values.yaml
+++ b/gitops/charts/traffic-court-prod-values.yaml
@@ -289,6 +289,118 @@ staff-web:
           "dispute":true
         }
       }
+  courtHouseDataConfig: |
+    {
+      "courthouses": [
+        { "id": "10264.0007", "name": "100 Mile House Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "9393.0007", "name": "Abbotsford Law Courts", "typeCode": "CTH", "__team": "C" },
+        { "id": "104.0007", "name": "Alexis Creek Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "105.0007", "name": "Anahim Lake Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "50764.0009", "name": "Anvil Centre", "typeCode": "CTH", "__team": "D" },
+        { "id": "106.0007", "name": "Atlin Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "10244.0007", "name": "Bella Bella Provincial Court", "typeCode": "CTH", "__team": "C" },
+        { "id": "10245.0007", "name": "Bella Coola Provincial Court", "typeCode": "CTH", "__team": "C" },
+        { "id": "107.0007", "name": "Burns Lake Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "9067.0007", "name": "Campbell River Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "23.0007", "name": "Castlegar Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "109.0007", "name": "Chetwynd Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "51064.0009", "name": "Chilliwack Cultural Centre", "typeCode": "CTH", "__team": "C" },
+        { "id": "8824.0007", "name": "Chilliwack Law Courts", "typeCode": "CTH", "__team": "C" },
+        { "id": "28.0007", "name": "Clearwater Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "51514.0009", "name": "Coast Kamloops Hotel & Conference Centre", "typeCode": "CTH", "__team": "D" },
+        { "id": "9068.0007", "name": "Courtenay Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "51316.0009", "name": "Cowichan Community Centre", "typeCode": "CTH", "__team": "D" },
+        { "id": "29.0007", "name": "Cranbrook Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "77.0007", "name": "Creston Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "10266.0007", "name": "Daajing Giids Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "110.0007", "name": "Dawson Creek Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "111.0007", "name": "Dease Lake Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "33414.0007", "name": "Downtown Community Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "10231.0007", "name": "Duncan Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "52214.0009", "name": "Erwin Stege Community Centre", "typeCode": "CTH", "__team": "D" },
+        { "id": "50814.0009", "name": "Evergreen Hall", "typeCode": "CTH", "__team": "D" },
+        { "id": "78.0007", "name": "Fernie Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "112.0007", "name": "Fort Nelson Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "113.0007", "name": "Fort St James Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "114.0007", "name": "Fort St John Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "115.0007", "name": "Fraser Lake Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "10232.0007", "name": "Ganges Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "10233.0007", "name": "Gold River Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "79.0007", "name": "Golden Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "108.0007", "name": "Good Hope Lake Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "80.0007", "name": "Grand Forks Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "124.0007", "name": "Hazelton Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "116.0007", "name": "Houston Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "117.0007", "name": "Hudson's Hope Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "51464.0009", "name": "Inn at the Quay", "typeCode": "CTH", "__team": "D" },
+        { "id": "81.0007", "name": "Invermere Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "20263.0007", "name": "Justice Centre (Judicial)", "typeCode": "CTH", "__team": "D" },
+        { "id": "82.0007", "name": "Kamloops Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "51164.0009", "name": "Kamloops Thompson River University", "typeCode": "CTH", "__team": "D" },
+        { "id": "83.0007", "name": "Kelowna Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "118.0007", "name": "Kitimat Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "51714.0009", "name": "Kiwanis Performing Arts Centre", "typeCode": "CTH", "__team": "D" },
+        { "id": "16988.0007", "name": "Klemtu Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "10257.0007", "name": "Kwadacha Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "52114.0009", "name": "Lillooet Elks Hall", "typeCode": "CTH", "__team": "D" },
+        { "id": "85.0007", "name": "Lillooet Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "119.0007", "name": "Lower Post Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "120.0007", "name": "Mackenzie Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "121.0007", "name": "Masset Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "122.0007", "name": "McBride Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "51264.0009", "name": "Merritt Civic Centre", "typeCode": "CTH", "__team": "D" },
+        { "id": "87.0007", "name": "Merritt Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "51214.0009", "name": "Nakusp & District Sports Complex", "typeCode": "CTH", "__team": "D" },
+        { "id": "88.0007", "name": "Nakusp Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "8805.0007", "name": "Nanaimo Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "50864.0009", "name": "Nelson Capitol Theatre", "typeCode": "CTH", "__team": "D" },
+        { "id": "89.0007", "name": "Nelson Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "123.0007", "name": "New Aiyansh Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "8839.0007", "name": "New Westminster Law Courts", "typeCode": "CTH", "__team": "C" },
+        { "id": "9064.0007", "name": "North Vancouver Provincial Court", "typeCode": "CTH", "__team": "B" },
+        { "id": "29464.0007", "name": "Office of the Chief Judge", "typeCode": "CTH", "__team": "D" },
+        { "id": "10246.0007", "name": "Pemberton Provincial Court", "typeCode": "CTH", "__team": "B" },
+        { "id": "91.0007", "name": "Penticton Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "52465.0009", "name": "Penticton Seniors Centre", "typeCode": "CTH", "__team": "D" },
+        { "id": "10235.0007", "name": "Port Alberni Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "8834.0007", "name": "Port Coquitlam Law Courts", "typeCode": "CTH", "__team": "C" },
+        { "id": "10236.0007", "name": "Port Hardy Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "10237.0007", "name": "Powell River Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "8844.0007", "name": "Prince George Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "9075.0007", "name": "Prince Rupert Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "92.0007", "name": "Princeton Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "9074.0007", "name": "Quesnel Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "93.0007", "name": "Revelstoke Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "9062.0007", "name": "Richmond Provincial Court", "typeCode": "CTH", "__team": "B" },
+        { "id": "10250.0007", "name": "Robson Square Provincial Court", "typeCode": "CTH", "__team": "A" },
+        { "id": "94.0007", "name": "Rossland Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "95.0007", "name": "Salmon Arm Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "10248.0007", "name": "Sechelt Provincial Court", "typeCode": "CTH", "__team": "B" },
+        { "id": "10238.0007", "name": "Sidney Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "9073.0007", "name": "Smithers Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "10256.0007", "name": "Sparwood Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "10267.0007", "name": "Stewart Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "8841.0007", "name": "Surrey Provincial Court", "typeCode": "CTH", "__team": "B" },
+        { "id": "10239.0007", "name": "Tahsis Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "9072.0007", "name": "Terrace Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "51364.0009", "name": "Terrace Sportsplex", "typeCode": "CTH", "__team": "D" },
+        { "id": "10240.0007", "name": "Tofino Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "10258.0007", "name": "Tsay Keh Dene Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "10268.0007", "name": "Tumbler Ridge Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "10241.0007", "name": "Ucluelet Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "9144.0007", "name": "Valemount Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "8816.0007", "name": "Vancouver Law Courts", "typeCode": "CTH", "__team": "A" },
+        { "id": "8813.0007", "name": "Vancouver Provincial Court", "typeCode": "CTH", "__team": "A" },
+        { "id": "9071.0007", "name": "Vanderhoof Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "96.0007", "name": "Vernon Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "8807.0007", "name": "Victoria Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "31964.0007", "name": "Violation Ticket Centre", "typeCode": "CTH", "__team": "A" },
+        { "id": "10243.0007", "name": "Western Communities Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "51365.0009", "name": "Williams Lake Elks Hall", "typeCode": "CTH", "__team": "D" },
+        { "id": "9070.0007", "name": "Williams Lake Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "52615.0009", "name": "Williams Lake MacKinnon Hall", "typeCode": "CTH", "__team": "D" },
+      ]
+    }
 
 workflow-service:
   replicaCount: 3
diff --git a/gitops/charts/traffic-court-test-values.yaml b/gitops/charts/traffic-court-test-values.yaml
index eb91c1c37..45a01d68d 100644
--- a/gitops/charts/traffic-court-test-values.yaml
+++ b/gitops/charts/traffic-court-test-values.yaml
@@ -266,6 +266,51 @@ staff-web:
           "dispute":true
         }
       }
+  courtHouseDataConfig: |
+    {
+      "courthouses": [
+        { "id": "9393.0007", "name": "Abbotsford Law Courts", "typeCode": "CTH", "__team": "C" },
+        { "id": "50764.0009", "name": "Anvil Centre", "typeCode": "CTH", "__team": "D" },
+        { "id": "10244.0007", "name": "Bella Bella Provincial Court", "typeCode": "CTH", "__team": "C" },
+        { "id": "10245.0007", "name": "Bella Coola Provincial Court", "typeCode": "CTH", "__team": "C" },
+        { "id": "9067.0007", "name": "Campbell River Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "19640.0999", "name": "Chilliwack Law Courts", "typeCode": "CTH", "__team": "C" },
+        { "id": "29.0007", "name": "Cranbrook Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "110.0007", "name": "Dawson Creek Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "19585.0103", "name": "Downtown Community Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "10231.0007", "name": "Duncan Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "50814.0009", "name": "Evergreen Hall", "typeCode": "CTH", "__team": "D" },
+        { "id": "10232.0007", "name": "Ganges Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "10233.0007", "name": "Gold River Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "19574.0103", "name": "Justice Centre", "typeCode": "CTH", "__team": "D" },
+        { "id": "83.0007", "name": "Kelowna Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "118.0007", "name": "Kitimat Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "16960.0002", "name": "Klemtu Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "87.0007", "name": "Merritt", "typeCode": "CTH", "__team": "D" },
+        { "id": "8805.0007", "name": "Nanaimo Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "8839.0007", "name": "New Westminster Law Courts", "typeCode": "CTH", "__team": "C" },
+        { "id": "10246.0007", "name": "Pemberton Provincial Court", "typeCode": "CTH", "__team": "B" },
+        { "id": "10235.0007", "name": "Port Alberni Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "8834.0007", "name": "Port Coquitlam Provincial Court", "typeCode": "CTH", "__team": "C" },
+        { "id": "10236.0007", "name": "Port Hardy Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "10237.0007", "name": "Powell River", "typeCode": "CTH", "__team": "D" },
+        { "id": "9075.0007", "name": "Prince Rupert", "typeCode": "CTH", "__team": "D" },
+        { "id": "92.0007", "name": "Princeton Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "10250.0007", "name": "Robson Square Provincial Court", "typeCode": "CTH", "__team": "A" },
+        { "id": "94.0007", "name": "Rossland Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "95.0007", "name": "salmon Arm law", "typeCode": "CTH", "__team": "D" },
+        { "id": "9073.0007", "name": "Smithers Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "8841.0007", "name": "Surrey Provincial Court", "typeCode": "CTH", "__team": "B" },
+        { "id": "9072.0007", "name": "Terrace Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "10240.0007", "name": "Tofino Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "10241.0007", "name": "Ucluelet Provincial Court", "typeCode": "CTH", "__team": "D" },
+        { "id": "8816.0007", "name": "Vancouver Law Courts", "typeCode": "CTH", "__team": "A" },
+        { "id": "8813.0007", "name": "Vancouver Provincial Court", "typeCode": "CTH", "__team": "A" },
+        { "id": "96.0007", "name": "Vernon Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "8807.0007", "name": "Victoria Law Courts", "typeCode": "CTH", "__team": "D" },
+        { "id": "19577.0103", "name": "Violation Ticket Centre", "typeCode": "CTH", "__team": "A" }
+      ]
+    }
 
 workflow-service:
   replicaCount: 3
diff --git a/gitops/openshift/tools/image-streams/jaegertracing-all-in-one.yaml b/gitops/openshift/tools/image-streams/jaegertracing-all-in-one.yaml
index 9edce034c..db00279ee 100644
--- a/gitops/openshift/tools/image-streams/jaegertracing-all-in-one.yaml
+++ b/gitops/openshift/tools/image-streams/jaegertracing-all-in-one.yaml
@@ -18,3 +18,12 @@ spec:
         scheduled: true
       referencePolicy:
         type: Source
+    - name: '1'
+      from:
+        kind: DockerImage
+        name: 'artifacts.developer.gov.bc.ca/docker-remote/jaegertracing/all-in-one:1'
+        imagePullSecret: 'artifacts-default-gpffbq'
+      importPolicy:
+        scheduled: true
+      referencePolicy:
+        type: Source
diff --git a/gitops/openshift/tools/image-streams/keycloak.yaml b/gitops/openshift/tools/image-streams/keycloak.yaml
index 482bc3963..425489a70 100644
--- a/gitops/openshift/tools/image-streams/keycloak.yaml
+++ b/gitops/openshift/tools/image-streams/keycloak.yaml
@@ -9,6 +9,33 @@ spec:
   lookupPolicy:
     local: true
   tags:
+    - name: '25.0.2-debian-12-r2'
+      from:
+        kind: DockerImage
+        name: 'artifacts.developer.gov.bc.ca/docker-remote/bitnami/keycloak:25.0.2-debian-12-r2'
+        imagePullSecret: 'artifacts-default-gpffbq'
+      importPolicy:
+        scheduled: true
+      referencePolicy:
+        type: Source
+    - name: '24.0.5-debian-12-r8'
+      from:
+        kind: DockerImage
+        name: 'artifacts.developer.gov.bc.ca/docker-remote/bitnami/keycloak:24.0.5-debian-12-r8'
+        imagePullSecret: 'artifacts-default-gpffbq'
+      importPolicy:
+        scheduled: true
+      referencePolicy:
+        type: Source
+    - name: '23.0.7-debian-12-r5'
+      from:
+        kind: DockerImage
+        name: 'artifacts.developer.gov.bc.ca/docker-remote/bitnami/keycloak:23.0.7-debian-12-r5'
+        imagePullSecret: 'artifacts-default-gpffbq'
+      importPolicy:
+        scheduled: true
+      referencePolicy:
+        type: Source
     - name: '23.0.7-debian-12-r4'
       from:
         kind: DockerImage
diff --git a/gitops/openshift/tools/image-streams/node.yaml b/gitops/openshift/tools/image-streams/node.yaml
index 7da78aff4..e17a6151f 100644
--- a/gitops/openshift/tools/image-streams/node.yaml
+++ b/gitops/openshift/tools/image-streams/node.yaml
@@ -9,6 +9,24 @@ spec:
   lookupPolicy:
     local: true
   tags:
+    - name: '20.16'
+      from:
+        kind: DockerImage
+        name: 'artifacts.developer.gov.bc.ca/docker-remote/node:20.16'
+        imagePullSecret: 'artifacts-default-gpffbq'
+      importPolicy:
+        scheduled: true
+      referencePolicy:
+        type: Source
+    - name: '18.20.4'
+      from:
+        kind: DockerImage
+        name: 'artifacts.developer.gov.bc.ca/docker-remote/node:18.20.4'
+        imagePullSecret: 'artifacts-default-gpffbq'
+      importPolicy:
+        scheduled: true
+      referencePolicy:
+        type: Source
     - name: '18.12.1'
       from:
         kind: DockerImage
diff --git a/gitops/openshift/tools/image-streams/pipelines-git-init-rhel8.yaml b/gitops/openshift/tools/image-streams/pipelines-git-init-rhel8.yaml
index 1e3ec5c6f..6e8ad9163 100644
--- a/gitops/openshift/tools/image-streams/pipelines-git-init-rhel8.yaml
+++ b/gitops/openshift/tools/image-streams/pipelines-git-init-rhel8.yaml
@@ -9,18 +9,18 @@ spec:
   lookupPolicy:
     local: true
   tags:
-    - name: 'v1.6.1-4'
+    - name: 'v1.8.1-52'
       from:
         kind: DockerImage
-        name: 'registry.redhat.io/openshift-pipelines/pipelines-git-init-rhel8:v1.6.1-4'
+        name: 'registry.redhat.io/openshift-pipelines/pipelines-git-init-rhel8:v1.8.1-52'
       importPolicy:
         scheduled: true
       referencePolicy:
         type: Source
-    - name: 'v1.8.1-52'
+    - name: 'v1.6.1-4'
       from:
         kind: DockerImage
-        name: 'registry.redhat.io/openshift-pipelines/pipelines-git-init-rhel8:v1.8.1-52'
+        name: 'registry.redhat.io/openshift-pipelines/pipelines-git-init-rhel8:v1.6.1-4'
       importPolicy:
         scheduled: true
       referencePolicy:
diff --git a/gitops/openshift/tools/image-streams/rabbitmq.yaml b/gitops/openshift/tools/image-streams/rabbitmq.yaml
index f99d73c20..6ec32bf08 100644
--- a/gitops/openshift/tools/image-streams/rabbitmq.yaml
+++ b/gitops/openshift/tools/image-streams/rabbitmq.yaml
@@ -9,6 +9,15 @@ spec:
   lookupPolicy:
     local: true
   tags:
+    - name: '3.13.6-debian-12-r1'
+      from:
+        kind: DockerImage
+        name: 'artifacts.developer.gov.bc.ca/docker-remote/bitnami/rabbitmq:3.13.6-debian-12-r1'
+        imagePullSecret: 'artifacts-default-gpffbq'
+      importPolicy:
+        scheduled: true
+      referencePolicy:
+        type: Source
     - name: '3.12.13-debian-12-r2'
       from:
         kind: DockerImage
diff --git a/gitops/openshift/tools/image-streams/redis-cluster.yaml b/gitops/openshift/tools/image-streams/redis-cluster.yaml
index 7dc83e917..0fa095fe9 100644
--- a/gitops/openshift/tools/image-streams/redis-cluster.yaml
+++ b/gitops/openshift/tools/image-streams/redis-cluster.yaml
@@ -9,6 +9,15 @@ spec:
   lookupPolicy:
     local: true
   tags:
+    - name: '7.4.0-debian-12-r0'
+      from:
+        kind: DockerImage
+        name: 'artifacts.developer.gov.bc.ca/docker-remote/bitnami/redis-cluster:7.4.0-debian-12-r0'
+        imagePullSecret: 'artifacts-default-gpffbq'
+      importPolicy:
+        scheduled: true
+      referencePolicy:
+        type: Source
     - name: '7.2.4-debian-12-r9'
       from:
         kind: DockerImage
diff --git a/gitops/openshift/tools/image-streams/redis-exporter.yaml b/gitops/openshift/tools/image-streams/redis-exporter.yaml
index 809bd9fbb..ec3846583 100644
--- a/gitops/openshift/tools/image-streams/redis-exporter.yaml
+++ b/gitops/openshift/tools/image-streams/redis-exporter.yaml
@@ -9,6 +9,15 @@ spec:
   lookupPolicy:
     local: true
   tags:
+    - name: '1.62.0-debian-12-r3'
+      from:
+        kind: DockerImage
+        name: 'artifacts.developer.gov.bc.ca/docker-remote/bitnami/redis-exporter:1.62.0-debian-12-r3'
+        imagePullSecret: 'artifacts-default-gpffbq'
+      importPolicy:
+        scheduled: true
+      referencePolicy:
+        type: Source
     - name: '1.58.0-debian-12-r3'
       from:
         kind: DockerImage
diff --git a/gitops/openshift/tools/image-streams/redis.yaml b/gitops/openshift/tools/image-streams/redis.yaml
index 183b808f2..92c91fb4b 100644
--- a/gitops/openshift/tools/image-streams/redis.yaml
+++ b/gitops/openshift/tools/image-streams/redis.yaml
@@ -9,6 +9,15 @@ spec:
   lookupPolicy:
     local: true
   tags:
+    - name: '7.4.0-debian-12-r0'
+      from:
+        kind: DockerImage
+        name: 'artifacts.developer.gov.bc.ca/docker-remote/bitnami/redis:7.4.0-debian-12-r0'
+        imagePullSecret: 'artifacts-default-gpffbq'
+      importPolicy:
+        scheduled: true
+      referencePolicy:
+        type: Source
     - name: '7.2.4-debian-12-r10'
       from:
         kind: DockerImage