diff --git a/kloudbuster/cfg.topo.yaml b/kloudbuster/cfg.topo.yaml
index a9207de..bf4bce7 100644
--- a/kloudbuster/cfg.topo.yaml
+++ b/kloudbuster/cfg.topo.yaml
@@ -19,9 +19,11 @@
 # Grouping for placing all the server side VMs
 # Do not change the group name, you can add as many hosts as needed
 servers_rack:
-    hh23-5
+    - hh23-5
+    - hh23-6
 
 # Grouping for placing all the client side VMs
 # Do not change the group name, you can add as many hosts as needed
 clients_rack:
-    hh23-6
+    - hh23-7
+    - hh23-8
diff --git a/kloudbuster/kb_scheduler.py b/kloudbuster/kb_scheduler.py
index 7d09ae0..b43f6e5 100644
--- a/kloudbuster/kb_scheduler.py
+++ b/kloudbuster/kb_scheduler.py
@@ -38,9 +38,9 @@ class KBScheduler(object):
             avail_zone = "nova"
 
         if role == "Server":
-            host_list = topology.servers_rack.split()
+            host_list = topology.servers_rack
         else:
-            host_list = topology.clients_rack.split()
+            host_list = topology.clients_rack
         host_count = len(host_list)
 
         if algorithm == "Round-robin":
diff --git a/kloudbuster/kloudbuster.py b/kloudbuster/kloudbuster.py
index 2db0aed..4f2aad3 100755
--- a/kloudbuster/kloudbuster.py
+++ b/kloudbuster/kloudbuster.py
@@ -389,7 +389,7 @@ class KloudBuster(object):
         self.kb_proxy.boot_info['flavor_type'] = 'kb.proxy' if \
             not self.tenants_list['client'] else self.testing_kloud.flavor_to_use
         if self.topology:
-            proxy_hyper = self.topology.clients_rack.split()[0]
+            proxy_hyper = self.topology.clients_rack[0]
             self.kb_proxy.boot_info['avail_zone'] =\
                 "%s:%s" % (self.testing_kloud.placement_az, proxy_hyper)\
                 if self.testing_kloud.placement_az else "nova:%s" % (proxy_hyper)