diff --git a/contrail_provisioning/collector/setup.py b/contrail_provisioning/collector/setup.py
index b246e255..87807bc4 100755
--- a/contrail_provisioning/collector/setup.py
+++ b/contrail_provisioning/collector/setup.py
@@ -50,7 +50,7 @@ def __init__(self, args_str = None):
             cassandra_port = '9160'
         self.cassandra_server_list = [(cassandra_server_ip, cassandra_port) for cassandra_server_ip in self._args.cassandra_ip_list]
         zookeeper_port = '2181'
-        self.zookeeper_server_list = None
+        self.zookeeper_server_list = []
         if self._args.zookeeper_ip_list:
             self.zookeeper_server_list = [(zookeeper_server_ip, zookeeper_port) for \
                 zookeeper_server_ip in self._args.zookeeper_ip_list]
@@ -196,8 +196,8 @@ def fixup_contrail_alarm_gen(self):
                         kafka_broker_list_str)
 
         #prepare zklist
-        zk_list = [server[0] + ":2181" for server in self.cassandra_server_list]
-        zk_list_str = ' '.join(map(str, zk_list))
+        zk_list_str = ' '.join('%s:%s' % zookeeper_server
+                for zookeeper_server in self.zookeeper_server_list)
         self.set_config(ALARM_GEN_CONF_FILE, 'DEFAULTS', 'zk_list',
                         zk_list_str)
 
@@ -221,7 +221,8 @@ def fixup_contrail_snmp_collector(self):
             local("echo 'mibs +ALL' > /etc/snmp/snmp.conf")
             local("[ -f %s ] || > %s" % (conf_fl, conf_fl))
         self.set_config(conf_fl, 'DEFAULTS', 'zookeeper',
-            ','.join('%s:2181' % cs[0] for cs in self.cassandra_server_list))
+                ','.join('%s:%s' % zookeeper_server
+                    for zookeeper_server in self.zookeeper_server_list))
         self.set_config(conf_fl, 'DISCOVERY', 'disc_server_ip',
                         self._args.cfgm_ip)
         self.set_config(conf_fl, 'DISCOVERY', 'disc_server_port', '5998')
@@ -246,7 +247,8 @@ def fixup_contrail_topology(self):
         with settings(warn_only=True):
             local("[ -f %s ] || > %s" % (conf_fl, conf_fl))
         self.set_config(conf_fl, 'DEFAULTS', 'zookeeper',
-            ','.join('%s:2181' % cs[0] for cs in self.cassandra_server_list))
+            ','.join('%s:%s' % zookeeper_server
+                for zookeeper_server in self.zookeeper_server_list))
         self.set_config(conf_fl, 'DISCOVERY', 'disc_server_ip',
                         self._args.cfgm_ip)
         self.set_config(conf_fl, 'DISCOVERY', 'disc_server_port', '5998')