diff --git a/templates/deployment-agents.yaml b/templates/deployment-agents.yaml
index 5938526..d4b8a2e 100644
--- a/templates/deployment-agents.yaml
+++ b/templates/deployment-agents.yaml
@@ -71,7 +71,7 @@ spec:
         - name: SKYDIVE_ANALYZERS
           value: {{ template "fullname" . }}-service:{{ .Values.service.port }}
         - name: SKYDIVE_FLOW_PROTOCOL
-          value: websocket
+          value: websocket1
         - name: SKYDIVE_FLOW_DEFAULT_LAYER_KEY_MODE
           value: L3
         - name: SKYDIVE_AGENT_TOPOLOGY_PROBES
diff --git a/templates/deployment-analyzer.yaml b/templates/deployment-analyzer.yaml
index 5ffe32f..3fbd7cf 100644
--- a/templates/deployment-analyzer.yaml
+++ b/templates/deployment-analyzer.yaml
@@ -92,8 +92,6 @@ spec:
           value: "elasticsearchtopology"
         - name: SKYDIVE_STORAGE_ELASTICSEARCHFLOW_DRIVER
           value: "elasticsearch"
-        - name: SKYDIVE_STORAGE_ELASTICSEARCHTOPOLOGY_DRIVER
-          value: "elasticsearch"
         - name: SKYDIVE_STORAGE_ELASTICSEARCHFLOW_HOST
           value: {{ .Values.storage.elasticsearch.host }}:{{ .Values.storage.elasticsearch.port }}
         - name: SKYDIVE_STORAGE_ELASTICSEARCHFLOW_INDICES_TO_KEEP
@@ -102,6 +100,8 @@ spec:
           value: {{ .Values.storage.flows.indexEntriesLimit | quote }}
         - name: SKYDIVE_STORAGE_ELASTICSEARCHFLOW_MAXCONNS
           value: "10"
+        - name: SKYDIVE_STORAGE_ELASTICSEARCHTOPOLOGY_DRIVER
+          value: "elasticsearch"
         - name: SKYDIVE_STORAGE_ELASTICSEARCHFLOW_BULK_MAXDOCS
           value: "1000"
         - name: SKYDIVE_STORAGE_ELASTICSEARCHFLOW_BULK_MAXDELAY