diff --git a/charts/rollups-node/templates/authority-claimer-deployment.yaml b/charts/rollups-node/templates/authority-claimer-deployment.yaml
index 3ce285f..df0a56b 100644
--- a/charts/rollups-node/templates/authority-claimer-deployment.yaml
+++ b/charts/rollups-node/templates/authority-claimer-deployment.yaml
@@ -82,12 +82,14 @@ spec:
               port: {{ (default 8086 .Values.authorityClaimer.healthCheck.port) }}
             initialDelaySeconds: 3
           {{- end }}
+          {{- if .Values.authorityClaimer.extraEnvVars }}
+          {{- with .Values.authorityClaimer.extraEnvVars }}
           env:
-            - name: RUST_LOG
-              value: {{ .Values.authorityClaimer.logLevel }}
-            {{- if .Values.authorityClaimer.extraEnvVars }}
-            {{- include "tplvalues.render" (dict "value" .Values.authorityClaimer.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
+              {{- range $key, $value := . }}
+              {{- toYaml $value | nindent 12 }}
+              {{- end }}
+          {{- end }}
+          {{- end }}
           {{- if or .Values.authorityClaimer.extraEnvVarsCM .Values.authorityClaimer.extraEnvVarsSecret }}
           envFrom:
             {{- if .Values.authorityClaimer.extraEnvVarsCM }}
diff --git a/charts/rollups-node/templates/dispatcher-deployment.yaml b/charts/rollups-node/templates/dispatcher-deployment.yaml
index 0bcb086..dd68b25 100644
--- a/charts/rollups-node/templates/dispatcher-deployment.yaml
+++ b/charts/rollups-node/templates/dispatcher-deployment.yaml
@@ -74,12 +74,14 @@ spec:
               port: {{ (default 8081 .Values.dispatcher.healthCheck.port) }}
             initialDelaySeconds: 3
           {{- end }}
+          {{- if .Values.dispatcher.extraEnvVars }}
+          {{- with .Values.dispatcher.extraEnvVars }}
           env:
-            - name: RUST_LOG
-              value: {{ .Values.dispatcher.logLevel }}
-            {{- if .Values.dispatcher.extraEnvVars }}
-            {{- include "tplvalues.render" (dict "value" .Values.dispatcher.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
+              {{- range $key, $value := . }}
+              {{- toYaml $value | nindent 12 }}
+              {{- end }}
+          {{- end }}
+          {{- end }}
           {{- if or .Values.dispatcher.extraEnvVarsCM .Values.dispatcher.extraEnvVarsSecret }}
           envFrom:
             {{- if .Values.dispatcher.extraEnvVarsCM }}
diff --git a/charts/rollups-node/templates/graphql-server-deployment.yaml b/charts/rollups-node/templates/graphql-server-deployment.yaml
index c235bc9..e9e9aab 100644
--- a/charts/rollups-node/templates/graphql-server-deployment.yaml
+++ b/charts/rollups-node/templates/graphql-server-deployment.yaml
@@ -59,12 +59,14 @@ spec:
             {{- range .Values.graphqlServer.extraArgs }}
             - {{ . | quote}}
             {{- end }}
+          {{- if .Values.graphqlServer.extraEnvVars }}
+          {{- with .Values.graphqlServer.extraEnvVars }}
           env:
-            - name: RUST_LOG
-              value: {{ .Values.graphqlServer.logLevel }}
-            {{- if .Values.graphqlServer.extraEnvVars }}
-            {{- include "tplvalues.render" (dict "value" .Values.graphqlServer.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
+              {{- range $key, $value := . }}
+              {{- toYaml $value | nindent 12 }}
+              {{- end }}
+          {{- end }}
+          {{- end }}
             - name: GRAPHQL_HOST
               value: "0.0.0.0"
             - name: GRAPHQL_PORT
diff --git a/charts/rollups-node/templates/inspect-server-deployment.yaml b/charts/rollups-node/templates/inspect-server-deployment.yaml
index 2a81bcd..0a93497 100644
--- a/charts/rollups-node/templates/inspect-server-deployment.yaml
+++ b/charts/rollups-node/templates/inspect-server-deployment.yaml
@@ -60,12 +60,14 @@ spec:
             {{- range .Values.inspectServer.extraArgs }}
             - {{ . | quote}}
             {{- end }}
+          {{- if .Values.inspectServer.extraEnvVars }}
+          {{- with .Values.inspectServer.extraEnvVars }}
           env:
-            - name: RUST_LOG
-              value: {{ .Values.inspectServer.logLevel }}
-            {{- if .Values.inspectServer.extraEnvVars }}
-            {{- include "tplvalues.render" (dict "value" .Values.inspectServer.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
+              {{- range $key, $value := . }}
+              {{- toYaml $value | nindent 12 }}
+              {{- end }}
+          {{- end }}
+          {{- end }}
           {{- if or .Values.inspectServer.extraEnvVarsCM .Values.inspectServer.extraEnvVarsSecret }}
           envFrom:
             {{- if .Values.inspectServer.extraEnvVarsCM }}
diff --git a/charts/rollups-node/templates/server-manager-deployment.yaml b/charts/rollups-node/templates/server-manager-deployment.yaml
index 08ff642..555791e 100644
--- a/charts/rollups-node/templates/server-manager-deployment.yaml
+++ b/charts/rollups-node/templates/server-manager-deployment.yaml
@@ -93,12 +93,14 @@ spec:
               port: {{ default 8083 .Values.serverManager.advanceRunner.healthCheck.port }}
             initialDelaySeconds: 3
           {{- end }}
+          {{- if .Values.serverManager.advanceRunner.extraEnvVars }}
+          {{- with .Values.serverManager.advanceRunner.extraEnvVars }}
           env:
-            - name: RUST_LOG
-              value: {{ .Values.serverManager.advanceRunner.logLevel }}
-            {{- if .Values.serverManager.advanceRunner.extraEnvVars }}
-            {{- include "tplvalues.render" (dict "value" .Values.serverManager.advanceRunner.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
+              {{- range $key, $value := . }}
+              {{- toYaml $value | nindent 12 }}
+              {{- end }}
+          {{- end }}
+          {{- end }}
           {{- if or .Values.serverManager.advanceRunner.extraEnvVarsCM .Values.serverManager.advanceRunner.extraEnvVarsSecret }}
           envFrom:
             {{- if .Values.serverManager.advanceRunner.extraEnvVarsCM }}
diff --git a/charts/rollups-node/templates/state-server-deployment.yaml b/charts/rollups-node/templates/state-server-deployment.yaml
index a88f9f5..86a794d 100644
--- a/charts/rollups-node/templates/state-server-deployment.yaml
+++ b/charts/rollups-node/templates/state-server-deployment.yaml
@@ -64,12 +64,14 @@ spec:
             grpc:
               port: 50051
             initialDelaySeconds: 3
+          {{- if .Values.stateServer.extraEnvVars }}
+          {{- with .Values.stateServer.extraEnvVars }}
           env:
-            - name: RUST_LOG
-              value: {{ .Values.stateServer.logLevel }}
-            {{- if .Values.stateServer.extraEnvVars }}
-            {{- include "tplvalues.render" (dict "value" .Values.stateServer.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
+              {{- range $key, $value := . }}
+              {{- toYaml $value | nindent 12 }}
+              {{- end }}
+          {{- end }}
+          {{- end }}
           {{- if or .Values.stateServer.extraEnvVarsCM .Values.stateServer.extraEnvVarsSecret }}
           envFrom:
             {{- if .Values.stateServer.extraEnvVarsCM }}