diff --git a/charts/node-analyzer/Chart.yaml b/charts/node-analyzer/Chart.yaml
index 35d87288b..2b0c4d1e3 100644
--- a/charts/node-analyzer/Chart.yaml
+++ b/charts/node-analyzer/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: node-analyzer
 description: Sysdig Node Analyzer
 # currently matching Sysdig's appVersion 1.14.34
-version: 1.31.5
+version: 1.31.6
 appVersion: 12.9.0
 keywords:
   - monitoring
diff --git a/charts/node-analyzer/templates/runtimeScanner/runtime-scanner-configmap.yaml b/charts/node-analyzer/templates/runtimeScanner/runtime-scanner-configmap.yaml
index 978c097b2..b4eff3110 100644
--- a/charts/node-analyzer/templates/runtimeScanner/runtime-scanner-configmap.yaml
+++ b/charts/node-analyzer/templates/runtimeScanner/runtime-scanner-configmap.yaml
@@ -23,7 +23,9 @@ data:
   no_proxy: {{ .Values.nodeAnalyzer.runtimeScanner.noProxy | default .Values.nodeAnalyzer.noProxy | default .Values.global.proxy.noProxy }}
   {{- end }}
   eve_enabled: {{ .Values.nodeAnalyzer.runtimeScanner.settings.eveEnabled | quote }}
-  eve_integration_enabled: {{ .Values.nodeAnalyzer.runtimeScanner.settings.eveEnabled | quote }}
+  {{- if hasKey .Values.nodeAnalyzer.runtimeScanner "eveConnector" }}
+  eve_integration_enabled: {{ and .Values.nodeAnalyzer.runtimeScanner.eveConnector.deploy .Values.nodeAnalyzer.runtimeScanner.settings.eveEnabled | quote }}
+  {{- end}}
   {{- if hasKey .Values.nodeAnalyzer.runtimeScanner "settings" }}
   prom_port: {{ .Values.nodeAnalyzer.runtimeScanner.settings.prometheusPort | default 25001 | quote }}
   {{- end }}
diff --git a/charts/sysdig-deploy/Chart.yaml b/charts/sysdig-deploy/Chart.yaml
index d7621145b..601fb43b1 100644
--- a/charts/sysdig-deploy/Chart.yaml
+++ b/charts/sysdig-deploy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sysdig-deploy
 description: A chart with various Sysdig components for Kubernetes
 type: application
-version: 1.64.6
+version: 1.64.7
 maintainers:
   - name: AlbertoBarba
     email: alberto.barba@sysdig.com
@@ -36,7 +36,7 @@ dependencies:
   - name: node-analyzer
     # repository: https://charts.sysdig.com
     repository: file://../node-analyzer
-    version: ~1.31.5
+    version: ~1.31.6
     alias: nodeAnalyzer
     condition: nodeAnalyzer.enabled
   - name: cluster-scanner