diff --git a/playbooks/roles/contrail/analytics/tasks/alarm-gen.yml b/playbooks/roles/contrail/analytics/tasks/alarm-gen.yml
index 71bd7f19..d05bd3f1 100644
--- a/playbooks/roles/contrail/analytics/tasks/alarm-gen.yml
+++ b/playbooks/roles/contrail/analytics/tasks/alarm-gen.yml
@@ -13,7 +13,7 @@
       log_level: "{{ alarmgen_log_level }}"
       log_local: "{{ log_local }}"
       kafka_broker_list: "{{ kafka_brokers_with_port }}"
-      zk_list: "{{ zk_servers_with_port_space_delim }}"
+      zk_list: "{{ analyticsdb_zk_servers_with_port_space_delim }}"
       partitions: "{{ anlaytics_uve_partition_count }}"
       http_server_port: "{{ alarmgen_introspect_port }}"
       collectors: "{{ analytics_collectors_with_port }}"
diff --git a/playbooks/roles/contrail/analytics/tasks/api.yml b/playbooks/roles/contrail/analytics/tasks/api.yml
index b10602fb..dab3715c 100644
--- a/playbooks/roles/contrail/analytics/tasks/api.yml
+++ b/playbooks/roles/contrail/analytics/tasks/api.yml
@@ -20,7 +20,7 @@
       rest_api_ip: "{{ analytics_api_listen_address }}"
       aaa_mode: "{{ analytics_api_aaa_mode_orig }}"
       collectors: "{{ analytics_collectors_with_port }}"
-      zk_list: "{{ zk_servers_with_port_space_delim }}"
+      zk_list: "{{ analyticsdb_zk_servers_with_port_space_delim }}"
     REDIS:
       redis_uve_list: "{{ analytics_redis_servers_with_port }}"
       redis_query_port: "{{ analytics_redis_port }}"
diff --git a/playbooks/roles/contrail/analytics/tasks/collector.yml b/playbooks/roles/contrail/analytics/tasks/collector.yml
index 88f17af8..5b103c39 100644
--- a/playbooks/roles/contrail/analytics/tasks/collector.yml
+++ b/playbooks/roles/contrail/analytics/tasks/collector.yml
@@ -9,7 +9,7 @@
   with_inidata:
     DEFAULT:
       cassandra_server_list: "{{ analyticsdb_servers_with_cql_port }}"
-      zookeeper_server_list: "{{ zk_servers_with_port }}"
+      zookeeper_server_list: "{{ analyticsdb_zk_servers_with_port }}"
       kafka_broker_list: "{{ kafka_brokers_with_port }}"
       hostip: "{{ my_analytics_ip }}"
       log_file: "{{ analytics_collector_log }}"
diff --git a/playbooks/roles/contrail/analytics/tasks/snmp-collector.yml b/playbooks/roles/contrail/analytics/tasks/snmp-collector.yml
index e1a5791a..077d65b4 100644
--- a/playbooks/roles/contrail/analytics/tasks/snmp-collector.yml
+++ b/playbooks/roles/contrail/analytics/tasks/snmp-collector.yml
@@ -8,7 +8,7 @@
     create: yes
   with_inidata:
     DEFAULTS:
-      zookeeper: "{{ zk_servers_with_port }}"
+      zookeeper: "{{ analyticsdb_zk_servers_with_port }}"
       log_file: "{{ analytics_snmp_collector_log }}"
       log_level: "{{ analytics_snmp_collector_log_level }}"
       log_local: "{{ log_local }}"
diff --git a/playbooks/roles/contrail/analytics/tasks/topology.yml b/playbooks/roles/contrail/analytics/tasks/topology.yml
index 965402ae..616dc6c9 100644
--- a/playbooks/roles/contrail/analytics/tasks/topology.yml
+++ b/playbooks/roles/contrail/analytics/tasks/topology.yml
@@ -8,7 +8,7 @@
     create: yes
   with_inidata:
     DEFAULT:
-      zookeeper: "{{ zk_servers_with_port }}"
+      zookeeper: "{{ analyticsdb_zk_servers_with_port }}"
       log_file: "{{ analytics_topology_log }}"
       log_level: "{{ analytics_topology_log_level }}"
       log_local: "{{ log_local }}"
diff --git a/playbooks/roles/contrail/analyticsdb/vars/main.yml b/playbooks/roles/contrail/analyticsdb/vars/main.yml
deleted file mode 100644
index 9c889060..00000000
--- a/playbooks/roles/contrail/analyticsdb/vars/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-# This will construct a string with comma delimited list of all analyticsdb zookeeper server and port in form of "ip1:port, ip2:port"
-analyticsdb_zk_servers_with_port: "{{ analyticsdb_zk_server_list | map('regex_replace', '^(.*)$', '\\1:' + analyticsdb_zk_port|string) | join(',') }}"
-analyticsdb_zk_servers_with_port_space_delim: "{{ analyticsdb_zk_servers_with_port | regex_replace(',', ' ') }}"
diff --git a/playbooks/roles/contrail/common/vars/main.yml b/playbooks/roles/contrail/common/vars/main.yml
index f1e2091e..2caa308d 100644
--- a/playbooks/roles/contrail/common/vars/main.yml
+++ b/playbooks/roles/contrail/common/vars/main.yml
@@ -11,6 +11,10 @@ configdb_servers_with_cql_port: "{{ configdb_server_list | map('regex_replace',
 zk_servers_with_port: "{{ zk_server_list | map('regex_replace', '^(.*)$', '\\1:' + zk_port|string) | join(',') }}"
 zk_servers_with_port_space_delim: "{{ zk_servers_with_port | regex_replace(',', ' ') }}"
 
+# This will construct a string with comma delimited list of all analyticsdb zookeeper server and port in form of "ip1:port, ip2:port"
+analyticsdb_zk_servers_with_port: "{{ analyticsdb_zk_server_list | map('regex_replace', '^(.*)$', '\\1:' + analyticsdb_zk_port|string) | join(',') }}"
+analyticsdb_zk_servers_with_port_space_delim: "{{ analyticsdb_zk_servers_with_port | regex_replace(',', ' ') }}"
+
 # This will construct a string with comma delimited list of all rabbitmq server and port in form of "ip1:port, ip2:port"
 rabbitmq_servers_with_port: "{{ rabbitmq_server_list | map('regex_replace', '^(.*)$', '\\1:' + contrail_rabbitmq_port|string) | join(',') }}"
 rabbitmq_servers_with_port_space_delim: "{{ rabbitmq_servers_with_port | regex_replace(',', ' ') }}"