diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index d42ad7ea35..81f956f199 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -468,10 +468,9 @@ def GetParametersFromXML(action):
 		if (string_field is not None):
 			CONTAINERS.testSvrId = string_field
 		CONTAINERS.imageToPull.clear()
-		for image in test.findall('image_to_pull'):
-			string_field = image.findtext('image_name')
-			if (string_field is not None):
-				CONTAINERS.imageToPull.append(string_field)
+		string_field = test.findtext('images_to_pull')
+		if (string_field is not None):
+			CONTAINERS.imageToPull = string_field.split()
 
 	elif action == 'Clean_Test_Server_Images':
 		string_field = test.findtext('test_svr_id')
diff --git a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
index 3c6361459c..419ede8cbb 100644
--- a/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
+++ b/ci-scripts/xml_files/container_4g_l2sim_tdd.xml
@@ -47,12 +47,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <image_to_pull>
-                        <image_name>oai-enb</image_name>
-                </image_to_pull>
-                <image_to_pull>
-                        <image_name>oai-lte-ue</image_name>
-                </image_to_pull>
+                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
         </testCase>
 
         <testCase id="000000">
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
index 4e927d3243..a776b85c2c 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml
@@ -47,12 +47,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <image_to_pull>
-                        <image_name>oai-enb</image_name>
-                </image_to_pull>
-                <image_to_pull>
-                        <image_name>oai-lte-ue</image_name>
-                </image_to_pull>
+                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
         </testCase>
 
         <testCase id="000011">
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
index a2c56125ec..e70d954a22 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml
@@ -43,12 +43,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <image_to_pull>
-                        <image_name>oai-enb</image_name>
-                </image_to_pull>
-                <image_to_pull>
-                        <image_name>oai-lte-ue</image_name>
-                </image_to_pull>
+                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
         </testCase>
 
         <testCase id="000001">
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
index 0d8dfa1161..6b88816c4a 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_10MHz.xml
@@ -47,12 +47,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <image_to_pull>
-                        <image_name>oai-enb</image_name>
-                </image_to_pull>
-                <image_to_pull>
-                        <image_name>oai-lte-ue</image_name>
-                </image_to_pull>
+                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
         </testCase>
 
         <testCase id="000011">
diff --git a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
index c666128e39..e33554c8ce 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_fdd_20MHz.xml
@@ -47,12 +47,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <image_to_pull>
-                        <image_name>oai-enb</image_name>
-                </image_to_pull>
-                <image_to_pull>
-                        <image_name>oai-lte-ue</image_name>
-                </image_to_pull>
+                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
         </testCase>
 
         <testCase id="000011">
diff --git a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
index 0a638df278..c39679e063 100644
--- a/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
+++ b/ci-scripts/xml_files/container_4g_rfsim_tdd_05MHz.xml
@@ -48,12 +48,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <image_to_pull>
-                        <image_name>oai-enb</image_name>
-                </image_to_pull>
-                <image_to_pull>
-                        <image_name>oai-lte-ue</image_name>
-                </image_to_pull>
+                <images_to_pull>oai-enb oai-lte-ue</images_to_pull>
         </testCase>
 
         <testCase id="000011">
diff --git a/ci-scripts/xml_files/container_5g_f1_rfsim.xml b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
index 295d544122..219c2976de 100644
--- a/ci-scripts/xml_files/container_5g_f1_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_f1_rfsim.xml
@@ -43,12 +43,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <image_to_pull>
-                        <image_name>oai-gnb</image_name>
-                </image_to_pull>
-                <image_to_pull>
-                        <image_name>oai-nr-ue</image_name>
-                </image_to_pull>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
         </testCase>
 
         <testCase id="000020">
diff --git a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
index 7de6007b01..3b53f5d25c 100644
--- a/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_fdd_rfsim.xml
@@ -44,12 +44,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <image_to_pull>
-                        <image_name>oai-gnb</image_name>
-                </image_to_pull>
-                <image_to_pull>
-                        <image_name>oai-nr-ue</image_name>
-                </image_to_pull>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
         </testCase>
 
         <testCase id="000010">
diff --git a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
index 9aa7be0b20..fde1498bf8 100644
--- a/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
+++ b/ci-scripts/xml_files/container_5g_l2sim_tdd.xml
@@ -45,12 +45,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <image_to_pull>
-                        <image_name>oai-gnb</image_name>
-                </image_to_pull>
-                <image_to_pull>
-                        <image_name>oai-nr-ue</image_name>
-                </image_to_pull>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
         </testCase>
 
         <testCase id="000000">
diff --git a/ci-scripts/xml_files/container_5g_rfsim.xml b/ci-scripts/xml_files/container_5g_rfsim.xml
index 09ec6e07d7..23fa243d69 100644
--- a/ci-scripts/xml_files/container_5g_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim.xml
@@ -47,12 +47,7 @@
                 <class>Pull_Local_Registry</class>
                 <desc>Pull Images from Local Registry</desc>
                 <test_svr_id>0</test_svr_id>
-                <image_to_pull>
-                        <image_name>oai-gnb</image_name>
-                </image_to_pull>
-                <image_to_pull>
-                        <image_name>oai-nr-ue</image_name>
-                </image_to_pull>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
         </testCase>
 
         <testCase id="000000">
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
index 7abee1042d..28b70f103f 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_05Mhz_tm1.xml
@@ -40,9 +40,7 @@ Replace xml_files/enb_usrp210_band7_test_05mhz_tm1.xml
         <class>Pull_Local_Registry</class>
         <desc>Pull Images from Local Registry</desc>
         <test_svr_id>0</test_svr_id>
-        <image_to_pull>
-            <image_name>oai-enb</image_name>
-        </image_to_pull>
+        <images_to_pull>oai-enb</images_to_pull>
     </testCase>
 
     <testCase id="030101">
diff --git a/ci-scripts/xml_files/container_nsa_b200_quectel.xml b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
index 0bed99fdb2..5e2eecd4cd 100644
--- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
@@ -54,18 +54,14 @@
 		<class>Pull_Local_Registry</class>
 		<desc>Pull Images from Local Registry</desc>
 		<test_svr_id>0</test_svr_id>
-		<image_to_pull>
-			<image_name>oai-enb</image_name>
-		</image_to_pull>
+		<images_to_pull>oai-enb</images_to_pull>
 	</testCase>
 
 	<testCase id="111111">
 		<class>Pull_Local_Registry</class>
 		<desc>Pull Images from Local Registry</desc>
 		<test_svr_id>1</test_svr_id>
-		<image_to_pull>
-			<image_name>oai-gnb</image_name>
-		</image_to_pull>
+		<images_to_pull>oai-gnb</images_to_pull>
 	</testCase>
 
 	<testCase id="010000">
diff --git a/ci-scripts/xml_files/container_sa_b200_quectel.xml b/ci-scripts/xml_files/container_sa_b200_quectel.xml
index 127900343a..b8eed34fdc 100644
--- a/ci-scripts/xml_files/container_sa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml
@@ -51,9 +51,7 @@
     <class>Pull_Local_Registry</class>
     <desc>Pull Images from Local Registry</desc>
     <test_svr_id>0</test_svr_id>
-    <image_to_pull>
-      <image_name>oai-gnb</image_name>
-    </image_to_pull>
+    <images_to_pull>oai-gnb</images_to_pull>
   </testCase>
 
   <testCase id="010000">