diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py
index 8b6b12a4e0..7629a2ee17 100644
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -627,10 +627,10 @@ class Containerize():
 			HTML.CreateHtmlTabFooter(False)
 			return False
 
-	def Push_Image_to_Local_Registry(self, HTML, svr_id, tag_prefix=""):
-		lIpAddr, lSourcePath = self.GetCredentials(svr_id)
-		logging.debug('Pushing images to server: ' + lIpAddr)
-		ssh = cls_cmd.getConnection(lIpAddr)
+	def Push_Image_to_Local_Registry(self, node, HTML, tag_prefix=""):
+		lSourcePath = self.eNBSourceCodePath
+		logging.debug('Pushing images to server: ' + node)
+		ssh = cls_cmd.getConnection(node)
 		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
 		ret = ssh.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
 		if ret.returncode != 0:
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 85765de30c..07c3c0159c 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -343,9 +343,9 @@ def ExecuteActionWithParam(action, ctx):
 		success = SCA.CppCheckAnalysis(ctx, HTML)
 
 	elif action == 'Push_Local_Registry':
-		svr_id = test.findtext('svr_id')
+		node = test.findtext('node')
 		tag_prefix = test.findtext('tag_prefix') or ""
-		success = CONTAINERS.Push_Image_to_Local_Registry(HTML, svr_id, tag_prefix)
+		success = CONTAINERS.Push_Image_to_Local_Registry(node, HTML, tag_prefix)
 
 	elif action == 'Pull_Local_Registry' or action == 'Clean_Test_Server_Images':
 		if force_local:
diff --git a/ci-scripts/xml_files/container_image_build.xml b/ci-scripts/xml_files/container_image_build.xml
index 215ae2a2cb..b2c0705d8a 100644
--- a/ci-scripts/xml_files/container_image_build.xml
+++ b/ci-scripts/xml_files/container_image_build.xml
@@ -48,7 +48,7 @@
 	<testCase id="000010">
 		<class>Push_Local_Registry</class>
 		<desc>Push Images to Local Registry</desc>
-		<svr_id>0</svr_id>
+		<node>obelix</node>
 	</testCase>
 
 </testCaseList>
diff --git a/ci-scripts/xml_files/container_image_build_arm.xml b/ci-scripts/xml_files/container_image_build_arm.xml
index 2287c51b86..e82e357d26 100644
--- a/ci-scripts/xml_files/container_image_build_arm.xml
+++ b/ci-scripts/xml_files/container_image_build_arm.xml
@@ -47,7 +47,7 @@
         <testCase id="000010">
                 <class>Push_Local_Registry</class>
                 <desc>Push Images to Local Registry</desc>
-                <svr_id>0</svr_id>
+                <node>gracehopper3-oai</node>
                 <tag_prefix>arm_</tag_prefix>
         </testCase>