diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index 9ed863a611..c6ded3cee2 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -227,6 +227,14 @@ spec:
         resources:
         {{- toYaml . | nindent 10 }}
         {{ end }}
+        {{ if .Values.services.apps.command }}
+        command:
+        {{- toYaml .Values.services.apps.command | nindent 10 }}
+        {{ end }}
+        {{ if .Values.services.apps.args }}
+        args:
+        {{- toYaml .Values.services.apps.args | nindent 10 }}
+        {{ end }}
     {{- with .Values.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
@@ -244,12 +252,4 @@ spec:
       {{ end }}
       restartPolicy: Always
       serviceAccountName: ""
-      {{ if .Values.services.apps.command }}
-      command:
-      {{- toYaml .Values.services.apps.command | nindent 8 }}
-      {{ end }}
-      {{ if .Values.services.apps.args }}
-      args:
-      {{- toYaml .Values.services.apps.args | nindent 8 }}
-      {{ end }}
 status: {}
diff --git a/charts/budibase/templates/automation-worker-service-deployment.yaml b/charts/budibase/templates/automation-worker-service-deployment.yaml
index 6032f33bed..b7eece6b85 100644
--- a/charts/budibase/templates/automation-worker-service-deployment.yaml
+++ b/charts/budibase/templates/automation-worker-service-deployment.yaml
@@ -227,6 +227,13 @@ spec:
         resources:
         {{- toYaml . | nindent 10 }}
         {{ end }}
+        command:
+        {{- toYaml .Values.services.automationWorkers.command | nindent 10 }}
+        {{ end }}
+        {{ if .Values.services.automationWorkers.args }}
+        args:
+        {{- toYaml .Values.services.automationWorkers.args | nindent 10 }}
+        {{ end }}
     {{- with .Values.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
@@ -245,12 +252,5 @@ spec:
       restartPolicy: Always
       serviceAccountName: ""
       {{ if .Values.services.automationWorkers.command }}}
-      command:
-      {{- toYaml .Values.services.automationWorkers.command | nindent 8 }}
-      {{ end }}
-      {{ if .Values.services.automationWorkers.args }}
-      args:
-      {{- toYaml .Values.services.automationWorkers.args | nindent 8 }}
-      {{ end }}
 status: {}
 {{- end }}
\ No newline at end of file
diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index 32ffb46a90..d97170f011 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -213,6 +213,13 @@ spec:
         resources:
         {{- toYaml . | nindent 10 }}
         {{ end }}
+        command:
+        {{- toYaml .Values.services.worker.command | nindent 10 }}
+        {{ end }}
+        {{ if .Values.services.worker.args }}
+        args:
+        {{- toYaml .Values.services.worker.args | nindent 10 }}
+        {{ end }}
     {{- with .Values.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
@@ -231,11 +238,4 @@ spec:
       restartPolicy: Always
       serviceAccountName: ""
       {{ if .Values.services.worker.command }}
-      command:
-      {{- toYaml .Values.services.worker.command | nindent 8 }}
-      {{ end }}
-      {{ if .Values.services.worker.args }}
-      args:
-      {{- toYaml .Values.services.worker.args | nindent 8 }}
-      {{ end }}
 status: {}