diff --git a/src/helm/impress/templates/backend_cronjob_list.yaml b/src/helm/impress/templates/backend_cronjob_list.yaml
index 5593eb3ad..06b1af54d 100644
--- a/src/helm/impress/templates/backend_cronjob_list.yaml
+++ b/src/helm/impress/templates/backend_cronjob_list.yaml
@@ -38,10 +38,10 @@ items:
                   imagePullPolicy: {{ ($.Values.backend.image | default dict).pullPolicy | default $.Values.image.pullPolicy }}
                   args:
                     {{- toYaml .command | nindent 22 }}
+                  {{- if $envVars}}
                   env:
-                    {{- if $envVars}}
                     {{- $envVars | indent 22 }}
-                    {{- end }}
+                  {{- end }}
                   {{- with $.Values.backend.securityContext }}
                   securityContext:
                     {{- toYaml . | nindent 22 }}
@@ -105,4 +105,4 @@ items:
                 {{- end }}
 
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/src/helm/impress/templates/backend_deployment.yaml b/src/helm/impress/templates/backend_deployment.yaml
index afbd5eaaf..f9bb002ea 100644
--- a/src/helm/impress/templates/backend_deployment.yaml
+++ b/src/helm/impress/templates/backend_deployment.yaml
@@ -49,10 +49,10 @@ spec:
           args:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- if $envVars}}
           env:
-            {{- if $envVars}}
             {{- $envVars | indent 12 }}
-            {{- end }}
+          {{- end }}
           {{- with .Values.backend.securityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}
diff --git a/src/helm/impress/templates/backend_job.yml b/src/helm/impress/templates/backend_job.yml
index 4888a904a..117722f04 100644
--- a/src/helm/impress/templates/backend_job.yml
+++ b/src/helm/impress/templates/backend_job.yml
@@ -44,10 +44,10 @@ spec:
           args:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- if $envVars}}
           env:
-            {{- if $envVars}}
             {{- $envVars | indent 12 }}
-            {{- end }}
+          {{- end }}
           {{- with .Values.backend.securityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}
diff --git a/src/helm/impress/templates/backend_job_createsuperuser.yaml b/src/helm/impress/templates/backend_job_createsuperuser.yaml
index 0096483cc..40650b823 100644
--- a/src/helm/impress/templates/backend_job_createsuperuser.yaml
+++ b/src/helm/impress/templates/backend_job_createsuperuser.yaml
@@ -48,10 +48,10 @@ spec:
           args:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- if $envVars}}
           env:
-            {{- if $envVars}}
             {{- $envVars | indent 12 }}
-            {{- end }}
+          {{- end }}
           {{- with .Values.backend.securityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}
diff --git a/src/helm/impress/templates/backend_job_migrate.yaml b/src/helm/impress/templates/backend_job_migrate.yaml
index 99e58ba11..981e3d9f1 100644
--- a/src/helm/impress/templates/backend_job_migrate.yaml
+++ b/src/helm/impress/templates/backend_job_migrate.yaml
@@ -48,10 +48,10 @@ spec:
           args:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- if $envVars}}
           env:
-            {{- if $envVars}}
             {{- $envVars | indent 12 }}
-            {{- end }}
+          {{- end }}
           {{- with .Values.backend.securityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}
diff --git a/src/helm/impress/templates/celery_worker_deployment.yaml b/src/helm/impress/templates/celery_worker_deployment.yaml
index 1c66404a2..a372a8fb7 100644
--- a/src/helm/impress/templates/celery_worker_deployment.yaml
+++ b/src/helm/impress/templates/celery_worker_deployment.yaml
@@ -49,10 +49,10 @@ spec:
           args:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- if $envVars}}
           env:
-            {{- if $envVars}}
             {{- $envVars | indent 12 }}
-            {{- end }}
+          {{- end }}
           {{- with .Values.backend.securityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}
diff --git a/src/helm/impress/templates/frontend_deployment.yaml b/src/helm/impress/templates/frontend_deployment.yaml
index ddb0d12ab..da9940722 100644
--- a/src/helm/impress/templates/frontend_deployment.yaml
+++ b/src/helm/impress/templates/frontend_deployment.yaml
@@ -49,10 +49,10 @@ spec:
           args:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- if $envVars}}
           env:
-            {{- if $envVars}}
             {{- $envVars | indent 12 }}
-            {{- end }}
+          {{- end }}
           {{- with .Values.frontend.securityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}
diff --git a/src/helm/impress/templates/yprovider_deployment.yaml b/src/helm/impress/templates/yprovider_deployment.yaml
index 77dd79dd8..549b2cd24 100644
--- a/src/helm/impress/templates/yprovider_deployment.yaml
+++ b/src/helm/impress/templates/yprovider_deployment.yaml
@@ -49,10 +49,10 @@ spec:
           args:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- if $envVars}}
           env:
-            {{- if $envVars}}
             {{- $envVars | indent 12 }}
-            {{- end }}
+          {{- end }}
           {{- with .Values.yProvider.securityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}