diff --git a/admin-frontend/openshift.deploy.yml b/admin-frontend/openshift.deploy.yml
deleted file mode 100644
index ae31b1bd9..000000000
--- a/admin-frontend/openshift.deploy.yml
+++ /dev/null
@@ -1,180 +0,0 @@
-apiVersion: template.openshift.io/v1
-kind: Template
-labels:
-  app: ${NAME}-${ZONE}
-  app.kubernetes.io/part-of: ${NAME}-${ZONE}
-parameters:
-  - name: NAME
-    description: Module name
-    value: fin-pay-transparency
-  - name: COMPONENT
-    description: Component name
-    value: frontend
-  - name: ZONE
-    description: Deployment zone, e.g. pr-### or prod
-    required: true
-  - name: IMAGE_TAG
-    description: Image tag to use
-    value: latest
-  - name: DOMAIN
-    value: apps.silver.devops.gov.bc.ca
-  - name: CPU_REQUEST
-    value: '15m'
-  - name: MEMORY_REQUEST
-    value: '20Mi'
-  - name: CPU_LIMIT
-    value: '45m'
-  - name: MEMORY_LIMIT
-    value: '60Mi'
-  - name: MIN_REPLICAS
-    description: The minimum amount of replicas for the horizontal pod autoscaler.
-    value: '1'
-  - name: MAX_REPLICAS
-    description: The maximum amount of replicas for the horizontal pod autoscaler.
-    value: '1'
-  - name: REGISTRY
-    description: Container registry to import from (internal is image-registry.openshift-image-registry.svc:5000)
-    value: ghcr.io
-  - name: PROMOTE
-    description: Image (namespace/name:tag) to promote/import
-    value: bcgov/fin-pay-transparency/frontend:prod
-  - name: LOG_LEVEL
-    description: Caddy logging level DEBUG, INFO, WARN, ERROR, PANIC, and FATAL (https://github.com/caddyserver/caddy/blob/master/logging.go)
-    value: "info"
-objects:
-  - apiVersion: v1
-    kind: ImageStream
-    metadata:
-      labels:
-        app: ${NAME}-${ZONE}
-      name: ${NAME}-${ZONE}-${COMPONENT}
-    spec:
-      lookupPolicy:
-        local: false
-      tags:
-        - name: ${IMAGE_TAG}
-          from:
-            kind: DockerImage
-            name: ${REGISTRY}/${PROMOTE}
-          referencePolicy:
-            type: Local
-
-  - apiVersion: v1
-    kind: DeploymentConfig
-    metadata:
-      labels:
-        app: ${NAME}-${ZONE}
-      name: ${NAME}-${ZONE}-${COMPONENT}
-    spec:
-      replicas: 1
-      triggers:
-        - type: ConfigChange
-        - type: ImageChange
-          imageChangeParams:
-            automatic: true
-            containerNames:
-              - ${NAME}
-            from:
-              kind: ImageStreamTag
-              name: ${NAME}-${ZONE}-${COMPONENT}:${IMAGE_TAG}
-      selector:
-        deploymentconfig: ${NAME}-${ZONE}-${COMPONENT}
-      strategy:
-        type: Rolling
-      template:
-        metadata:
-          labels:
-            app: ${NAME}-${ZONE}
-            deploymentconfig: ${NAME}-${ZONE}-${COMPONENT}
-        spec:
-          containers:
-            - image: ${NAME}-${ZONE}-${COMPONENT}:${IMAGE_TAG}
-              securityContext:
-                capabilities:
-                  add: [ "NET_BIND_SERVICE" ]
-              imagePullPolicy: Always
-              name: ${NAME}
-              env:
-                - name: BACKEND_URL
-                  value: http://${NAME}-${ZONE}-backend
-                - name: LOG_LEVEL
-                  value: ${LOG_LEVEL}
-              ports:
-                - containerPort: 3000
-                  protocol: TCP
-              resources:
-                requests:
-                  cpu: ${CPU_REQUEST}
-                  memory: ${MEMORY_REQUEST}
-                limits:
-                  cpu: ${CPU_LIMIT}
-                  memory: ${MEMORY_LIMIT}
-              readinessProbe:
-                httpGet:
-                  path: /health
-                  port: 3001
-                  scheme: HTTP
-                initialDelaySeconds: 5
-                periodSeconds: 2
-                timeoutSeconds: 2
-                successThreshold: 1
-                failureThreshold: 30
-              livenessProbe:
-                successThreshold: 1
-                failureThreshold: 3
-                httpGet:
-                  path: /health
-                  port: 3001
-                  scheme: HTTP
-                initialDelaySeconds: 15
-                periodSeconds: 30
-                timeoutSeconds: 5
-  - apiVersion: v1
-    kind: Service
-    metadata:
-      labels:
-        app: ${NAME}-${ZONE}
-      name: ${NAME}-${ZONE}-${COMPONENT}
-    spec:
-      ports:
-        - name: 3000-tcp
-          protocol: TCP
-          port: 80
-          targetPort: 3000
-      selector:
-        deploymentconfig: ${NAME}-${ZONE}-${COMPONENT}
-  - apiVersion: route.openshift.io/v1
-    kind: Route
-    metadata:
-      labels:
-        app: ${NAME}-${ZONE}
-      name: ${NAME}-${ZONE}-${COMPONENT}
-    spec:
-      host: ${NAME}-${ZONE}-${COMPONENT}.${DOMAIN}
-      port:
-        targetPort: 3000-tcp
-      to:
-        kind: Service
-        name: ${NAME}-${ZONE}-${COMPONENT}
-        weight: 100
-      tls:
-        termination: edge
-        insecureEdgeTerminationPolicy: Redirect
-  - apiVersion: autoscaling/v2
-    kind: HorizontalPodAutoscaler
-    metadata:
-      name: ${NAME}-${ZONE}-${COMPONENT}
-    spec:
-      scaleTargetRef:
-        apiVersion: apps.openshift.io/v1
-        kind: DeploymentConfig
-        name: ${NAME}-${ZONE}-${COMPONENT}
-      minReplicas: ${{MIN_REPLICAS}}
-      maxReplicas: ${{MAX_REPLICAS}}
-      metrics:
-        - type: Resource
-          resource:
-            name: cpu
-            target:
-              type: Utilization
-              averageUtilization: 100
diff --git a/admin-frontend/package-lock.json b/admin-frontend/package-lock.json
index 65096f712..cc609e7f0 100644
--- a/admin-frontend/package-lock.json
+++ b/admin-frontend/package-lock.json
@@ -2390,9 +2390,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.8.tgz",
-      "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==",
+      "version": "1.7.9",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
diff --git a/admin-frontend/package.json b/admin-frontend/package.json
index e518cebc2..979dab275 100644
--- a/admin-frontend/package.json
+++ b/admin-frontend/package.json
@@ -125,7 +125,7 @@
   },
   "overrides": {
     "cldr-data-downloader@1.0.0-1": {
-      "axios": "1.7.8"
+      "axios": "1.7.9"
     }
   }
 }
