diff --git a/ponnet/templates/genie-cni-1.8.yml b/ponnet/templates/genie-cni-1.8.yaml
similarity index 100%
rename from ponnet/templates/genie-cni-1.8.yml
rename to ponnet/templates/genie-cni-1.8.yaml
diff --git a/xos-profiles/base-kubernetes/values.yaml b/xos-profiles/base-kubernetes/values.yaml
index b0d50e1..8521140 100644
--- a/xos-profiles/base-kubernetes/values.yaml
+++ b/xos-profiles/base-kubernetes/values.yaml
@@ -36,7 +36,6 @@
     description: Some basic fixtures
     imports:
       - custom_types/siterole.yaml
-      - custom_types/slicerole.yaml
       - custom_types/networkparametertype.yaml
       - custom_types/networktemplate.yaml
     topology_template:
@@ -83,14 +82,6 @@
           type: tosca.nodes.SiteRole
           properties:
             role: tech
-        slicerole#admin:
-          type: tosca.nodes.SliceRole
-          properties:
-            role: admin
-        slicerole#access:
-          type: tosca.nodes.SliceRole
-          properties:
-            role: access
     # -----------------------------------------------------------------------------
     # Network Templates
     # -----------------------------------------------------------------------------
diff --git a/xos-profiles/base-openstack/requirements.yaml b/xos-profiles/base-openstack/requirements.yaml
index de4507b..7f2578a 100644
--- a/xos-profiles/base-openstack/requirements.yaml
+++ b/xos-profiles/base-openstack/requirements.yaml
@@ -16,7 +16,7 @@
 
 dependencies:
 - name: onos-service
-  version: 2.0.1
+  version: 2.0.2-dev
   repository: file://../../xos-services/onos-service
 - name: openstack
   version: 1.0.0
diff --git a/xos-profiles/rcord-fc/requirements.yaml b/xos-profiles/rcord-fc/requirements.yaml
index 9bea9e2..acb0780 100644
--- a/xos-profiles/rcord-fc/requirements.yaml
+++ b/xos-profiles/rcord-fc/requirements.yaml
@@ -18,7 +18,7 @@
   version: 1.1.0-dev
   repository: file://../../xos-services/rcord
 - name: onos-service
-  version: 2.0.1
+  version: 2.0.2-dev
   repository: file://../../xos-services/onos-service
 - name: fabric
   version: 2.0.0
diff --git a/xos-profiles/rcord-fc/templates/_tosca.tpl b/xos-profiles/rcord-fc/templates/_tosca.tpl
index 55777be..be872ef 100644
--- a/xos-profiles/rcord-fc/templates/_tosca.tpl
+++ b/xos-profiles/rcord-fc/templates/_tosca.tpl
@@ -19,7 +19,6 @@
 description: Some basic fixtures
 imports:
   - custom_types/siterole.yaml
-  - custom_types/slicerole.yaml
   - custom_types/networkparametertype.yaml
   - custom_types/networktemplate.yaml
   - custom_types/deployment.yaml
@@ -69,14 +68,6 @@
       type: tosca.nodes.SiteRole
       properties:
         role: tech
-    slicerole#admin:
-      type: tosca.nodes.SliceRole
-      properties:
-        role: admin
-    slicerole#access:
-      type: tosca.nodes.SliceRole
-      properties:
-        role: access
 
 # -----------------------------------------------------------------------------
 # Network Templates
diff --git a/xos-profiles/rcord-lite/requirements.yaml b/xos-profiles/rcord-lite/requirements.yaml
index 6670b10..a7f5f6e 100644
--- a/xos-profiles/rcord-lite/requirements.yaml
+++ b/xos-profiles/rcord-lite/requirements.yaml
@@ -18,7 +18,7 @@
   version: 1.1.0-dev
   repository: file://../../xos-services/rcord
 - name: onos-service
-  version: 2.0.1
+  version: 2.0.2-dev
   repository: file://../../xos-services/onos-service
 - name: fabric
   version: 2.0.0
diff --git a/xos-profiles/rcord-lite/templates/_tosca.tpl b/xos-profiles/rcord-lite/templates/_tosca.tpl
index fef0364..4ecb462 100644
--- a/xos-profiles/rcord-lite/templates/_tosca.tpl
+++ b/xos-profiles/rcord-lite/templates/_tosca.tpl
@@ -19,41 +19,10 @@
 description: Some basic fixtures
 imports:
   - custom_types/siterole.yaml
-  - custom_types/slicerole.yaml
-  - custom_types/networkparametertype.yaml
-  - custom_types/networktemplate.yaml
   - custom_types/deployment.yaml
 topology_template:
   node_templates:
 
