diff --git a/ci-scripts/ci_infra.yaml b/ci-scripts/ci_infra.yaml
index 4d1a87ddba..64432f6188 100644
--- a/ci-scripts/ci_infra.yaml
+++ b/ci-scripts/ci_infra.yaml
@@ -77,8 +77,8 @@ oc-cn5g-20897:
   Undeploy: "! scripts/oc-cn5g-undeploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72"
   LogCollect: "! scripts/oc-cn5g-logcollect.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-fhi72 %%log_dir%%"
 
-oc-cn5g-20897-aerial2:
-  Host: aerial2
+oc-cn5g-20897-aerial:
+  Host: gracehopper1-oai
   NetworkScript: echo "inet 172.21.6.105"
   RunIperf3Server: False
   Deploy: "! scripts/oc-cn5g-deploy.sh /opt/oai-cn5g-fed-develop-2025-jan oaicicd-core-for-nvidia-aerial"
diff --git a/ci-scripts/xml_files/container_sa_aerial_quectel.xml b/ci-scripts/xml_files/container_sa_aerial_quectel.xml
index 6a3e7f8057..ccb9500a91 100644
--- a/ci-scripts/xml_files/container_sa_aerial_quectel.xml
+++ b/ci-scripts/xml_files/container_sa_aerial_quectel.xml
@@ -44,7 +44,7 @@
         <testCase id="555000">
                 <class>DeployCoreNetwork</class>
                 <desc>Initialize 5G Core</desc>
-                <cn_id>oc-cn5g-20897-aerial2</cn_id>
+                <cn_id>oc-cn5g-20897-aerial</cn_id>
         </testCase>
 
         <testCase id="111111">
@@ -90,7 +90,7 @@
                 <class>Ping</class>
                 <desc>Ping: 100pings in 20sec</desc>
                 <id>up2-aerial</id>
-                <svr_id>oc-cn5g-20897-aerial2</svr_id>
+                <svr_id>oc-cn5g-20897-aerial</svr_id>
                 <ping_args>-c 100 -i 0.2</ping_args>
                 <ping_packetloss_threshold>5</ping_packetloss_threshold>
         </testCase>
@@ -99,7 +99,7 @@
                 <class>Iperf</class>
                 <desc>iperf (DL/UDP/500M)(30 sec)(single-ue profile)</desc>
                 <iperf_args>-u -b 500M -t 30 -R</iperf_args>
-                <svr_id>oc-cn5g-20897-aerial2</svr_id>
+                <svr_id>oc-cn5g-20897-aerial</svr_id>
                 <id>up2-aerial</id>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -109,7 +109,7 @@
                 <class>Iperf</class>
                 <desc>iperf (UL/UDP/40M)(30 sec)(single-ue profile)</desc>
                 <iperf_args>-u -b 40M -t 30</iperf_args>
-                <svr_id>oc-cn5g-20897-aerial2</svr_id>
+                <svr_id>oc-cn5g-20897-aerial</svr_id>
                 <id>up2-aerial</id>
                 <iperf_packetloss_threshold>25</iperf_packetloss_threshold>
                 <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -145,7 +145,7 @@
                 <class>UndeployCoreNetwork</class>
                 <always_exec>true</always_exec>
                 <desc>Terminate 5G Core</desc>
-                <cn_id>oc-cn5g-20897-aerial2</cn_id>
+                <cn_id>oc-cn5g-20897-aerial</cn_id>
         </testCase>
 </testCaseList>