diff --git a/charts/fin-pay-transparency/charts/crunchy-postgres/templates/PostgresCluster.yaml b/charts/fin-pay-transparency/charts/crunchy-postgres/templates/PostgresCluster.yaml
index 0b84ea75a..6c1764671 100644
--- a/charts/fin-pay-transparency/charts/crunchy-postgres/templates/PostgresCluster.yaml
+++ b/charts/fin-pay-transparency/charts/crunchy-postgres/templates/PostgresCluster.yaml
@@ -46,9 +46,6 @@ spec:
           requests:
             cpu: {{ .Values.pgmonitor.exporter.requests.cpu }}
             memory: {{ .Values.pgmonitor.exporter.requests.memory }}
-          limits:
-            cpu: {{ .Values.pgmonitor.exporter.limits.cpu }}
-            memory: {{ .Values.pgmonitor.exporter.limits.memory }}
 
   {{ end }}
 
@@ -63,18 +60,12 @@ spec:
         requests:
           cpu: {{ .Values.instances.requests.cpu }}
           memory: {{ .Values.instances.requests.memory }}
-        limits:
-          cpu: {{ .Values.instances.limits.cpu }}
-          memory: {{ .Values.instances.limits.memory }}
       sidecars:
         replicaCertCopy:
           resources:
             requests:
               cpu: {{ .Values.instances.replicaCertCopy.requests.cpu }}
               memory: {{ .Values.instances.replicaCertCopy.requests.memory }}