-# -----------------------------------------------------------------------------
-# Network Parameter Types
-# -----------------------------------------------------------------------------
-    s_tag:
-      type: tosca.nodes.NetworkParameterType
-      properties:
-        name: s_tag
-    c_tag:
-      type: tosca.nodes.NetworkParameterType
-      properties:
-        name: c_tag
-    next_hop:
-      type: tosca.nodes.NetworkParameterType
-      properties:
-        name: next_hop
-    device:
-      type: tosca.nodes.NetworkParameterType
-      properties:
-        name: device
-    bridge:
-      type: tosca.nodes.NetworkParameterType
-      properties:
-        name: bridge
-    neutron_port_name:
-      type: tosca.nodes.NetworkParameterType
-      properties:
-        name: neutron_port_name
-
 # ----------------------------------------------------------------------------
 # Roles
 # ----------------------------------------------------------------------------
@@ -69,40 +38,6 @@
       type: tosca.nodes.SiteRole
       properties:
         role: tech
-    slicerole#admin:
-      type: tosca.nodes.SliceRole
-      properties:
-        role: admin
-    slicerole#access:
-      type: tosca.nodes.SliceRole
-      properties:
-        role: access
-
-# -----------------------------------------------------------------------------
-# Network Templates
-# -----------------------------------------------------------------------------
-    Private:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-        name: Private
-        visibility: private
-        translation: none
-
-    Public shared IPv4:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-        name: Public shared IPv4
-        visibility: private
-        translation: NAT
-        shared_network_name: nat-net
-
-    Public dedicated IPv4:
-      type: tosca.nodes.NetworkTemplate
-      properties:
-        name: Public dedicated IPv4
-        visibility: public
-        translation: none
-        shared_network_name: ext-net
 
 # -----------------------------------------------------------------------------
 # Deployment
@@ -178,7 +113,7 @@
     service_dependency#onos-fabric_fabric:
       type: tosca.nodes.ServiceDependency
       properties:
-        connect_method: None
+        connect_method: none
       requirements:
         - subscriber_service:
             node: service#ONOS_Fabric
@@ -190,7 +125,7 @@
     service_dependency#rcord_volt:
       type: tosca.nodes.ServiceDependency
       properties:
-        connect_method: None
+        connect_method: none
       requirements:
         - subscriber_service:
             node: service#rcord
@@ -202,7 +137,7 @@
     service_dependency#onos_voltha_volt:
       type: tosca.nodes.ServiceDependency
       properties:
-        connect_method: None
+        connect_method: none
       requirements:
         - subscriber_service:
             node: service#volt
@@ -214,7 +149,7 @@
     service_dependency#fabric_vrouter:
       type: tosca.nodes.ServiceDependency
       properties:
-        connect_method: None
+        connect_method: none
       requirements:
         - subscriber_service:
             node: service#fabric
@@ -226,7 +161,7 @@
     service_dependency#volt_vsg-hw:
       type: tosca.nodes.ServiceDependency
       properties:
-        connect_method: None
+        connect_method: none
       requirements:
         - subscriber_service:
             node: service#volt
@@ -238,7 +173,7 @@
     service_dependency#onos_fabric_vsg-hw:
       type: tosca.nodes.ServiceDependency
       properties:
-        connect_method: None
+        connect_method: none
       requirements:
         - subscriber_service:
             node: service#vsg-hw
diff --git a/xos-services/fabric-crossconnect/templates/_tosca.tpl b/xos-services/fabric-crossconnect/templates/_tosca.tpl
index 820af47..fcb3fd6 100644
--- a/xos-services/fabric-crossconnect/templates/_tosca.tpl
+++ b/xos-services/fabric-crossconnect/templates/_tosca.tpl
@@ -26,4 +26,5 @@
       type: tosca.nodes.FabricCrossconnectService
       properties:
         name: fabric-crossconnect
+        kind: data
 {{- end -}}
diff --git a/xos-services/fabric/templates/_tosca.tpl b/xos-services/fabric/templates/_tosca.tpl
index 09f3810..8a5e466 100644
--- a/xos-services/fabric/templates/_tosca.tpl
+++ b/xos-services/fabric/templates/_tosca.tpl
@@ -26,5 +26,5 @@
       type: tosca.nodes.FabricService
       properties:
         name: fabric
-        kind: platform
+        kind: data
 {{- end -}}
