diff --git a/charts/temporal/templates/admintools-deployment.yaml b/charts/temporal/templates/admintools-deployment.yaml
index ff1f9a49..1082986c 100644
--- a/charts/temporal/templates/admintools-deployment.yaml
+++ b/charts/temporal/templates/admintools-deployment.yaml
@@ -22,6 +22,10 @@ spec:
         {{- include "temporal.resourceLabels" (list $ "admintools" "pod") | nindent 8 }}
     spec:
       {{ include "temporal.serviceAccount" $ }}
+      {{- if $.Values.admintools.additionalInitContainers }}
+      initContainers:
+        {{- toYaml $.Values.admintools.additionalInitContainers | nindent 8}}
+      {{- end }}
       containers:
         - name: admin-tools
           image: "{{ .Values.admintools.image.repository }}:{{ .Values.admintools.image.tag }}"
@@ -51,6 +55,10 @@ spec:
                 - /
               initialDelaySeconds: 5
               periodSeconds: 5
+          {{- if $.Values.admintools.additionalVolumeMounts }}
+          volumeMounts:
+            {{- toYaml $.Values.admintools.additionalVolumeMounts | nindent 12}}
+          {{- end }}
           {{- with .Values.admintools.resources }}
           resources:
             {{- toYaml . | nindent 12 }}
@@ -67,6 +75,10 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if $.Values.admintools.additionalVolumes }}
+      volumes:
+        {{- toYaml $.Values.admintools.additionalVolumes | nindent 8}}
+      {{- end }}
       {{- with .Values.admintools.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/temporal/templates/server-deployment.yaml b/charts/temporal/templates/server-deployment.yaml
index 281fee35..5a283ddf 100644
--- a/charts/temporal/templates/server-deployment.yaml
+++ b/charts/temporal/templates/server-deployment.yaml
@@ -36,8 +36,11 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- end }}
-      {{- if or $.Values.cassandra.enabled (or $.Values.elasticsearch.enabled $.Values.elasticsearch.external)}}
+      {{- if or (or $.Values.server.additionalInitContainers $.Values.cassandra.enabled) (or $.Values.elasticsearch.enabled $.Values.elasticsearch.external)}}
       initContainers:
+        {{- if $.Values.server.additionalInitContainers }}
+        {{- toYaml $.Values.server.additionalInitContainers | nindent 8}}
+        {{- end }}
         {{- if $.Values.cassandra.enabled }}
         - name: check-cassandra-service
           image: busybox
diff --git a/charts/temporal/values.yaml b/charts/temporal/values.yaml
index e98d24a6..3fb59ef3 100644
--- a/charts/temporal/values.yaml
+++ b/charts/temporal/values.yaml
@@ -87,6 +87,7 @@ server:
   additionalVolumes: []
   additionalVolumeMounts: []
   additionalEnv: []
+  additionalInitContainers: []
   securityContext:
     fsGroup: 1000
     runAsUser: 1000
@@ -332,8 +333,11 @@ admintools:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  additionalVolumes: []
+  additionalVolumeMounts: []
   additionalEnv: []
   additionalEnvSecretName: ""
+  additionalInitContainers: []
   resources: {}
   containerSecurityContext: {}
   securityContext: {}