-            limits:
-              cpu: {{ .Values.instances.replicaCertCopy.limits.cpu }}
-              memory: {{ .Values.instances.replicaCertCopy.limits.memory }}
       dataVolumeClaimSpec:
         accessModes:
           - "ReadWriteOnce"
@@ -154,9 +145,6 @@ spec:
           requests:
             cpu: {{ .Values.pgBackRest.repoHost.requests.cpu }}
             memory: {{ .Values.pgBackRest.repoHost.requests.memory }}
-          limits:
-            cpu: {{ .Values.pgBackRest.repoHost.limits.cpu }}
-            memory: {{ .Values.pgBackRest.repoHost.limits.memory }}
       sidecars:
         # this stuff is for the "pgbackrest" container in the "postgres-crunchy-ha" set of pods
         pgbackrest:
@@ -164,25 +152,16 @@ spec:
             requests:
               cpu: {{ .Values.pgBackRest.sidecars.requests.cpu }}
               memory: {{ .Values.pgBackRest.sidecars.requests.memory }}
-            limits:
-              cpu: {{ .Values.pgBackRest.sidecars.limits.cpu }}
-              memory: {{ .Values.pgBackRest.sidecars.limits.memory }}
         pgbackrestConfig:
           resources:
             requests:
               cpu: {{ .Values.pgBackRest.sidecars.requests.cpu }}
               memory: {{ .Values.pgBackRest.sidecars.requests.memory }}
-            limits:
-              cpu: {{ .Values.pgBackRest.sidecars.limits.cpu }}
-              memory: {{ .Values.pgBackRest.sidecars.limits.memory }}
       jobs:
         resources:
           requests:
             cpu: {{ .Values.pgBackRest.jobs.requests.cpu }}
             memory: {{ .Values.pgBackRest.jobs.requests.memory }}
-          limits:
-            cpu: {{ .Values.pgBackRest.jobs.limits.cpu }}
-            memory: {{ .Values.pgBackRest.jobs.limits.memory }}
   {{- end }}
   patroni:
     dynamicConfiguration:
@@ -212,9 +191,6 @@ spec:
         requests:
           cpu: {{ .Values.proxy.pgBouncer.requests.cpu }}
           memory: {{ .Values.proxy.pgBouncer.requests.memory }}
-        limits:
-          cpu: {{ .Values.proxy.pgBouncer.limits.cpu }}
-          memory: {{ .Values.proxy.pgBouncer.limits.memory }}
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
diff --git a/charts/fin-pay-transparency/values-dev.yaml b/charts/fin-pay-transparency/values-dev.yaml
index e4c490f3f..6feff3fc8 100644
--- a/charts/fin-pay-transparency/values-dev.yaml
+++ b/charts/fin-pay-transparency/values-dev.yaml
@@ -77,23 +77,17 @@ backend:
     port: 80
     targetPort: 3000
   resources:
-    limits:
+    requests:
       cpu: 150m
       memory: 500Mi
-    requests:
-      cpu: 50m
-      memory: 250Mi
   initResources:
-    limits:
+    requests:
       cpu: 350m
       memory: 250Mi
-    requests:
-      cpu: 150m
-      memory: 100Mi
 
   autoscaling:
     enabled: true
-    minReplicas: 3
+    minReplicas: 2
     maxReplicas: 5
     targetCPUUtilizationPercentage: 60 # this percentage from request cpu
   storage:
@@ -133,17 +127,14 @@ frontend:
     port: 80
     targetPort: 3000
   resources:
-    limits:
+    requests:
       cpu: 50m
       memory: 150Mi
-    requests:
-      cpu: 15m
-      memory: 50Mi
   env:
     logLevel: info
   autoscaling:
     enabled: true
-    minReplicas: 3
+    minReplicas: 2
     maxReplicas: 5
     targetCPUUtilizationPercentage: 80 # this percentage from request cpu
   podSecurityContext: {}
