diff --git a/ci-scripts/ci_ueinfra.yaml b/ci-scripts/ci_ueinfra.yaml
index 8ea75f9a85..15ca6b3859 100644
--- a/ci-scripts/ci_ueinfra.yaml
+++ b/ci-scripts/ci_ueinfra.yaml
@@ -9,15 +9,8 @@ idefix:
   HostUsername : oaicicd
   HostPassword : oaicicd
   HostSourceCodePath : none
-dummy1:
-  ID: dummy1
-  Kind : simcom
-  State : disabled
-  Process : quectel-cm 
-  HostIPAddress : 192.168.18.187
-  HostUsername : oaicicd
-  HostPassword : oaicicd
-  HostSourceCodePath : none
+dummy:
+  ID: dummy
 dummy2:  
   ID: dummy2
   Kind : cots
diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py
index 7e27a41a0a..f4f30c5d18 100644
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -1712,6 +1712,7 @@ class OaiCiTest():
 			return
 
 		if self.ue_id=="":
+			Module_UE = cls_module_ue.Module_UE(InfraUE.ci_ue_infra['dummy']) #RH, temporary, we need a dummy Module_UE object to pass to Ping_common
 			ueIpStatus = self.GetAllUEIPAddresses()
 			if (ueIpStatus < 0):
 				HTML.CreateHtmlTestRow(self.ping_args, 'KO', CONST.UE_IP_ADDRESS_ISSUE)
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index d6bfe3c7c9..0c0c76dc09 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -387,8 +387,18 @@ with open(yaml_file,'r') as f:
     xml_class_list = yaml.load(f,Loader=yaml.FullLoader)
 
 
+
+#loading UE infrastructure from yaml
+ue_infra_file='ci_ueinfra.yaml'
+if (os.path.isfile(ue_infra_file)):
+	yaml_file=ue_infra_file
+elif (os.path.isfile('ci-scripts/'+ue_infra_file)):
+	yaml_file='ci-scripts/'+ue_infra_file
+else:
+	logging.error("UE infrastructure yaml file cannot be found")
+	sys.exit("UE infrastructure file cannot be found")
 InfraUE=cls_ci_ueinfra.InfraUE() #initialize UE infrastructure class
-InfraUE.Get_UE_Infra("ci_ueinfra.yaml") #read the UE infra, filename is hardcoded and unique for the moment but should be passed as parameter from the test suite
+InfraUE.Get_UE_Infra(yaml_file) #read the UE infra, filename is hardcoded and unique for the moment but should be passed as parameter from the test suite