diff --git a/xos-services/hippie-oss/templates/_tosca.tpl b/xos-services/hippie-oss/templates/_tosca.tpl
index 013ccdb..675bcc9 100644
--- a/xos-services/hippie-oss/templates/_tosca.tpl
+++ b/xos-services/hippie-oss/templates/_tosca.tpl
@@ -26,5 +26,5 @@
       type: tosca.nodes.HippieOSSService
       properties:
         name: hippie-oss
-        kind: OSS
+        kind: oss
 {{- end -}}
diff --git a/xos-services/onos-service/Chart.yaml b/xos-services/onos-service/Chart.yaml
index 0a1c44c..248ffbf 100644
--- a/xos-services/onos-service/Chart.yaml
+++ b/xos-services/onos-service/Chart.yaml
@@ -15,4 +15,4 @@
 
 description: A Helm chart for XOS's "onos-service" service, which configures ONOS
 name: onos-service
-version: 2.0.1
+version: 2.0.2-dev
diff --git a/xos-services/onos-service/templates/_tosca.tpl b/xos-services/onos-service/templates/_tosca.tpl
index 17bd85a..b611e43 100644
--- a/xos-services/onos-service/templates/_tosca.tpl
+++ b/xos-services/onos-service/templates/_tosca.tpl
@@ -26,7 +26,7 @@
       type: tosca.nodes.ONOSService
       properties:
           name: ONOS_Fabric
-          kind: platform
+          kind: data
           rest_hostname: {{ .onosFabricRestService | quote }}
           rest_port: 8181
 
@@ -88,7 +88,7 @@
       type: tosca.nodes.ONOSService
       properties:
           name: ONOS_CORD
-          kind: platform
+          kind: data
           rest_hostname: {{ .onosCordRestService | quote }}
           rest_port: 8181
 
@@ -156,7 +156,7 @@
       type: tosca.nodes.ONOSService
       properties:
           name: ONOS_VOLTHA
-          kind: platform
+          kind: data
           rest_hostname: {{ .onosVolthaRestService | quote }}
           rest_port: 8181
 
diff --git a/xos-services/onos-service/values.yaml b/xos-services/onos-service/values.yaml
index 1d569ff..1800a3d 100644
--- a/xos-services/onos-service/values.yaml
+++ b/xos-services/onos-service/values.yaml
@@ -24,7 +24,7 @@
 
 imagePullPolicy: 'Always'
 
-onos_synchronizerImage: "xosproject/onos-synchronizer:{{ .Chart.Version }}"
+onos_synchronizerImage: "xosproject/onos-synchronizer:master"
 
 xosAdminUser: "admin@opencord.org"
 xosAdminPassword: "letmein"
diff --git a/xos-services/rcord/templates/_tosca.tpl b/xos-services/rcord/templates/_tosca.tpl
index 846837b..030d410 100644
--- a/xos-services/rcord/templates/_tosca.tpl
+++ b/xos-services/rcord/templates/_tosca.tpl
@@ -25,4 +25,5 @@
       type: tosca.nodes.RCORDService
       properties:
         name: rcord
+        kind: data
 {{- end -}}
diff --git a/xos-services/volt/templates/_tosca.tpl b/xos-services/volt/templates/_tosca.tpl
index bbdef91..fd7e406 100644
--- a/xos-services/volt/templates/_tosca.tpl
+++ b/xos-services/volt/templates/_tosca.tpl
@@ -26,6 +26,7 @@
       type: tosca.nodes.VOLTService
       properties:
         name: volt
+        kind: data
         voltha_url: voltha.voltha.svc.cluster.local
         voltha_port: 8882
         onos_voltha_url: onos-voltha-ui.default.svc.cluster.local
diff --git a/xos-services/vrouter/templates/_tosca.tpl b/xos-services/vrouter/templates/_tosca.tpl
index 7dce612..e70c33d 100644
--- a/xos-services/vrouter/templates/_tosca.tpl
+++ b/xos-services/vrouter/templates/_tosca.tpl
@@ -26,5 +26,5 @@
       type: tosca.nodes.VRouterService
       properties:
         name: vrouter
-        kind: rcord
+        kind: data
 {{- end -}}
diff --git a/xos-services/vsg-hw/templates/_tosca.tpl b/xos-services/vsg-hw/templates/_tosca.tpl
index d5d84be..14975f8 100644
--- a/xos-services/vsg-hw/templates/_tosca.tpl
+++ b/xos-services/vsg-hw/templates/_tosca.tpl
@@ -26,4 +26,5 @@
       type: tosca.nodes.VSGHWService
       properties:
         name: vsg-hw
+        kind: data
 {{- end -}}