@@ -158,7 +149,6 @@ admin-frontend:
   env:
     isAdminDashboardAvailable: true
     isAdminAnalyticsAvailable: true
-    isAdminAnalyticsAvailable: true
 database:
   enabled: false
 crunchy:
@@ -186,21 +176,15 @@ crunchy:
       annotations:
         prometheus.io/scrape: "true"
         prometheus.io/port: "9187"
-    replicas: 3
+    replicas: 2
     dataVolumeClaimSpec:
       storage: 500Mi
       storageClassName: netapp-block-standard
     requests:
-      cpu: 50m
-      memory: 128Mi
-    limits:
       cpu: 200m
       memory: 256Mi
     replicaCertCopy:
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 20m
         memory: 32Mi
 
@@ -232,30 +216,18 @@ crunchy:
         storageClassName: netapp-file-backup
     config:
       requests:
-        cpu: 5m
-        memory: 32Mi
-      limits:
         cpu: 20m
         memory: 64Mi
     repoHost:
       requests:
-        cpu: 5m
-        memory: 32Mi
-      limits:
         cpu: 20m
         memory: 64Mi
     sidecars:
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 20m
         memory: 64Mi
     jobs:
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 20m
         memory: 64Mi
 
@@ -275,9 +247,6 @@ crunchy:
       image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default
       replicas: 1
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 20m
         memory: 32Mi
 
@@ -287,9 +256,6 @@ crunchy:
     exporter:
       image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 35m
         memory: 32Mi
 doc-gen-service:
@@ -310,12 +276,9 @@ doc-gen-service:
     port: 80
     targetPort: 3000
   resources:
-    limits:
+    requests:
       cpu: 600m
       memory: 350Mi
-    requests:
-      cpu: 100m
-      memory: 50Mi
 
   podSecurityContext: {}
   securityContext: {}
@@ -341,12 +304,9 @@ backend-external:
     port: 80
     targetPort: 3000
   resources:
-    limits:
+    requests:
       cpu: 20m
       memory: 150Mi
-    requests:
-      cpu: 10m
-      memory: 50Mi
   app:
     env:
       logLevel: info
diff --git a/charts/fin-pay-transparency/values-pr.yaml b/charts/fin-pay-transparency/values-pr.yaml
index 977acedaf..4f500992f 100644
--- a/charts/fin-pay-transparency/values-pr.yaml
+++ b/charts/fin-pay-transparency/values-pr.yaml
@@ -41,16 +41,10 @@ global:
 backend:
   deploymentStrategy: Recreate
   initResources:
-    limits:
-      cpu: 350m
-      memory: 500Mi
     requests:
       cpu: 150m
       memory: 250Mi
   resources:
-    limits:
-      cpu: 100m
-      memory: 500Mi
     requests:
       cpu: 50m
       memory: 250Mi
@@ -63,9 +57,6 @@ backend:
 frontend:
   deploymentStrategy: Recreate
   resources:
-    limits:
-      cpu: 30m
-      memory: 150Mi
     requests:
       cpu: 15m
       memory: 50Mi
@@ -76,9 +67,6 @@ frontend:
 admin-frontend:
   deploymentStrategy: Recreate
   resources:
-    limits:
-      cpu: 30m
-      memory: 150Mi
     requests:
       cpu: 15m
       memory: 50Mi
@@ -106,9 +94,6 @@ database:
   tolerations: []
   affinity: {}
   resources:
-    limits:
-      cpu: 150m
-      memory: 250Mi
     requests:
       cpu: 30m
       memory: 100Mi
@@ -139,12 +124,9 @@ doc-gen-service:
     port: 80
     targetPort: 3000
   resources:
-    limits:
-      cpu: 300m
-      memory: 350Mi
     requests:
-      cpu: 30m
-      memory: 50Mi
+      cpu: 50m
+      memory: 150Mi
 
   podSecurityContext: {}
   securityContext: {}
diff --git a/charts/fin-pay-transparency/values-prod.yaml b/charts/fin-pay-transparency/values-prod.yaml
index 599bc139c..59fa2fc1e 100644
--- a/charts/fin-pay-transparency/values-prod.yaml
+++ b/charts/fin-pay-transparency/values-prod.yaml
@@ -77,19 +77,13 @@ backend:
     port: 80
     targetPort: 3000
   resources:
-    limits:
-      cpu: 200m
-      memory: 600Mi
     requests:
-      cpu: 30m
-      memory: 500Mi
+      cpu: 150m
+      memory: 600Mi
   initResources:
-    limits:
-      cpu: 200m
-      memory: 250Mi
     requests:
-      cpu: 30m
-      memory: 100Mi
+      cpu: 150m
+      memory: 250Mi
 
   autoscaling:
     enabled: true
@@ -134,12 +128,9 @@ frontend:
     port: 80
     targetPort: 3000
   resources:
-    limits:
+    requests:
       cpu: 50m
       memory: 150Mi
-    requests:
-      cpu: 15m
-      memory: 50Mi
   env:
     logLevel: info
     snowplowUrl: spt.apps.gov.bc.ca
@@ -194,16 +185,10 @@ crunchy:
       storage: 600Mi
       storageClassName: netapp-block-standard
     requests:
-      cpu: 50m
-      memory: 128Mi
-    limits:
-      cpu: 200m
+      cpu: 150m
       memory: 256Mi
     replicaCertCopy:
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 20m
         memory: 32Mi
 
@@ -235,31 +220,19 @@ crunchy:
 
     config:
       requests:
-        cpu: 5m
-        memory: 32Mi
-      limits:
         cpu: 20m
         memory: 64Mi
     repoHost:
       requests:
-        cpu: 50m
-        memory: 128Mi
-      limits:
         cpu: 200m
         memory: 256Mi
     sidecars:
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 20m
         memory: 64Mi
     jobs:
       requests:
-        cpu: 50m
-        memory: 128Mi
-      limits:
-        cpu: 200m
+        cpu: 100m
         memory: 256Mi
   patroni:
     postgresql:
@@ -277,9 +250,6 @@ crunchy:
       image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default
       replicas: 1
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 20m
         memory: 32Mi
 
@@ -289,9 +259,6 @@ crunchy:
     exporter:
       image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 35m
         memory: 32Mi
 doc-gen-service:
@@ -312,12 +279,9 @@ doc-gen-service:
     port: 80
     targetPort: 3000
   resources:
-    limits:
-      cpu: 650m
-      memory: 350Mi
     requests:
-      cpu: 100m
-      memory: 50Mi
+      cpu: 500m
+      memory: 350Mi
 
   podSecurityContext: {}
   securityContext: {}
@@ -343,12 +307,9 @@ backend-external:
     port: 80
     targetPort: 3000
   resources:
-    limits:
+    requests:
       cpu: 20m
       memory: 150Mi
-    requests:
-      cpu: 10m
-      memory: 50Mi
   app:
     env:
       logLevel: info
diff --git a/charts/fin-pay-transparency/values-test.yaml b/charts/fin-pay-transparency/values-test.yaml
index 7faf3fc0c..413cbda29 100644
--- a/charts/fin-pay-transparency/values-test.yaml
+++ b/charts/fin-pay-transparency/values-test.yaml
@@ -60,7 +60,7 @@ global:
   crunchyEnabled: true
 backend:
   enabled: true
-  deploymentStrategy: RollingUpdate
+  deploymentStrategy: Recreate
   replicaCount: 1
   nameOverride: ""
   fullnameOverride: ""
@@ -77,23 +77,17 @@ backend:
     port: 80
     targetPort: 3000
   resources:
-    limits:
+    requests:
       cpu: 150m
       memory: 300Mi
-    requests:
-      cpu: 50m
-      memory: 150Mi
   initResources:
-    limits:
+    requests:
       cpu: 150m
       memory: 250Mi
-    requests:
-      cpu: 50m
-      memory: 100Mi
 
   autoscaling:
     enabled: true
-    minReplicas: 3
+    minReplicas: 2
     maxReplicas: 5
     targetCPUUtilizationPercentage: 60 # this percentage from request cpu
   storage:
@@ -113,7 +107,7 @@ backend:
   pdb: true
 frontend:
   enabled: true
-  deploymentStrategy: RollingUpdate
+  deploymentStrategy: Recreate
   replicaCount: 1
   nameOverride: ""
   fullnameOverride: ""
