diff --git a/ansible/roles/skydive/templates/skydive-agent.conf.j2 b/ansible/roles/skydive/templates/skydive-agent.conf.j2
index 7b072149aa..309323fefd 100644
--- a/ansible/roles/skydive/templates/skydive-agent.conf.j2
+++ b/ansible/roles/skydive/templates/skydive-agent.conf.j2
@@ -58,3 +58,6 @@ agent:
 netns:
   run_path: /host/run
 
+flow:
+  expire: 600
+  update: 60
diff --git a/ansible/roles/skydive/templates/skydive-analyzer.conf.j2 b/ansible/roles/skydive/templates/skydive-analyzer.conf.j2
index 428d7e8292..61830d9ed9 100644
--- a/ansible/roles/skydive/templates/skydive-analyzer.conf.j2
+++ b/ansible/roles/skydive/templates/skydive-analyzer.conf.j2
@@ -36,9 +36,6 @@ etcd:
 
 analyzer:
   listen: {{ api_interface_address }}:{{ skydive_analyzer_port }}
-  flowtable_expire: 60
-  flowtable_update: 5
-  flowtable_agent_ratio: 0.5
   storage:
     backend: elasticsearch
 {% if groups['skydive-agent'] | length > 1 %}
@@ -61,3 +58,7 @@ storage:
 
 graph:
   backend: elasticsearch
+
+flow:
+  expire: 600
+  update: 60