diff --git a/ci-scripts/ci_infra.yaml b/ci-scripts/ci_infra.yaml
index ec13d1ada8..06e42bd5e6 100644
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -105,6 +105,13 @@ ltebox-nano:
 sabox-nepes:
   Host: nepes
   NetworkScript: ip a show dev tun1
+  Deploy:
+    - "sudo su -c 'screen -dm -S simulated_5g_hss /opt/hss_sim0609/start_5g_hss'"
+    - "sleep 1"
+    - "sudo /opt/ltebox/tools/start_sabox < /dev/null &> /dev/null"
+    - "sleep 1"
+  LogCollect: "cp /opt/hss_sim0609/hss.log /opt/ltebox/var/log/{amfLog.0,ngapcLog.0,ngapcommonLog.0,ngapsLog.0,xGwLog.0,upfLog.0} %%log_dir%%"
+  Undeploy: "sudo /opt/ltebox/tools/stop_sabox; sudo killall screen"
 
 ltebox-nepes:
   Host: nepes
diff --git a/ci-scripts/epc.py b/ci-scripts/epc.py
index a3b8d72ea1..e10c9ef485 100644
--- a/ci-scripts/epc.py
+++ b/ci-scripts/epc.py
@@ -252,16 +252,7 @@ class EPCManagement():
 		mySSH = cls_cmd.getConnection(self.IPAddress)
 		html_cell = ''
 		if re.match('ltebox', self.Type, re.IGNORECASE):
-			logging.debug('Using the SABOX simulated HSS')
-			mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
-			mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts', '\$', 5)
-			mySSH.command('cd /opt/hss_sim0609', '\$', 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S rm -f hss.log', '\$', 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S echo "Starting sudo session" && sudo su -c "screen -dm -S simulated_5g_hss ./start_5g_hss"', '\$', 5)
-			logging.debug('Using the sabox')
-			mySSH.command('cd /opt/ltebox/tools', '\$', 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S ./start_sabox', '\$', 5)
-			html_cell += 'N/A\n'
+			raise NotImplemented("use cls_corenetwork.py")
 		elif re.match('OAICN5G', self.Type, re.IGNORECASE):
 			logging.debug('Starting OAI CN5G')
 			mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
@@ -464,14 +455,7 @@ class EPCManagement():
 		mySSH = cls_cmd.getConnection(self.IPAddress)
 		message = ''
 		if re.match('ltebox', self.Type, re.IGNORECASE):
-			logging.debug('Terminating SA BOX')
-			mySSH.command('cd /opt/ltebox/tools', '\$', 5)
-			mySSH.command('echo ' + self.Password + ' | sudo -S ./stop_sabox', '\$', 5)
-			time.sleep(1)
-			mySSH.command('cd ' + self.SourceCodePath, '\$', 5)
-			mySSH.command('cd scripts', '\$', 5)
-			time.sleep(1)
-			mySSH.command('echo ' + self.Password + ' | sudo -S screen -S simulated_5g_hss -X quit', '\$', 5)
+			raise NotImplemented("use cls_corenetwork.py")
 		elif re.match('OAICN5G', self.Type, re.IGNORECASE):
 			logging.debug('OAI CN5G Collecting Log files to workspace')
 			mySSH.command('echo ' + self.Password + ' | sudo rm -rf ' + self.SourceCodePath + '/logs', '\$', 5)
diff --git a/ci-scripts/xml_files/container_sa_b200_quectel.xml b/ci-scripts/xml_files/container_sa_b200_quectel.xml
index 51d9c314b4..e75eb2a977 100644
--- a/ci-scripts/xml_files/container_sa_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_b200_quectel.xml
@@ -130,6 +130,7 @@
     <class>Ping</class>
     <desc>Ping: 20pings in 20sec</desc>
     <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
     <ping_args>-c 20 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
@@ -139,6 +140,7 @@
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
     <ping_args>-c 100 -i 0.2 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
diff --git a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
index f93da0e890..10acef9644 100644
--- a/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_e1_b200_quectel.xml
@@ -131,6 +131,7 @@
     <class>Ping</class>
     <desc>Ping: 50pings in 10sec</desc>
     <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
     <ping_args>-c 20 -i 0.2 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>25</ping_rttavg_threshold>
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 82f3cc84e5..d9743704df 100644
--- a/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_f1_b200_quectel.xml
@@ -143,6 +143,7 @@
     <class>Ping</class>
     <desc>Ping: 20pings in 20sec</desc>
     <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
     <ping_args>-c 20 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>25</ping_rttavg_threshold>
@@ -152,6 +153,7 @@
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
     <ping_args>-c 100 -i 0.2 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>110</ping_rttavg_threshold>
@@ -161,6 +163,7 @@
     <class>Ping</class>
     <desc>Ping: 20pings in 20sec</desc>
     <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
     <ping_args>-c 20 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>110</ping_rttavg_threshold>
@@ -170,6 +173,7 @@
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
     <ping_args>-c 100 -i 0.2 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>110</ping_rttavg_threshold>
diff --git a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
index 0c76a17eb9..d301bee3ac 100644
--- a/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_sc_b200_quectel.xml
@@ -124,6 +124,7 @@
     <class>Ping</class>
     <desc>Ping: 20pings in 20sec</desc>
     <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
     <ping_args>-c 20 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
@@ -133,6 +134,7 @@
     <class>Ping</class>
     <desc>Ping: 100pings in 20sec</desc>
     <id>idefix</id>
+    <svr_id>sabox-nepes</svr_id>
     <ping_args>-c 100 -i 0.2 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>15</ping_rttavg_threshold>
diff --git a/ci-scripts/xml_files/fr1_5gc_closure.xml b/ci-scripts/xml_files/fr1_5gc_closure.xml
index e5e57fa694..fa524a60aa 100644
--- a/ci-scripts/xml_files/fr1_5gc_closure.xml
+++ b/ci-scripts/xml_files/fr1_5gc_closure.xml
@@ -30,8 +30,9 @@
 	<TestCaseExclusionList></TestCaseExclusionList>
 
 	<testCase id="060000">
-		<class>Terminate_5GCN</class>
+		<class>UndeployCoreNetwork</class>
 		<desc>Terminate 5GC</desc>
+		<cn_id>sabox-nepes</cn_id>
 	</testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/fr1_5gc_start.xml b/ci-scripts/xml_files/fr1_5gc_start.xml
index 8758b761cd..14bb55f612 100644
--- a/ci-scripts/xml_files/fr1_5gc_start.xml
+++ b/ci-scripts/xml_files/fr1_5gc_start.xml
@@ -31,8 +31,9 @@
 	</TestCaseExclusionList>
 
 	<testCase id="000100">
-		<class>Initialize_5GCN</class>
+		<class>DeployCoreNetwork</class>
 		<desc>Initialize 5GC</desc>
+		<cn_id>sabox-nepes</cn_id>
 	</testCase>
 
 </testCaseList>