diff --git a/charts/temporal/templates/server-job.yaml b/charts/temporal/templates/server-job.yaml
index 38cec60a..0734124b 100644
--- a/charts/temporal/templates/server-job.yaml
+++ b/charts/temporal/templates/server-job.yaml
@@ -24,9 +24,6 @@ spec:
       {{ include "temporal.serviceAccount" $ }}
       restartPolicy: OnFailure
       initContainers:
-        {{- if $.Values.admintools.additionalInitContainers }}
-          {{- toYaml $.Values.admintools.additionalInitContainers | nindent 8 }}
-        {{- end }}
         {{- if $.Values.cassandra.enabled }}
         - name: check-cassandra-service
           image: busybox
@@ -164,6 +161,9 @@ spec:
               {{- end }}
           {{- end }}
         {{- end }}
+        {{- if $.Values.admintools.additionalInitContainers }}
+          {{- toYaml $.Values.admintools.additionalInitContainers | nindent 8 }}
+        {{- end }}
       containers:
         - name: done
           image: "{{ $.Values.admintools.image.repository }}:{{ $.Values.admintools.image.tag }}"
diff --git a/charts/temporal/tests/server_job_test.yaml b/charts/temporal/tests/server_job_test.yaml
index abf0f57f..0ab52676 100644
--- a/charts/temporal/tests/server_job_test.yaml
+++ b/charts/temporal/tests/server_job_test.yaml
@@ -9,7 +9,7 @@ tests:
           - name: my-init-container
     asserts:
       - equal:
-          path: spec.template.spec.initContainers[0].name
+          path: spec.template.spec.initContainers[-1].name
           value: my-init-container
   - it: includes additional volumes
     set: