diff --git a/ci-scripts/ci_infra.yaml b/ci-scripts/ci_infra.yaml
index 1bc26659c6..59b388e593 100644
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -109,7 +109,7 @@ ltebox-nepes:
   Host: nepes
   NetworkScript: ip a show dev tun1
 
-amarisoft_ue:
+amarisoft_ue_2x2:
   Host: amariue
   InitScript: /root/lteue-linux-2023-10-27/ue/lteue /root/oaicicd/ran_sa_aw2s_asue_2x2/aw2s-multi-00102-2x2.cfg &
   TermScript: /root/2023-10-27/libs/ws.js -t 10 127.0.0.1:9002 '{"message":"quit"}' || killall -KILL lteue-avx2
diff --git a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf
similarity index 100%
rename from ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
rename to ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf
diff --git a/ci-scripts/xml_files/container_sa_aw2s_asue.xml b/ci-scripts/xml_files/container_sa_aw2s_asue_2x2.xml
similarity index 96%
rename from ci-scripts/xml_files/container_sa_aw2s_asue.xml
rename to ci-scripts/xml_files/container_sa_aw2s_asue_2x2.xml
index 71789cca52..23fd07eac3 100644
--- a/ci-scripts/xml_files/container_sa_aw2s_asue.xml
+++ b/ci-scripts/xml_files/container_sa_aw2s_asue_2x2.xml
@@ -21,8 +21,8 @@
 
 -->
 <testCaseList>
-  <htmlTabRef>TEST-5G-AW2S</htmlTabRef>
-  <htmlTabName>20 MHz TDD SA</htmlTabName>
+  <htmlTabRef>TEST-5G-2x2-AW2S</htmlTabRef>
+  <htmlTabName>20 MHz TDD 2x2 SA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
   <TestCaseRequestedList>
     010000
@@ -75,7 +75,7 @@
   <testCase id="020000">
     <class>Deploy_Object</class>
     <desc>Deploy gNB (TDD/Band78/20MHz/aw2s) in a container</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_aw2s_gnb</yaml_path>
+    <yaml_path>ci-scripts/yaml_files/sa_aw2s_2x2_gnb</yaml_path>
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
   </testCase>
@@ -83,7 +83,7 @@
   <testCase id="001000">
     <class>Initialize_UE</class>
     <desc>Initialize Amarisoft UE</desc>
-    <id>amarisoft_ue</id>
+    <id>amarisoft_ue_2x2</id>
   </testCase>
 
   <testCase id="002001">
@@ -237,7 +237,7 @@
     <desc>Ping: 50pings in 10sec, multi-ue</desc>
     <id>amarisoft_ue_16</id>
     <ping_args>-c 50 -i 0.2 %cn_ip%</ping_args>
-    <ping_packetloss_threshold>1</ping_packetloss_threshold>
+    <ping_packetloss_threshold>5</ping_packetloss_threshold>
     <ping_rttavg_threshold>30</ping_rttavg_threshold>
   </testCase>
 
@@ -252,7 +252,7 @@
     <class>Terminate_UE</class>
     <always_exec>true</always_exec>
     <desc>Terminate UE</desc>
-    <id>amarisoft_ue</id>
+    <id>amarisoft_ue_2x2</id>
   </testCase>
 
   <testCase id="000002">
@@ -265,7 +265,7 @@
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
     <desc>Undeploy gNB</desc>
-    <yaml_path>ci-scripts/yaml_files/sa_aw2s_gnb</yaml_path>
+    <yaml_path>ci-scripts/yaml_files/sa_aw2s_2x2_gnb</yaml_path>
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
   </testCase>
diff --git a/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml b/ci-scripts/yaml_files/sa_aw2s_2x2_gnb/docker-compose.yml
similarity index 84%
rename from ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml
rename to ci-scripts/yaml_files/sa_aw2s_2x2_gnb/docker-compose.yml
index 03b9914404..d1f5ae2475 100644
--- a/ci-scripts/yaml_files/sa_aw2s_gnb/docker-compose.yml
+++ b/ci-scripts/yaml_files/sa_aw2s_2x2_gnb/docker-compose.yml
@@ -14,7 +14,7 @@ services:
             TZ: Europe/Paris
             USE_ADDITIONAL_OPTIONS: --sa
         volumes:
-            - ../../conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf:/opt/oai-gnb-aw2s/etc/gnb.conf
+            - ../../conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf:/opt/oai-gnb-aw2s/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s