diff --git a/Cargo.nix b/Cargo.nix
index 175f6223..b0d84e57 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -1699,9 +1699,9 @@ rec {
       };
       "crossbeam-channel" = rec {
         crateName = "crossbeam-channel";
-        version = "0.5.14";
+        version = "0.5.15";
         edition = "2021";
-        sha256 = "0wa41qybq5w8s70anb472myh4fid4aw6v65vws6wn528w9l6vfh6";
+        sha256 = "1cicd9ins0fkpfgvz9vhz3m9rpkh6n8d3437c3wnfsdkd3wgif42";
         libName = "crossbeam_channel";
         dependencies = [
           {
@@ -9866,9 +9866,9 @@ rec {
       };
       "tokio" = rec {
         crateName = "tokio";
-        version = "1.43.0";
+        version = "1.44.2";
         edition = "2021";
-        sha256 = "17pdm49ihlhfw3rpxix3kdh2ppl1yv7nwp1kxazi5r1xz97zlq9x";
+        sha256 = "0j4w3qvlcqzgbxlnap0czvspqj6x461vyk1sbqcf97g4rci8if76";
         authors = [
           "Tokio Contributors <team@tokio.rs>"
         ];
diff --git a/deploy/helm/listener-operator/templates/_telemetry.tpl b/deploy/helm/listener-operator/templates/_telemetry.tpl
index ec49f788..8ef99bbf 100644
--- a/deploy/helm/listener-operator/templates/_telemetry.tpl
+++ b/deploy/helm/listener-operator/templates/_telemetry.tpl
@@ -7,11 +7,11 @@ Create a list of telemetry related env vars.
 - name: CONSOLE_LOG_DISABLED
   value: "true"
 {{- end }}
-{{- if .consoleLog.level }}
+{{- if and .consoleLog.enabled .consoleLog.level }}
 - name: CONSOLE_LOG_LEVEL
   value: {{ .consoleLog.level }}
 {{ end }}
-{{- if .consoleLog.format }}
+{{- if and .consoleLog.enabled .consoleLog.format }}
 - name: CONSOLE_LOG_FORMAT
   value: {{ .consoleLog.format }}
 {{ end }}
@@ -19,27 +19,27 @@ Create a list of telemetry related env vars.
 - name: FILE_LOG_DIRECTORY
   value: /stackable/logs/{{ include "operator.appname" $ }}
 {{- end }}
-{{- if .fileLog.level }}
+{{- if and .fileLog.enabled .fileLog.level }}
 - name: FILE_LOG_LEVEL
   value: {{ .fileLog.level }}
 {{- end }}
-{{- if .fileLog.rotationPeriod }}
+{{- if and .fileLog.enabled .fileLog.rotationPeriod }}
 - name: FILE_LOG_ROTATION_PERIOD
   value: {{ .fileLog.rotationPeriod }}
 {{- end }}
-{{- if .fileLog.maxFiles }}
+{{- if and .fileLog.enabled .fileLog.maxFiles }}
 - name: FILE_LOG_MAX_FILES
-  value: {{ .fileLog.maxFiles }}
+  value: {{ quote .fileLog.maxFiles }}
 {{- end }}
 {{- if .otelLogExporter.enabled }}
 - name: OTEL_LOG_EXPORTER_ENABLED
   value: "true"
 {{- end }}
-{{- if .otelLogExporter.level }}
+{{- if and .otelLogExporter.enabled .otelLogExporter.level }}
 - name: OTEL_LOG_EXPORTER_LEVEL
   value: {{ .otelLogExporter.level }}
 {{- end }}
-{{- if .otelLogExporter.endpoint }}
+{{- if and .otelLogExporter.enabled .otelLogExporter.endpoint }}
 - name: OTEL_EXPORTER_OTLP_LOGS_ENDPOINT
   value: {{ .otelLogExporter.endpoint }}
 {{- end }}
@@ -47,11 +47,11 @@ Create a list of telemetry related env vars.
 - name: OTEL_TRACE_EXPORTER_ENABLED
   value: "true"
 {{- end }}
-{{- if .otelTraceExporter.level }}
+{{- if and .otelTraceExporter.enabled .otelTraceExporter.level }}
 - name: OTEL_TRACE_EXPORTER_LEVEL
   value: {{ .otelTraceExporter.level }}
 {{- end }}
-{{- if .otelTraceExporter.endpoint }}
+{{- if and .otelTraceExporter.enabled .otelTraceExporter.endpoint }}
 - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
   value: {{ .otelTraceExporter.endpoint }}
 {{- end }}