@@ -133,17 +127,14 @@ frontend:
     port: 80
     targetPort: 3000
   resources:
-    limits:
-      cpu: 50m
-      memory: 150Mi
     requests:
-      cpu: 15m
-      memory: 50Mi
+      cpu: 30m
+      memory: 150Mi
   env:
     logLevel: info
   autoscaling:
     enabled: true
-    minReplicas: 3
+    minReplicas: 2
     maxReplicas: 5
     targetCPUUtilizationPercentage: 80 # this percentage from request cpu
   podSecurityContext: {}
@@ -181,21 +172,15 @@ crunchy:
       annotations:
         prometheus.io/scrape: "true"
         prometheus.io/port: "9187"
-    replicas: 3
+    replicas: 2
     dataVolumeClaimSpec:
       storage: 4000Mi
       storageClassName: netapp-block-standard
     requests:
-      cpu: 50m
-      memory: 128Mi
-    limits:
       cpu: 200m
       memory: 256Mi
     replicaCertCopy:
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 20m
         memory: 32Mi
 
@@ -227,30 +212,18 @@ crunchy:
 
     config:
       requests:
-        cpu: 5m
-        memory: 32Mi
-      limits:
         cpu: 20m
         memory: 64Mi
     repoHost:
       requests:
-        cpu: 5m
-        memory: 32Mi
-      limits:
         cpu: 20m
         memory: 64Mi
     sidecars:
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 20m
         memory: 64Mi
     jobs:
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 20m
         memory: 64Mi
   patroni:
@@ -269,9 +242,6 @@ crunchy:
       image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default
       replicas: 1
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 20m
         memory: 32Mi
 
@@ -281,9 +251,6 @@ crunchy:
     exporter:
       image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 35m
         memory: 32Mi
 doc-gen-service:
@@ -304,12 +271,9 @@ doc-gen-service:
     port: 80
     targetPort: 3000
   resources:
-    limits:
-      cpu: 600m
-      memory: 350Mi
     requests:
-      cpu: 100m
-      memory: 50Mi
+      cpu: 450m
+      memory: 350Mi
 
   podSecurityContext: {}
   securityContext: {}
@@ -335,12 +299,9 @@ backend-external:
     port: 80
     targetPort: 3000
   resources:
-    limits:
+    requests:
       cpu: 20m
       memory: 150Mi
-    requests:
-      cpu: 10m
-      memory: 50Mi
   app:
     env:
       logLevel: info
diff --git a/charts/fin-pay-transparency/values.yaml b/charts/fin-pay-transparency/values.yaml
index 45ffae5b5..357509be6 100644
--- a/charts/fin-pay-transparency/values.yaml
+++ b/charts/fin-pay-transparency/values.yaml
@@ -79,19 +79,13 @@ backend:
     port: 80
     targetPort: 3000
   resources:
-    limits:
+    requests:
       cpu: 150m
       memory: 250Mi
-    requests:
-      cpu: 50m
-      memory: 100Mi
   initResources:
-    limits:
+    requests:
       cpu: 350m
       memory: 250Mi
-    requests:
-      cpu: 150m
-      memory: 100Mi
 
   autoscaling:
     enabled: true
@@ -136,12 +130,9 @@ frontend:
     port: 80
     targetPort: 3000
   resources:
-    limits:
+    requests:
       cpu: 50m
       memory: 150Mi
-    requests:
-      cpu: 15m
-      memory: 50Mi
   env:
     logLevel: info
     snowplowUrl: spm.apps.gov.bc.ca
@@ -192,12 +183,9 @@ admin-frontend:
     port: 80
     targetPort: 3000
   resources:
-    limits:
-      cpu: 50m
-      memory: 150Mi
     requests:
-      cpu: 15m
-      memory: 50Mi
+      cpu: 30m
+      memory: 100Mi
   env:
     logLevel: info
     isAdminDashboardAvailable: true
@@ -247,19 +235,14 @@ crunchy:
       storage: 500Mi
       storageClassName: netapp-block-standard
     requests:
