diff --git a/sysadmin/T3592-elastic-workers/worker/templates/deployment.yaml b/sysadmin/T3592-elastic-workers/worker/templates/deployment.yaml
index 6f473a5..31f9e40 100644
--- a/sysadmin/T3592-elastic-workers/worker/templates/deployment.yaml
+++ b/sysadmin/T3592-elastic-workers/worker/templates/deployment.yaml
@@ -1,65 +1,65 @@
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: loaders
   labels:
     app: loaders
 spec:
-  replicas: {{ .Values.default_replicas }}
+  replicas: {{ .Values.swh.loader.replicas.default }}
   selector:
     matchLabels:
       app: loaders
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: loaders
     spec:
       containers:
       - name: loaders
         image: {{ .Values.swh.loader.image }}:{{ .Values.swh.loader.version }}
         imagePullPolicy: Always
         command:
           - /entrypoint.sh
         resources:
           requests:
             memory: "256Mi"
             cpu: "200m"
           limits:
             memory: "4000Mi"
             cpu: "1200m"
         lifecycle:
           preStop:
            exec:
              command: ["kill", "1"]
         env:
         - name: CONCURRENCY
           value: "1"
         - name: MAX_TASKS_PER_CHILD
           value: "5"
         - name: LOGLEVEL
           value: "INFO"
         - name: SWH_CONFIG_FILENAME
           value: /etc/softwareheritage/config.yml
         volumeMounts:
           - name: config
             mountPath: /etc/softwareheritage/config.yml
             subPath: config.yml
             readOnly: true
           - name: config
             mountPath: /entrypoint.sh
             subPath: entrypoint.sh
             readOnly: true
           - mountPath: /tmp
             name: tmp-volume
       volumes:
         - name: config
           configMap:
             name: loaders
             defaultMode: 0777
         - name: tmp-volume
           emptyDir: {}
diff --git a/sysadmin/T3592-elastic-workers/worker/values.yaml b/sysadmin/T3592-elastic-workers/worker/values.yaml
index fa8d305..9f77fab 100644
--- a/sysadmin/T3592-elastic-workers/worker/values.yaml
+++ b/sysadmin/T3592-elastic-workers/worker/values.yaml
@@ -1,17 +1,20 @@
 # Default values for worker.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
 amqp:
   user: guest
   password: guest
   host: amqp
 
 storage:
   host: swh-storage
 
 swh:
   loader:
     image: swh/loaders
     version: latest
-    default_replica: 5
+    replicas:
+      min: 1
+      max: 10
+      default: 5