diff --git a/.github/workflows/sbi-build-deploy.yml b/.github/workflows/sbi-build-deploy.yml
index 0dffbb515..46089cc7b 100644
--- a/.github/workflows/sbi-build-deploy.yml
+++ b/.github/workflows/sbi-build-deploy.yml
@@ -11,7 +11,8 @@ defaults:
 
 jobs:
   cancel-previous-runs:
-    runs-on: ubuntu-latest
+    # runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       actions: write
     steps:
@@ -21,7 +22,8 @@ jobs:
           access_token: ${{ github.token }}
 
   build:
-    runs-on: ubuntu-latest
+    # runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./.pipeline
@@ -38,7 +40,8 @@ jobs:
           DEBUG=* npm run build -- --pr=${{ github.event.pull_request.number }} --git.branch.name=${{github.head_ref}} --git.ref=${{github.head_ref}}
 
   deploy-to-dev:
-    runs-on: ubuntu-latest
+    # runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [build]
     defaults:
       run:
@@ -59,7 +62,8 @@ jobs:
     needs: [build, deploy-to-dev]
     environment:
       name: test
-    runs-on: ubuntu-latest
+    # runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./.pipeline
@@ -79,7 +83,8 @@ jobs:
     needs: [build, deploy-to-test]
     environment:
       name: prod
-    runs-on: ubuntu-latest
+    # runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./.pipeline
diff --git a/openshift/api-deploy-config.yaml b/openshift/api-deploy-config.yaml
index 27a918e56..f29d93f36 100644
--- a/openshift/api-deploy-config.yaml
+++ b/openshift/api-deploy-config.yaml
@@ -16,15 +16,20 @@ objects:
     spec:
       lookupPolicy:
         local: false
-  - apiVersion: v1 #dc: api
-    kind: DeploymentConfig
+  # - apiVersion: v1 #dc: api
+  - apiVersion: apps/v1
+    kind: Deployment
     metadata:
       creationTimestamp: null
       name: ${NAME}${SUFFIX}
+      labels:
+        deployment: ${NAME}${SUFFIX}
     spec:
       replicas: 1
       selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+        # deploymentconfig: ${NAME}${SUFFIX}
+        matchLabels:
+          deployment: ${NAME}${SUFFIX}
       strategy:
         activeDeadlineSeconds: 21600
         rollingParams:
@@ -33,26 +38,27 @@ objects:
           maxUnavailable: 1
           timeoutSeconds: 600
           updatePeriodSeconds: 1
-        type: Rolling
+        type: RollingUpdate
       template:
         metadata:
           creationTimestamp: null
           labels:
-            deploymentconfig: ${NAME}${SUFFIX}
+            # deploymentconfig: ${NAME}${SUFFIX}
+            deployment: ${NAME}${SUFFIX}
         spec:
           containers:
-            - image: ${NAME}:${VERSION}
+            - image: image-registry.openshift-image-registry.svc:5000/e82e9a-${ENV}/${NAME}:${VERSION}
               name: api
               ports:
                 - containerPort: 8080
                   protocol: TCP
-              resources:
-                requests:
-                  cpu: 500m
-                  memory: 512Mi
-                limits:
-                  cpu: 750m
-                  memory: 768Mi
+              # resources:
+              #   requests:
+              #     cpu: 500m
+              #     memory: 512Mi
+              #   limits:
+              #     cpu: 750m
+              #     memory: 768Mi
               livenessProbe:
                 httpGet:
                   path: /healthz
@@ -160,7 +166,8 @@ objects:
           protocol: TCP
           targetPort: 8080
       selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+        # deploymentconfig: ${NAME}${SUFFIX}
+        deployment: ${NAME}${SUFFIX}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME
diff --git a/openshift/backup-deploy-config.yaml b/openshift/backup-deploy-config.yaml
index 14d17d728..348aff2b3 100644
--- a/openshift/backup-deploy-config.yaml
+++ b/openshift/backup-deploy-config.yaml
@@ -50,20 +50,24 @@ objects:
       ftp-url: "${FTP_URL}"
       ftp-user: "${FTP_USER}"
       ftp-password: "${FTP_PASSWORD}"
-  - kind: DeploymentConfig
-    apiVersion: v1
+  - kind: Deployment
+    # apiVersion: v1
+    apiVersion: apps/v1
     metadata:
       name: "${NAME}-${ENV}"
       labels:
         template: "${NAME}-${ENV}"
-      annotations:
-        description: Defines how to deploy the ${NAME}-${ENV}
+        name: "${NAME}-${ENV}"
+      # annotations:
+      #   description: Defines how to deploy the ${NAME}-${ENV}
     spec:
       strategy:
         type: Recreate
       replicas: 1
       selector:
-        name: "${NAME}-${ENV}"
+        # name: "${NAME}-${ENV}"
+        matchLabels:
+          name: "${NAME}-${ENV}"
       template:
         metadata:
           name: "${NAME}-${ENV}"
diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index f9cb304f4..271e0c1f8 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -16,35 +16,41 @@ objects:
     spec:
       lookupPolicy:
         local: false
-  - apiVersion: v1
-    kind: DeploymentConfig
+  # - apiVersion: v1
+  - apiVersion: apps/v1
+    kind: Deployment
     metadata:
       creationTimestamp: null
       name: ${NAME}${SUFFIX}
+      labels:
+        deployment: ${NAME}${SUFFIX}
     spec:
       replicas: 1
       selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+        # deploymentconfig: ${NAME}${SUFFIX}
+        matchLabels:
+          deployment: ${NAME}${SUFFIX}
       strategy: {}
       template:
         metadata:
           creationTimestamp: null
           labels:
-            deploymentconfig: ${NAME}${SUFFIX}
+            # deploymentconfig: ${NAME}${SUFFIX}
+            deployment: ${NAME}${SUFFIX}
         spec:
           containers:
-            - image: ${NAME}:${VERSION}
+            - image: image-registry.openshift-image-registry.svc:5000/e82e9a-${ENV}/${NAME}:${VERSION}
               name: client
               ports:
                 - containerPort: 8080
                   protocol: TCP
-              resources:
-                requests:
-                  cpu: 250m
-                  memory: 32Mi
-                limits:
-                  cpu: 250m
-                  memory: 64Mi
+              # resources:
+              #   requests:
+              #     cpu: 250m
+              #     memory: 32Mi
+              #   limits:
+              #     cpu: 250m
+              #     memory: 64Mi
               env:
                 - name: REACT_APP_SSO_HOST
                   valueFrom:
@@ -83,6 +89,8 @@ objects:
     metadata:
       creationTimestamp: null
       name: ${NAME}${SUFFIX}
+      labels:
+        deployment: ${NAME}${SUFFIX}
     spec:
       ports:
         - name: web
@@ -90,12 +98,12 @@ objects:
           protocol: TCP
           targetPort: 8080
       selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+        deployment: ${NAME}${SUFFIX}
   - apiVersion: route.openshift.io/v1
     kind: Route
     metadata:
-      annotations:
-        haproxy.router.openshift.io/timeout: 1h
+      # annotations:
+      #   haproxy.router.openshift.io/timeout: 1h
       creationTimestamp: null
       name: ${NAME}-${ENV}
     spec:
@@ -151,3 +159,5 @@ parameters:
     name: SOURCE_REPOSITORY_REF
     required: false
     value: ""
+
+
diff --git a/openshift/pdf-deploy-config.yaml b/openshift/pdf-deploy-config.yaml
index f711a4eea..9ffc279b3 100644
--- a/openshift/pdf-deploy-config.yaml
+++ b/openshift/pdf-deploy-config.yaml
@@ -16,15 +16,20 @@ objects:
     spec:
       lookupPolicy:
         local: false
-  - apiVersion: v1 #dc: pdf
-    kind: DeploymentConfig
+  # - apiVersion: v1 #dc: pdf
+  - apiVersion: apps/v1
+    kind: Deployment
     metadata:
       creationTimestamp: null
       name: ${NAME}${SUFFIX}
+      labels:
+        deployment: ${NAME}${SUFFIX}
     spec:
       replicas: 1
       selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+        # deploymentconfig: ${NAME}${SUFFIX}
+        matchLabels:
+          deployment: ${NAME}${SUFFIX}
       strategy:
         activeDeadlineSeconds: 21600
         rollingParams:
@@ -33,15 +38,16 @@ objects:
           maxUnavailable: 1
           timeoutSeconds: 600
           updatePeriodSeconds: 1
-        type: Rolling
+        type: RollingUpdate
       template:
         metadata:
           creationTimestamp: null
           labels:
-            deploymentconfig: ${NAME}${SUFFIX}
+            # deploymentconfig: ${NAME}${SUFFIX}
+            deployment: ${NAME}${SUFFIX}
         spec:
           containers:
-            - image: ${NAME}:${VERSION}
+            - image: image-registry.openshift-image-registry.svc:5000/e82e9a-${ENV}/${NAME}:${VERSION}
               name: pdf
               ports:
                 - containerPort: 8080
@@ -81,6 +87,8 @@ objects:
     metadata:
       creationTimestamp: null
       name: ${NAME}${SUFFIX}
+      labels:
+        deployment: ${NAME}${SUFFIX}
     spec:
       ports:
         - name: web
@@ -88,7 +96,7 @@ objects:
           protocol: TCP
           targetPort: 8080
       selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+        deployment: ${NAME}${SUFFIX}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME
diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index 36a66081c..86d5600e7 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -3,16 +3,20 @@ apiVersion: template.openshift.io/v1
 metadata:
   name: ${PROJECT_NAME}
 objects:
