diff --git a/charts/substra-backend/CHANGELOG.md b/charts/substra-backend/CHANGELOG.md
index 5cac339ef..88b73e90b 100644
--- a/charts/substra-backend/CHANGELOG.md
+++ b/charts/substra-backend/CHANGELOG.md
@@ -1,11 +1,17 @@
 # Changelog
 
-## [22.8.4] - 2023-10-05
+## [22.8.5] - 2023-10-05
 
 ### Chagned
 
 - initContainer `wait-postgresql` refactored to Helm Helper templates 
 
+## [22.8.4] - 2023-10-06
+
+## Changed
+
+- `wait-minio` container definition moved to the Helm helper templates
+
 ## [22.8.3] - 2023-10-06
 
 ### Changed
diff --git a/charts/substra-backend/templates/_helpers.tpl b/charts/substra-backend/templates/_helpers.tpl
index 785a6f7b3..f068a4810 100644
--- a/charts/substra-backend/templates/_helpers.tpl
+++ b/charts/substra-backend/templates/_helpers.tpl
@@ -203,4 +203,13 @@ The hostname we should connect to (external is defined, otherwise integrated)
 - name: wait-postgresql
   image: jwilder/dockerize:0.6.1
   command: ['dockerize', '-wait', 'tcp://{{ template "substra-backend.database.host" . }}:{{ .Values.database.port }}']
+{{- end -}}
+
+{{/*
+`wait-minio` container initialisation used inside of `initContainers`
+*/}}
+{{- define "common.waitMinIOContainer" -}}
+- name: wait-minio
+  image: jwilder/dockerize:0.6.1
+  command: ['dockerize', '-wait', 'tcp://{{ .Release.Name }}-minio:9000']
 {{- end -}}
\ No newline at end of file
diff --git a/charts/substra-backend/templates/deployment-server.yaml b/charts/substra-backend/templates/deployment-server.yaml
index c97a2272c..4b77b4c6f 100644
--- a/charts/substra-backend/templates/deployment-server.yaml
+++ b/charts/substra-backend/templates/deployment-server.yaml
@@ -189,9 +189,7 @@ spec:
             name: ssl-certs
       {{- end }}
       {{- include "common.waitPostgresqlInitContainer" . | nindent 6 }}
-      - name: wait-minio
-        image: jwilder/dockerize:0.6.1
-        command: ['dockerize', '-wait', 'tcp://{{ .Release.Name }}-minio:9000']
+      {{- include "common.waitMinIOContainer" . | nindent 6 }}
       - name: init-migrate
         image: {{ include "substra-backend.images.name" (dict "img" .Values.server.image "defaultTag" $.Chart.AppVersion) }}
         command: ['python', 'manage.py', 'migrate']
diff --git a/charts/substra-backend/templates/statefulset-worker.yaml b/charts/substra-backend/templates/statefulset-worker.yaml
index ef923c88d..5c32335c9 100644
--- a/charts/substra-backend/templates/statefulset-worker.yaml
+++ b/charts/substra-backend/templates/statefulset-worker.yaml
@@ -98,9 +98,7 @@ spec:
           {{- end }}
       {{- end}}
       {{- include "common.waitPostgresqlInitContainer" . | nindent 6 }}
-      - name: wait-minio
-        image: jwilder/dockerize:0.6.1
-        command: ['dockerize', '-wait', 'tcp://{{ .Release.Name }}-minio:9000']
+      {{- include "common.waitMinIOContainer" . | nindent 6}}
       containers:
         - name: worker
           image: {{ include "substra-backend.images.name" (dict "img" .Values.worker.image "defaultTag" $.Chart.AppVersion) }}