diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 4674be4966..1a7607d5d5 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -706,6 +706,8 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 	# On CI bench w/ containers, we need to validate if IP routes are set
 	if EPC.IPAddress == '172.21.16.136':
 		CONTAINERS.CheckAndAddRoute('porcepix', EPC.IPAddress, EPC.UserName, EPC.Password)
+	if EPC.IPAddress == '172.21.16.137':
+		CONTAINERS.CheckAndAddRoute('nepes', EPC.IPAddress, EPC.UserName, EPC.Password)
 	if CONTAINERS.eNBIPAddress == '172.21.16.127':
 		CONTAINERS.CheckAndAddRoute('asterix', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
 	if CONTAINERS.eNB1IPAddress == '172.21.16.127':
@@ -714,6 +716,8 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 		CONTAINERS.CheckAndAddRoute('obelix', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
 	if CONTAINERS.eNB1IPAddress == '172.21.16.128':
 		CONTAINERS.CheckAndAddRoute('obelix', CONTAINERS.eNB1IPAddress, CONTAINERS.eNB1UserName, CONTAINERS.eNB1Password)
+	if CONTAINERS.eNBIPAddress == '172.21.16.109' or CONTAINERS.eNBIPAddress == 'ofqot':
+		CONTAINERS.CheckAndAddRoute('ofqot', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
 	if CONTAINERS.eNBIPAddress == '172.21.16.137':
 		CONTAINERS.CheckAndAddRoute('nepes', CONTAINERS.eNBIPAddress, CONTAINERS.eNBUserName, CONTAINERS.eNBPassword)
 	if CONTAINERS.eNB1IPAddress == '172.21.16.137':
diff --git a/ci-scripts/xml_files/container_nsa_b200_quectel.xml b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
index 2f469ef23e..ee5430010f 100644
--- a/ci-scripts/xml_files/container_nsa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_nsa_b200_quectel.xml
@@ -86,14 +86,14 @@
 	</testCase>
 	<testCase id="500000">
 		<class>Custom_Command</class>
-		<desc>Disable Sleep States (obelix)</desc>
-		<node>obelix</node>
+		<desc>Disable Sleep States (ofqot)</desc>
+		<node>ofqot</node>
 		<command>sudo cpupower idle-set -D 0</command>
 	</testCase>
 	<testCase id="600000">
 		<class>Custom_Command</class>
-		<desc>Enable Sleep States (obelix)</desc>
-		<node>obelix</node>
+		<desc>Enable Sleep States (ofqot)</desc>
+		<node>ofqot</node>
 		<command>sudo cpupower idle-set -E</command>
 	</testCase>
 
diff --git a/ci-scripts/xml_files/container_sa_b200_quectel.xml b/ci-scripts/xml_files/container_sa_b200_quectel.xml
index ae22723494..b862d90cfb 100644
--- a/ci-scripts/xml_files/container_sa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml
@@ -57,13 +57,13 @@
   <testCase id="100000">
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
-    <node>nepes</node>
+    <node>ofqot</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
   <testCase id="200000">
     <class>Custom_Command</class>
     <desc>Enable Sleep States</desc>
-    <node>nepes</node>
+    <node>ofqot</node>
     <command>sudo cpupower idle-set -E</command>
   </testCase>
 
@@ -161,14 +161,14 @@
   <testCase id="060001">
     <class>Custom_Command</class>
     <desc>Trigger Reestablishment</desc>
-    <node>nepes</node>
+    <node>ofqot</node>
     <command>echo ci force_reestab | nc -N 192.168.68.194 9090 | grep -E 'force-remove UE RNTI [0-9a-f]{4} from RLC to trigger reestablishment'</command>
     <command_fail>yes</command_fail>
   </testCase>
   <testCase id="060002">
     <class>Custom_Command</class>
     <desc>Verify Reestablishment</desc>
-    <node>nepes</node>
+    <node>ofqot</node>
     <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1 reconf_after_reestab 1'</command>
     <command_fail>yes</command_fail>
   </testCase>
diff --git a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
index 2f6aad7eef..3fab62b265 100644
--- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
@@ -93,13 +93,13 @@
   <testCase id="100000">
     <class>Custom_Command</class>
     <desc>Disable Sleep States</desc>
-    <node>nepes</node>
+    <node>ofqot</node>
     <command>sudo cpupower idle-set -D 0</command>
   </testCase>
   <testCase id="200000">
     <class>Custom_Command</class>
     <desc>Enable Sleep States</desc>
-    <node>nepes</node>
+    <node>ofqot</node>
     <command>sudo cpupower idle-set -E</command>
   </testCase>