-  - apiVersion: v1
-    kind: DeploymentConfig
+  - apiVersion: apps/v1
+    kind: Deployment
     metadata:
       name: ${NAME}-${ENV}
+      labels:
+        deployment: ${NAME}-${ENV}
     labels:
       shared: "true"
     spec:
       replicas: 1
       selector:
-        deploymentconfig: ${NAME}-${ENV}
+        # deploymentconfig: ${NAME}-${ENV}
+        matchLabels:
+          deployment: ${NAME}-${ENV}
       strategy:
         activeDeadlineSeconds: 21600
         resources: {}
@@ -23,7 +27,8 @@ objects:
         metadata:
           name: ${NAME}-${ENV}
           labels:
-            deploymentconfig: ${NAME}-${ENV}
+            # deploymentconfig: ${NAME}-${ENV}
+            deployment: ${NAME}-${ENV}
         spec:
           containers:
             - image: image-registry.openshift-image-registry.svc:5000/e82e9a-tools/${IMAGE_STREAM_TAG}
@@ -50,13 +55,13 @@ objects:
               ports:
                 - containerPort: 5432
                   protocol: TCP
-              resources:
-                requests:
-                  cpu: 250m
-                  memory: 512Mi
-                limits:
-                  cpu: 500m
-                  memory: 1Gi
+              # resources:
+              #   requests:
+              #     cpu: 250m
+              #     memory: 512Mi
+              #   limits:
+              #     cpu: 500m
+              #     memory: 1Gi
               terminationMessagePath: /dev/termination-log
               terminationMessagePolicy: File
               volumeMounts:
@@ -121,8 +126,9 @@ objects:
     apiVersion: v1
     metadata:
       name: ${NAME}-${ENV}
-    labels:
-      shared: "true"
+      labels:
+        shared: "true"
+        deployment: ${NAME}-${ENV}
     spec:
       ports:
         - name: postgresql
@@ -130,7 +136,7 @@ objects:
           port: 5432
           targetPort: 5432
       selector:
-        deploymentconfig: ${NAME}-${ENV}
+        deployment: ${NAME}-${ENV}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME
diff --git a/openshift/secrets/ccw-secrets.yaml b/openshift/secrets/ccw-secrets.yaml
index 056c31f28..28a52a238 100644
--- a/openshift/secrets/ccw-secrets.yaml
+++ b/openshift/secrets/ccw-secrets.yaml
@@ -3,13 +3,17 @@ kind: Template
 metadata:
   creationTimestamp: null
   name: "true"
+  labels:
+    deployment: ${NAME}${SUFFIX}
 objects:
   - kind: Secret
     apiVersion: v1
     metadata:
       name: ${NAME}${SUFFIX}
     selector:
-      deploymentconfig: ${NAME}${SUFFIX}
+      # deploymentconfig: ${NAME}${SUFFIX}
+      matchLabels:
+          deployment: ${NAME}${SUFFIX}
     stringData:
       CCW_USER_ID: "${CCW_USER_ID}"
       CCW_USER_GUID: "${CCW_USER_GUID}"
diff --git a/openshift/secrets/db-postgresql-secrets.yaml b/openshift/secrets/db-postgresql-secrets.yaml
index 30420f950..4eee5ded0 100644
--- a/openshift/secrets/db-postgresql-secrets.yaml
+++ b/openshift/secrets/db-postgresql-secrets.yaml
@@ -3,13 +3,17 @@ kind: Template
 metadata:
   creationTimestamp: null
   name: "true"
+  labels:
+    deployment: ${NAME}${SUFFIX}
 objects:
   - kind: Secret
     apiVersion: v1
     metadata:
       name: ${NAME}-${ENV}
     selector:
-      deploymentconfig: ${NAME}-${ENV}
+      # deploymentconfig: ${NAME}-${ENV}
+      matchLabels:
+          deployment: ${NAME}${SUFFIX}
     stringData:
       admin-password: "${POSTGRESQL_ADMIN_PASSWORD}"
       database-password: "${POSTGRESQL_PASSWORD}"
diff --git a/openshift/secrets/ftp-secrets.yaml b/openshift/secrets/ftp-secrets.yaml
index 9ccfd8a8e..0be9656b1 100644
--- a/openshift/secrets/ftp-secrets.yaml
+++ b/openshift/secrets/ftp-secrets.yaml
@@ -3,13 +3,17 @@ kind: Template
 metadata:
   creationTimestamp: null
   name: "true"
+  labels:
+    deployment: ${NAME}${SUFFIX}
 objects:
   - kind: Secret
     apiVersion: v1
     metadata:
       name: ${NAME}${SUFFIX}
     selector:
-      deploymentconfig: ${NAME}${SUFFIX}
+      # deploymentconfig: ${NAME}${SUFFIX}
+      matchLabels:
+          deployment: ${NAME}${SUFFIX}
     stringData:
       ftp-user: "${FTP_USER}"
       ftp-password: "${FTP_PASSWORD}"