diff --git a/templates/cord-services.yaml.j2 b/templates/cord-services.yaml.j2
index 0fb5171..8a6a168 100644
--- a/templates/cord-services.yaml.j2
+++ b/templates/cord-services.yaml.j2
@@ -1,4 +1,4 @@
-
+---
 {#
 Copyright 2017-present Open Networking Foundation
 
@@ -15,10 +15,9 @@
 limitations under the License.
 #}
 
-
 tosca_definitions_version: tosca_simple_yaml_1_0
 
-description: Just enough Tosca to get the vSG slice running on the CORD POD, created by platform-install
+description: Just enough Tosca to get the vSG slice running on the CORD POD, created by rcord profile
 
 imports:
   - custom_types/addressmanagerservice.yaml
@@ -62,10 +61,11 @@
         name: management
         must-exist: true
 
-{% if use_management_hosts %}
-    management_hosts:
+{% if use_vtn_net_management_host %}
+    management_host:
       type: tosca.nodes.Network
       properties:
+        name: management_host
         must-exist: true
 {% endif %}
 
@@ -127,13 +127,14 @@
             node: service#vsg
             relationship: tosca.relationships.BelongsToOne
 
+
     addresses_vsg:
       type: tosca.nodes.AddressPool
       properties:
         name: addresses_vsg
-        addresses: 10.7.1.0/24
-        gateway_ip: 10.7.1.1
-        gateway_mac: a4:23:05:06:01:01
+        addresses: {{ addresspool_vsg_cidr }}
+        gateway_ip: {{ addresspool_vsg_cidr | ipaddr('1') | ipaddr('address') }}
+        gateway_mac:  {{ ( vtn_net_public_hwaddr_prefix ~ ( vtn_net_public_cidr | ipaddr('1') | ipaddr('address') | ip4_hex )) | hwaddr('unix') }}
       requirements:
         - service:
             node: service#addressmanager
@@ -143,9 +144,9 @@
       type: tosca.nodes.AddressPool
       properties:
         name: addresses_public
-        addresses: 10.8.1.0/24
-        gateway_ip: 10.8.1.1
-        gateway_mac: a4:23:05:06:01:01
+        addresses: {{ addresspool_public_cidr }}
+        gateway_ip: {{ addresspool_public_cidr | ipaddr('1') | ipaddr('address') }}
+        gateway_mac:  {{ ( vtn_net_public_hwaddr_prefix ~ ( vtn_net_public_cidr | ipaddr('1') | ipaddr('address') | ip4_hex )) | hwaddr('unix') }}
       requirements:
         - service:
             node: service#addressmanager
@@ -233,10 +234,10 @@
               node: service#vrouter
               relationship: tosca.relationships.BelongsToOne
 
-    template#vsg:
+    vsg_template:
       type: tosca.nodes.NetworkTemplate
       properties:
-        name: vsg
+        name: vsg_template
         visibility: private
         translation: none
         vtn_kind: VSG
@@ -249,7 +250,7 @@
         # ip_version: 4
       requirements:
         - template:
-            node: template#vsg
+            node: vsg_template
             relationship: tosca.relationships.BelongsToOne
         - owner:
             node: {{ site_name }}_vsg
@@ -272,7 +273,7 @@
       properties:
         network: noauto
         name: {{ site_name }}_vsg
-      requirements: 
+      requirements:
         - service:
             node: service#vsg
             relationship: tosca.relationships.BelongsToOne
@@ -293,18 +294,18 @@
               node: {{ site_name }}_vsg
               relationship: tosca.relationships.BelongsToOne
 
-{% if use_management_hosts %}
-    networkslice#management_hosts_to_{{ site_name }}_vsg:
+{% if use_vtn_net_management_host %}
+    networkslice#management_host_to_{{ site_name }}_vsg:
         type: tosca.nodes.NetworkSlice
         requirements:
           - network:
-              node: management_hosts
+              node: management_host
               relationship: tosca.relationships.BelongsToOne
           - slice:
-            node: {{ site_name }}_vsg
-            relationship: tosca.relationships.BelongsToOne
+              node: {{ site_name }}_vsg
+              relationship: tosca.relationships.BelongsToOne
 {% endif %}
-    
+
     # TODO: migrate interfaces when we'll start using them
     # in#lanside:
     #   type: tosca.nodes.InterfaceType
@@ -364,4 +365,5 @@
     #         relationship: tosca.relationships.MemberOfService
     #     - interface:
     #         node: in#wanside
-    #         relationship: tosca.relationships.IsType
\ No newline at end of file
+    #         relationship: tosca.relationships.IsType
+