diff --git a/k8s/yaml/components.yaml b/k8s/yaml/components.yaml
index 94cad4471a..9de84d0cc7 100644
--- a/k8s/yaml/components.yaml
+++ b/k8s/yaml/components.yaml
@@ -500,7 +500,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: 'docker.io/seldonio/seldonv2-controller:2.8.3'
+        image: 'docker.io/seldonio/seldonv2-controller:2.8.4-rc1'
         imagePullPolicy: 'IfNotPresent'
         livenessProbe:
           httpGet:
@@ -603,7 +603,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: 'docker.io/seldonio/seldon-scheduler:2.8.3'
+        image: 'docker.io/seldonio/seldon-scheduler:2.8.4-rc1'
         imagePullPolicy: 'IfNotPresent'
         name: scheduler
         ports:
@@ -750,7 +750,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: 'docker.io/seldonio/seldon-pipelinegateway:2.8.3'
+        image: 'docker.io/seldonio/seldon-pipelinegateway:2.8.4-rc1'
         imagePullPolicy: 'IfNotPresent'
         name: pipelinegateway
         ports:
@@ -877,7 +877,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: 'docker.io/seldonio/seldon-modelgateway:2.8.3'
+        image: 'docker.io/seldonio/seldon-modelgateway:2.8.4-rc1'
         imagePullPolicy: 'IfNotPresent'
         name: modelgateway
         resources:
@@ -946,7 +946,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: 'docker.io/seldonio/seldon-hodometer:2.8.3'
+        image: 'docker.io/seldonio/seldon-hodometer:2.8.4-rc1'
         imagePullPolicy: 'IfNotPresent'
         name: hodometer
         resources:
@@ -993,7 +993,7 @@ spec:
               key: ca.crt
               name: 'seldon-controlplane-server'
               optional: true
-        image: 'docker.io/seldonio/seldon-envoy:2.8.3'
+        image: 'docker.io/seldonio/seldon-envoy:2.8.4-rc1'
         imagePullPolicy: 'IfNotPresent'
         name: envoy
         ports:
@@ -1090,7 +1090,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: 'docker.io/seldonio/seldon-dataflow-engine:2.8.3'
+        image: 'docker.io/seldonio/seldon-dataflow-engine:2.8.4-rc1'
         imagePullPolicy: 'IfNotPresent'
         name: dataflow-engine
         resources:
@@ -1142,7 +1142,7 @@ metadata:
 spec:
   podSpec:
     containers:
-    - image: 'docker.io/seldonio/seldon-rclone:2.8.3'
+    - image: 'docker.io/seldonio/seldon-rclone:2.8.4-rc1'
       imagePullPolicy: 'IfNotPresent'
       lifecycle:
         preStop:
@@ -1184,8 +1184,6 @@ spec:
         value: '600'
       - name: SELDON_SCALING_STATS_PERIOD_SECONDS
         value: '20'
-      - name: SELDON_OVERCOMMIT_PERCENTAGE
-        value: '10'
       - name: SELDON_MAX_TIME_READY_SUB_SERVICE_AFTER_START_SECONDS
         value: '30'
       - name: SELDON_MAX_ELAPSED_TIME_READY_SUB_SERVICE_BEFORE_START_MINUTES
@@ -1200,6 +1198,8 @@ spec:
         value: '5'
       - name: SELDON_MAX_UNLOAD_RETRY_COUNT
         value: '1'
+      - name: SELDON_OVERCOMMIT_PERCENTAGE
+        value: '10'
       - name: CONTROL_PLANE_SECURITY_PROTOCOL
         value: 'PLAINTEXT'
       - name: CONTROL_PLANE_CLIENT_TLS_SECRET_NAME
@@ -1271,7 +1271,7 @@ spec:
           resourceFieldRef:
             containerName: mlserver
             resource: requests.memory
-      image: 'docker.io/seldonio/seldon-agent:2.8.3'
+      image: 'docker.io/seldonio/seldon-agent:2.8.4-rc1'
       imagePullPolicy: 'IfNotPresent'
       lifecycle:
         preStop:
@@ -1396,7 +1396,7 @@ metadata:
 spec:
   podSpec:
     containers:
-    - image: 'docker.io/seldonio/seldon-rclone:2.8.3'
+    - image: 'docker.io/seldonio/seldon-rclone:2.8.4-rc1'
       imagePullPolicy: 'IfNotPresent'
       lifecycle:
         preStop:
@@ -1438,6 +1438,20 @@ spec:
         value: '600'
       - name: SELDON_SCALING_STATS_PERIOD_SECONDS
         value: '20'
+      - name: SELDON_MAX_TIME_READY_SUB_SERVICE_AFTER_START_SECONDS
+        value: '30'
+      - name: SELDON_MAX_ELAPSED_TIME_READY_SUB_SERVICE_BEFORE_START_MINUTES
+        value: '15'
+      - name: SELDON_PERIOD_READY_SUB_SERVICE_SECONDS
+        value: '60'
+      - name: SELDON_MAX_LOAD_ELAPSED_TIME_MINUTES
+        value: '120'
+      - name: SELDON_MAX_UNLOAD_ELAPSED_TIME_MINUTES
+        value: '15'
+      - name: SELDON_MAX_LOAD_RETRY_COUNT
+        value: '5'
+      - name: SELDON_MAX_UNLOAD_RETRY_COUNT
+        value: '1'
       - name: SELDON_OVERCOMMIT_PERCENTAGE
         value: '10'
       - name: CONTROL_PLANE_SECURITY_PROTOCOL
@@ -1503,7 +1517,7 @@ spec:
           resourceFieldRef:
             containerName: triton
             resource: requests.memory
-      image: 'docker.io/seldonio/seldon-agent:2.8.3'
+      image: 'docker.io/seldonio/seldon-agent:2.8.4-rc1'
       imagePullPolicy: 'IfNotPresent'
       lifecycle:
         preStop: