diff --git a/ansible/roles/skydive/templates/skydive-agent.conf.j2 b/ansible/roles/skydive/templates/skydive-agent.conf.j2
index ba3f1fe403e0b555343898a584bcba70506c7c1b..ea2c6ed851991bb04d6a288d43b375c0e4ac4931 100644
--- a/ansible/roles/skydive/templates/skydive-agent.conf.j2
+++ b/ansible/roles/skydive/templates/skydive-agent.conf.j2
@@ -23,7 +23,7 @@ openstack:
 
 etcd:
   servers:
-{% if enable_etcd == "yes" %}
+{% if enable_etcd | bool %}
 {% for host in groups['etcd'] %}
     - http://{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ etcd_client_port }}
 {% endfor %}
diff --git a/ansible/roles/skydive/templates/skydive-analyzer.conf.j2 b/ansible/roles/skydive/templates/skydive-analyzer.conf.j2
index c6b0f91860bcca31bc57321105d71f0bdabc9eff..4300df3f69be2c59e26e6561c8e212d855f987b4 100644
--- a/ansible/roles/skydive/templates/skydive-analyzer.conf.j2
+++ b/ansible/roles/skydive/templates/skydive-analyzer.conf.j2
@@ -19,9 +19,14 @@ openstack:
   domain_name: Default
   endpoint_type: internal
 
+analyzers:
+{% for host in groups['skydive-analyzer'] %}
+  - {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ skydive_analyzer_port }}
+{% endfor %}
+
 etcd:
   client_timeout: 100
-{% if enable_etcd == "yes" %}
+{% if enable_etcd | bool %}
   embedded: false
   servers:
 {% for host in groups['etcd'] %}