-      cpu: 50m
-      memory: 128Mi
-    limits:
       cpu: 200m
       memory: 256Mi
     replicaCertCopy:
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 20m
         memory: 32Mi
 
+
   pgBackRest:
     enabled: true
     backupPath: /backups/cluster/version
@@ -287,30 +270,18 @@ crunchy:
         storageClassName: netapp-file-backup
     config:
       requests:
-        cpu: 5m
-        memory: 32Mi
-      limits:
         cpu: 20m
         memory: 64Mi
     repoHost:
       requests:
-        cpu: 5m
-        memory: 32Mi
-      limits:
         cpu: 20m
         memory: 64Mi
     sidecars:
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 20m
         memory: 64Mi
     jobs:
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 20m
         memory: 64Mi
 
@@ -330,9 +301,6 @@ crunchy:
       image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default
       replicas: 1
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 20m
         memory: 32Mi
 
@@ -342,9 +310,6 @@ crunchy:
     exporter:
       image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default
       requests:
-        cpu: 5m
-        memory: 16Mi
-      limits:
         cpu: 35m
         memory: 32Mi
 doc-gen-service:
@@ -365,12 +330,9 @@ doc-gen-service:
     port: 80
     targetPort: 3000
   resources:
-    limits:
+    requests:
       cpu: 650m
       memory: 350Mi
-    requests:
-      cpu: 100m
-      memory: 50Mi
 
   podSecurityContext: {}
   securityContext: {}
@@ -396,12 +358,9 @@ backend-external:
     port: 80
     targetPort: 3000
   resources:
-    limits:
+    requests:
       cpu: 20m
       memory: 150Mi
-    requests:
-      cpu: 10m
-      memory: 50Mi
   app:
     env:
       logLevel: info
@@ -418,9 +377,6 @@ maintenance:
   image:
     tag: ~
   resources:
-    limits:
+    requests:
       cpu: 30m
       memory: 100Mi
-    requests:
-      cpu: 10m
-      memory: 30Mi
diff --git a/clamav-service/charts/clamav-service/templates/clamav/templates/deployment.yaml b/clamav-service/charts/clamav-service/templates/clamav/templates/deployment.yaml
index fda75b42b..6701958b7 100644
--- a/clamav-service/charts/clamav-service/templates/clamav/templates/deployment.yaml
+++ b/clamav-service/charts/clamav-service/templates/clamav/templates/deployment.yaml
@@ -7,6 +7,9 @@ metadata:
     {{- include "clamav.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.clamav.replicaCount }}
+  strategy:
+    type: Recreate
+
   selector:
     matchLabels:
       {{- include "clamav.selectorLabels" . | nindent 6 }}
@@ -43,11 +46,8 @@ spec:
             timeoutSeconds: 3
           resources:
             requests:
-              cpu: 100m
-              memory: 512Mi
-            limits:
-              cpu: 500m
-              memory: 1500Mi
+              cpu: 150m
+              memory: 600Mi
           volumeMounts:
             - mountPath: /opt/app-root/src
               name: signatures
diff --git a/clamav-service/charts/clamav-service/values.yaml b/clamav-service/charts/clamav-service/values.yaml
index 87efb4a8c..9286cbd82 100644
--- a/clamav-service/charts/clamav-service/values.yaml
+++ b/clamav-service/charts/clamav-service/values.yaml
@@ -86,14 +86,11 @@ node:
       type: ClusterIP
       port: 80
       targetPort: 3000
-  deploymentStrategy: RollingUpdate
+  deploymentStrategy: Recreate
   resources:
-    limits:
-      cpu: 50m
-      memory: 250Mi
     requests:
-      cpu: 10m
-      memory: 50Mi
+      cpu: 40m
+      memory: 250Mi
   app:
     env:
       logLevel: "info"
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 51ceb3d4a..3efa48784 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -2268,9 +2268,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.7.8",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.8.tgz",
-      "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==",
+      "version": "1.7.9",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+      "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
diff --git a/frontend/package.json b/frontend/package.json
index c7385fe69..ee64ed9db 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -116,7 +116,7 @@
   },
   "overrides": {
     "cldr-data-downloader@1.0.0-1": {
-      "axios": "1.7.8"
+      "axios": "1.7.9"
     }
   }
 }