diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml
index 01c4e6fc72..45c6db4a96 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue.xml
@@ -137,8 +137,8 @@
         <iperf_args>-u -b 10M -t 30 -R</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
-        <direction>IPERF3</direction>
         <id>lte_oai_ue_carabe</id>
+        <svr_id>nano-cn4g</svr_id>
     </testCase>
 
     <testCase id="040616">
@@ -147,8 +147,8 @@
         <iperf_args>-t 30 -R</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
-        <direction>IPERF3</direction>
         <id>lte_oai_ue_carabe</id>
+        <svr_id>nano-cn4g</svr_id>
     </testCase>
 
     <testCase id="040651">
@@ -157,8 +157,8 @@
         <iperf_args>-u -b 10M -t 30</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>single-ue</iperf_profile>
-        <direction>IPERF3</direction>
         <id>lte_oai_ue_carabe</id>
+        <svr_id>nano-cn4g</svr_id>
     </testCase>
 
     <testCase id="040654">
@@ -167,8 +167,8 @@
         <iperf_args>-t 30</iperf_args>
         <iperf_packetloss_threshold>50</iperf_packetloss_threshold>
         <iperf_profile>balanced</iperf_profile>
-        <direction>IPERF3</direction>
         <id>lte_oai_ue_carabe</id>
+        <svr_id>nano-cn4g</svr_id>
     </testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml
index 33df87d924..03d502fe14 100644
--- a/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml
+++ b/ci-scripts/xml_files/container_lte_b200_fdd_10Mhz_tm1_oaiue_cleanup.xml
@@ -25,11 +25,29 @@
     <htmlTabName>Images Clean-Up</htmlTabName>
     <htmlTabIcon>trash</htmlTabIcon>
     <TestCaseRequestedList>
+000000
+111111
 222222
 333333
     </TestCaseRequestedList>
     <TestCaseExclusionList></TestCaseExclusionList>
 
+    <testCase id="000000">
+        <class>Undeploy_Object</class>
+        <desc>Undeploy eNB</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_magma</yaml_path>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
+
+    <testCase id="111111">
+        <class>Undeploy_Object</class>
+        <desc>Undeploy LTE-UE</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_b200_fdd_10Mhz_oai_ue_magma</yaml_path>
+        <eNB_instance>1</eNB_instance>
+        <eNB_serverId>1</eNB_serverId>
+    </testCase>
+
     <testCase id="222222">
         <class>Clean_Test_Server_Images</class>
         <desc>Clean Test Images on eNB Test Server</desc>