diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py
index 4498de2f5f..2a23f43dd7 100644
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -608,10 +608,7 @@ class OaiCiTest():
 			self.AutoTerminateUEandeNB(HTML,RAN,EPC,CONTAINERS)
 
 	def AttachUE(self, HTML, RAN, EPC, CONTAINERS):
-		if len(self.ue_ids) == len(self.nodes):
-			ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
-		else:
-			ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.attach) for ue in ues]
 			attached = [f.result() for f in futures]
@@ -626,10 +623,7 @@ class OaiCiTest():
 			self.AutoTerminateUEandeNB(HTML, RAN, EPC, CONTAINERS)
 
 	def DetachUE(self, HTML):
-		if len(self.ue_ids) == len(self.nodes):
-			ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
-		else:
-			ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		with concurrent.futures.ThreadPoolExecutor() as executor:
 			futures = [executor.submit(ue.detach) for ue in ues]
 			[f.result() for f in futures]
@@ -769,10 +763,7 @@ class OaiCiTest():
 
 		if self.ue_ids == []:
 			raise Exception("no module names in self.ue_ids provided")
-		if len(self.ue_ids) == len(self.nodes):
-			ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
-		else:
-			ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		logging.debug(ues)
 		pingLock = Lock()
 		with concurrent.futures.ThreadPoolExecutor() as executor:
@@ -861,10 +852,7 @@ class OaiCiTest():
 
 		if self.ue_ids == [] or self.svr_id == None:
 			raise Exception("no module names in self.ue_ids or/and self.svr_id provided")
-		if len(self.ue_ids) == len(self.nodes):
-			ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
-		else:
-			ues = [cls_module.Module_UE(n.strip()) for n in self.ue_ids]
+		ues = [cls_module.Module_UE(ue_id, server_name) for ue_id, server_name in zip(self.ue_ids, self.nodes)]
 		svr = cls_module.Module_UE(self.svr_id,self.svr_node)
 		logging.debug(ues)
 		with concurrent.futures.ThreadPoolExecutor() as executor:
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 8d7ae9b9b4..532a5f564d 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -222,6 +222,8 @@ def GetParametersFromXML(action):
 			if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
 				logging.error('Number of Nodes are not equal to the total number of UEs')
 				sys.exit("Mismatch in number of Nodes and UIs")
+		else:
+			CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 
 	elif action == 'Build_OAI_UE':
 		CiTestObj.Build_OAI_UE_args = test.findtext('Build_OAI_UE_args')
@@ -273,6 +275,8 @@ def GetParametersFromXML(action):
 			if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
 				logging.error('Number of Nodes are not equal to the total number of UEs')
 				sys.exit("Mismatch in number of Nodes and UIs")
+		else:
+			CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		ping_rttavg_threshold = test.findtext('ping_rttavg_threshold') or ''
 
 	elif action == 'Iperf' or action == 'Iperf2_Unidir':
@@ -284,6 +288,8 @@ def GetParametersFromXML(action):
 			if len(CiTestObj.ue_ids) != len(CiTestObj.nodes):
 				logging.error('Number of Nodes are not equal to the total number of UEs')
 				sys.exit("Mismatch in number of Nodes and UIs")
+		else:
+			CiTestObj.nodes = [None] * len(CiTestObj.ue_ids)
 		if test.findtext('svr_node'):
 			CiTestObj.svr_node = test.findtext('svr_node')
 		CiTestObj.iperf_packetloss_threshold = test.findtext('iperf_packetloss_threshold')