diff --git a/xos-profiles/base-openstack/templates/_tosca.tpl b/xos-profiles/base-openstack/templates/_tosca.tpl
index 28ec7de..6ffeedb 100644
--- a/xos-profiles/base-openstack/templates/_tosca.tpl
+++ b/xos-profiles/base-openstack/templates/_tosca.tpl
@@ -111,7 +111,7 @@
     service_dependency#onos-cord_vtn:
       type: tosca.nodes.ServiceDependency
       properties:
-        connect_method: None
+        connect_method: none
       requirements:
         - subscriber_service:
             node: service#ONOS_CORD
diff --git a/xos-profiles/mcord/templates/_tosca.tpl b/xos-profiles/mcord/templates/_tosca.tpl
index 924d846..747027e 100644
--- a/xos-profiles/mcord/templates/_tosca.tpl
+++ b/xos-profiles/mcord/templates/_tosca.tpl
@@ -128,7 +128,7 @@
     vmme_vspgwc:
       type: tosca.nodes.ServiceDependency
       properties:
-        connect_method: None
+        connect_method: none
       requirements:
         - subscriber_service:
             node: service#vmme
@@ -140,7 +140,7 @@
     vmme_vspgwu:
       type: tosca.nodes.ServiceDependency
       properties:
-        connect_method: None
+        connect_method: none
       requirements:
         - subscriber_service:
             node: service#vmme
@@ -152,7 +152,7 @@
     vspgwc_vspgwu:
       type: tosca.nodes.ServiceDependency
       properties:
-        connect_method: None
+        connect_method: none
       requirements:
         - subscriber_service:
             node: service#vspgwc
@@ -164,7 +164,7 @@
     vmme_vhss:
       type: tosca.nodes.ServiceDependency
       properties:
-        connect_method: None
+        connect_method: none
       requirements:
         - subscriber_service:
             node: service#vmme
@@ -176,7 +176,7 @@
     vhss_hssdb:
       type: tosca.nodes.ServiceDependency
       properties:
-        connect_method: None
+        connect_method: none
       requirements:
         - subscriber_service:
             node: service#vhss
@@ -188,7 +188,7 @@
     mcord_vmme:
       type: tosca.nodes.ServiceDependency
       properties:
-        connect_method: None
+        connect_method: none
       requirements:
         - subscriber_service:
             node: service#vmme
diff --git a/xos-services/openstack/templates/_tosca.tpl b/xos-services/openstack/templates/_tosca.tpl
index 8f00dad..ad56d09 100644
--- a/xos-services/openstack/templates/_tosca.tpl
+++ b/xos-services/openstack/templates/_tosca.tpl
@@ -29,26 +29,31 @@
       type: tosca.nodes.Flavor
       properties:
         name: m1.tiny
+        flavor: m1.tiny
 
     m1.small:
       type: tosca.nodes.Flavor
       properties:
         name: m1.small
+        flavor: m1.small
 
     m1.medium:
       type: tosca.nodes.Flavor
       properties:
         name: m1.medium
+        flavor: m1.medium
 
     m1.large:
       type: tosca.nodes.Flavor
       properties:
         name: m1.large
+        flavor: m1.large
 
     m1.xlarge:
       type: tosca.nodes.Flavor
       properties:
         name: m1.xlarge
+        flavor: m1.xlarge
 {{- end -}}
 
 {{- define "openstack.networkTosca" -}}
diff --git a/xos-services/vtn-service/templates/_tosca.tpl b/xos-services/vtn-service/templates/_tosca.tpl
index c7f25b1..8777b24 100644
--- a/xos-services/vtn-service/templates/_tosca.tpl
+++ b/xos-services/vtn-service/templates/_tosca.tpl
@@ -32,7 +32,7 @@
       type: tosca.nodes.VTNService
       properties:
           name: vtn
-          kind: platform
+          kind: control
           privateGatewayMac: 00:00:00:00:00:01
           localManagementIp: 172.27.0.1/24
           ovsdbPort: 6641