diff --git a/use-cases/e-cord/onf/global-vnaas-service.yaml.j2 b/use-cases/e-cord/onf/global-vnaas-service.yaml
similarity index 83%
rename from use-cases/e-cord/onf/global-vnaas-service.yaml.j2
rename to use-cases/e-cord/onf/global-vnaas-service.yaml
index cc0cb04..3cedda1 100644
--- a/use-cases/e-cord/onf/global-vnaas-service.yaml.j2
+++ b/use-cases/e-cord/onf/global-vnaas-service.yaml
@@ -30,7 +30,7 @@
       requirements:
       properties:
         name: onfGlobalONOS
-        onos_ip: 127.0.0.1
+        onos_ip: onos-cord
         onos_port: 8182
         onos_username: onos
         onos_password: rocks
@@ -83,7 +83,7 @@
         tenant: onf
         name: uni1
         latlng: [37.973535, -122.531087]
-        cpe_id: netconf:10.6.0.160:830/0
+        cpe_id: domain:10.90.1.30-cord-onos/1
 
     usernetworkinterface#UserNetworkInterface2:
       type: tosca.nodes.UserNetworkInterface
@@ -92,7 +92,7 @@
         tenant: onf
         name: uni2
         latlng: [37.773972, -122.431297]
-        cpe_id: netconf:10.6.0.161:830/0
+        cpe_id: domain:10.90.1.50-cord-onos/1
 
     usernetworkinterface#UserNetworkInterface3:
       type: tosca.nodes.UserNetworkInterface
@@ -101,15 +101,16 @@
         tenant: onf
         name: uni3
         latlng: [37.871637, -122.259750]
-        cpe_id: netconf:10.6.0.162:830/0
+        cpe_id: domain:10.90.1.70-cord-onos/1
 
     # eline#testeline:
-    #  type: tosca.nodes.ELine
-    #  requirements:
-    #  properties:
-    #    name: testeline
-    #    connect_point_1_id: netconf:10.6.0.160:830/0
-    #    connect_point_2_id: netconf:10.6.0.161:830/0
-    #    vlanids: 100
-    #    cord_site_name: onfGlobalONOS
-    #    bwp: gold
+    #   type: tosca.nodes.ELine
+    #   requirements:
+    #   properties:
+    #     name: testeline
+    #     connect_point_1_id: domain:10.90.1.30-cord-onos/1
+    #     connect_point_2_id: domain:10.90.1.50-cord-onos/1
+    #     vlanids: 100
+    #     cord_site_name: onfGlobalONOS
+    #     bwp: gold
+