diff --git a/xos-services/onos-service/templates/_tosca.tpl b/xos-services/onos-service/templates/_tosca.tpl
index ccdfee3..ecaf964 100644
--- a/xos-services/onos-service/templates/_tosca.tpl
+++ b/xos-services/onos-service/templates/_tosca.tpl
@@ -27,19 +27,28 @@
       properties:
           name: ONOS_Fabric
           kind: platform
-          no_container: true
           rest_hostname: onos-fabric-ui
           rest_port: 8181
 
-    Fabric_ONOS_app:
+    onos_app#segmentrouting:
       type: tosca.nodes.ONOSApp
-      requirements:
-          - owner:
-              node: service#ONOS_Fabric
-              relationship: tosca.relationships.BelongsToOne
       properties:
-          name: Fabric_ONOS_app
-          dependencies: org.onosproject.drivers, org.onosproject.openflow, org.onosproject.netcfghostprovider, org.onosproject.segmentrouting, org.onosproject.vrouter
+        name: segmentrouting
+        app_id: org.onosproject.segmentrouting
+      requirements:
+        - owner:
+            node: service#ONOS_Fabric
+            relationship: tosca.relationships.BelongsToOne
+
+    onos_app#vrouter:
+      type: tosca.nodes.ONOSApp
+      properties:
+        name: vrouter
+        app_id: org.onosproject.vrouter
+      requirements:
+        - owner:
+            node: service#ONOS_Fabric
+            relationship: tosca.relationships.BelongsToOne
 {{- end -}}
 
 {{- define "onos-service.vtnAppTosca" -}}
@@ -60,28 +69,28 @@
       properties:
           name: ONOS_CORD
           kind: platform
-          no_container: true
           rest_hostname: onos-cord-ui
           rest_port: 8181
 
-    VTN_ONOS_app:
+    onos_app#cord-config:
       type: tosca.nodes.ONOSApp
-      requirements:
-          - owner:
-              node: service#ONOS_CORD
-              relationship: tosca.relationships.BelongsToOne
       properties:
-          name: VTN_ONOS_app
-          install_dependencies: {{ .cordConfigAppURL }}, {{ .vtnAppURL }}
-          dependencies: org.onosproject.drivers, org.onosproject.drivers.ovsdb, org.onosproject.openflow-base, org.onosproject.ovsdb-base, org.onosproject.dhcp
+        name: cord-config
+        url: {{ .cordConfigAppURL }}
+        version: 1.4.0
+      requirements:
+        - owner:
+            node: service#ONOS_CORD
+            relationship: tosca.relationships.BelongsToOne
 
-    VTN_ONOS_app_autogenerate:
-        type: tosca.nodes.ServiceInstanceAttribute
-        requirements:
-          - service_instance:
-              node: VTN_ONOS_app
-              relationship: tosca.relationships.BelongsToOne
-        properties:
-            name: autogenerate
-            value: vtn-network-cfg
+    onos_app#vtn:
+      type: tosca.nodes.ONOSApp
+      properties:
+        name: vtn
+        url: {{ .vtnAppURL }}
+        version: 1.6.0
+      requirements:
+        - owner:
+            node: service#ONOS_CORD
+            relationship: tosca.relationships.BelongsToOne
 {{- end -}}
diff --git a/xos-services/vtn-service/templates/_tosca.tpl b/xos-services/vtn-service/templates/_tosca.tpl
index 49f0ba8..32f765d 100644
--- a/xos-services/vtn-service/templates/_tosca.tpl
+++ b/xos-services/vtn-service/templates/_tosca.tpl
@@ -18,7 +18,10 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 imports:
-   - custom_types/vtnservice.yaml
+  - custom_types/servicedependency.yaml
+  - custom_types/serviceinstance.yaml
+  - custom_types/serviceinstanceattribute.yaml
+  - custom_types/vtnservice.yaml
 
 description: Configures the VTN ONOS service
 
@@ -43,4 +46,23 @@
           vtnAPIVersion: 2
           controllerPort: onos-cord-openflow:6653
           resync: false
+
+    vtn_service_instance:
+      type: tosca.nodes.ServiceInstance
+      properties:
+          name: VTN config
+      requirements:
+        - owner:
+            node: service#vtn
+            relationship: tosca.relationships.BelongsToOne
+
+    vtn_config:
+        type: tosca.nodes.ServiceInstanceAttribute
+        properties:
+            name: autogenerate
+            value: vtn-network-cfg
+        requirements:
+          - service_instance:
+              node: vtn_service_instance
+              relationship: tosca.relationships.BelongsToOne
 {{- end -}}