diff --git a/helm/orchard/templates/deployment.yaml b/helm/orchard/templates/deployment.yaml
index 1b7e92b..2ec01bd 100644
--- a/helm/orchard/templates/deployment.yaml
+++ b/helm/orchard/templates/deployment.yaml
@@ -35,12 +35,14 @@ spec:
       initContainers:
         {{- if .Values.migrations.enabled }}
         - name: wait-for-db
-          image: busybox:1.36
+          image: "{{ .Values.initContainer.image.repository }}:{{ .Values.initContainer.image.tag }}"
+          imagePullPolicy: {{ .Values.initContainer.image.pullPolicy }}
           command: ['sh', '-c', 'until nc -z {{ include "orchard.postgresql.host" . }} 5432; do echo waiting for database; sleep 2; done;']
         {{- end }}
         {{- if .Values.minio.enabled }}
         - name: wait-for-minio
-          image: busybox:1.36
+          image: "{{ .Values.initContainer.image.repository }}:{{ .Values.initContainer.image.tag }}"
+          imagePullPolicy: {{ .Values.initContainer.image.pullPolicy }}
           command: ['sh', '-c', 'until nc -z {{ .Release.Name }}-minio 9000; do echo waiting for minio; sleep 2; done;']
         {{- end }}
       containers:
diff --git a/helm/orchard/templates/migration-job.yaml b/helm/orchard/templates/migration-job.yaml
index 255e86a..1b991ca 100644
--- a/helm/orchard/templates/migration-job.yaml
+++ b/helm/orchard/templates/migration-job.yaml
@@ -22,7 +22,8 @@ spec:
       restartPolicy: Never
       initContainers:
         - name: wait-for-db
-          image: busybox:1.36
+          image: "{{ .Values.initContainer.image.repository }}:{{ .Values.initContainer.image.tag }}"
+          imagePullPolicy: {{ .Values.initContainer.image.pullPolicy }}
           command: ['sh', '-c', 'until nc -z {{ include "orchard.postgresql.host" . }} 5432; do echo waiting for database; sleep 2; done;']
       containers:
         - name: migrations
diff --git a/helm/orchard/values.yaml b/helm/orchard/values.yaml
index 72c7f91..c2b3f0a 100644
--- a/helm/orchard/values.yaml
+++ b/helm/orchard/values.yaml
@@ -10,6 +10,13 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
+# Init container image (used for wait-for-db, wait-for-minio)
+initContainer:
+  image:
+    repository: busybox
+    tag: "1.36"
+    pullPolicy: IfNotPresent
+
 serviceAccount:
   create: true
   automount: true
@@ -113,6 +120,11 @@ orchard:
 # PostgreSQL subchart configuration
 postgresql:
   enabled: true
+  image:
+    registry: docker.io
+    repository: bitnami/postgresql
+    tag: "15"
+    pullPolicy: IfNotPresent
   auth:
     username: orchard
     password: orchard-password
@@ -125,6 +137,11 @@ postgresql:
 # MinIO subchart configuration
 minio:
   enabled: true
+  image:
+    registry: docker.io
+    repository: bitnami/minio
+    tag: "latest"
+    pullPolicy: IfNotPresent
   auth:
     rootUser: minioadmin
     rootPassword: minioadmin
@@ -136,6 +153,11 @@ minio:
 # Redis subchart configuration (for future caching)
 redis:
   enabled: false
+  image:
+    registry: docker.io
+    repository: bitnami/redis
+    tag: "7.2"
+    pullPolicy: IfNotPresent
   auth:
     enabled: true
     password: redis-password