diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_cleanup.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_cleanup.xml
new file mode 100644
index 0000000000..01c89ae585
--- /dev/null
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_cleanup.xml
@@ -0,0 +1,54 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+    <htmlTabRef>images-clean-up</htmlTabRef>
+    <htmlTabName>Images Clean-Up</htmlTabName>
+    <htmlTabIcon>trash</htmlTabIcon>
+    <TestCaseRequestedList>
+111111
+222222
+333333
+    </TestCaseRequestedList>
+    <TestCaseExclusionList></TestCaseExclusionList>
+
+    <testCase id="111111">
+      <class>Detach_UE</class>
+      <desc>Detach UE</desc>
+      <id>up2</id>
+    </testCase>
+
+    <testCase id="222222">
+        <class>Undeploy_Object</class>
+        <desc>Undeploy eNB</desc>
+        <yaml_path>ci-scripts/yaml_files/lte_n3xx_tdd_2x2_tm2</yaml_path>
+        <eNB_instance>0</eNB_instance>
+        <eNB_serverId>0</eNB_serverId>
+    </testCase>
+
+    <testCase id="333333">
+        <class>Clean_Test_Server_Images</class>
+        <desc>Clean Test Images</desc>
+        <test_svr_id>0</test_svr_id>
+    </testCase>
+
+</testCaseList>
diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
index 7bec0f8a83..ee1ae2049c 100644
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm1.xml
@@ -106,9 +106,9 @@
   <testCase id="070000">
     <class>Iperf</class>
     <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 26M -t 60</iperf_args>
-    <direction>DL</direction>
+    <iperf_args>-u -b 26M -t 60 -R</iperf_args>
     <id>up2</id>
+    <svr_id>porcepix-cn4g</svr_id>
     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
     <iperf_profile>single-ue</iperf_profile>
@@ -118,8 +118,8 @@
      <class>Iperf</class>
      <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
      <iperf_args>-u -b 7M -t 60</iperf_args>
-     <direction>UL</direction>
      <id>up2</id>
+     <svr_id>porcepix-cn4g</svr_id>
      <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
      <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
      <iperf_profile>single-ue</iperf_profile>
diff --git a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
index f57b77648c..8ee471d908 100644
--- a/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
+++ b/ci-scripts/xml_files/container_lte_n3xx_tdd_2x2_tm2.xml
@@ -106,9 +106,9 @@
   <testCase id="070000">
     <class>Iperf</class>
     <desc>iperf (DL/26Mbps/UDP)(60 sec)(single-ue profile)</desc>
-    <iperf_args>-u -b 1M -t 60</iperf_args>
-    <direction>DL</direction>
+    <iperf_args>-u -b 1M -t 60 -R</iperf_args>
     <id>up2</id>
+    <svr_id>porcepix-cn4g</svr_id>
     <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
     <iperf_profile>single-ue</iperf_profile>
@@ -118,8 +118,8 @@
      <class>Iperf</class>
      <desc>iperf (UL/7Mbps/UDP)(60 sec)(single-ue profile)</desc>
      <iperf_args>-u -b 7M -t 60</iperf_args>
-     <direction>UL</direction>
      <id>up2</id>
+     <svr_id>porcepix-cn4g</svr_id>
      <iperf_packetloss_threshold>5</iperf_packetloss_threshold>
      <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
      <iperf_profile>single-ue</iperf_profile>