diff --git a/contrail_heat/new_templates/2svc_1instance.yaml b/contrail_heat/new_templates/2svc_1instance.yaml
index 9802f2f..02dfc42 100644
--- a/contrail_heat/new_templates/2svc_1instance.yaml
+++ b/contrail_heat/new_templates/2svc_1instance.yaml
@@ -206,38 +206,38 @@ parameters:
 
 resources:
   template_NetworkIpam_1:
-    type: OS::Contrail::NetworkIpam
+    type: OS::ContrailV2::NetworkIpam
     properties:
       name: { get_param: management_network }
 
   template_NetworkIpam_2:
-    type: OS::Contrail::NetworkIpam
+    type: OS::ContrailV2::NetworkIpam
     properties:
       name: { get_param: left_vn1 }
 
   template_NetworkIpam_3:
-    type: OS::Contrail::NetworkIpam
+    type: OS::ContrailV2::NetworkIpam
     properties:
       name: { get_param: right_vn1 }
 
   template_NetworkIpam_4:
-    type: OS::Contrail::NetworkIpam
+    type: OS::ContrailV2::NetworkIpam
     properties:
       name: { get_param: left_vn2 }
 
   template_NetworkIpam_5:
-    type: OS::Contrail::NetworkIpam
+    type: OS::ContrailV2::NetworkIpam
     properties:
       name: { get_param: right_vn2 }
 
   template_VirtualNetwork_1:
-    type: OS::Contrail::VirtualNetwork
+    type: OS::ContrailV2::VirtualNetwork
     depends_on: [ template_NetworkIpam_1 ]
     properties:
       name: { get_param: management_network }
-      network_ipam_refs: { get_resource: template_NetworkIpam_1 }
+      network_ipam_refs: [{ get_resource: template_NetworkIpam_1 }]
       network_ipam_refs_data:
-        {
+        [{
           network_ipam_refs_data_ipam_subnets:
             [{
               network_ipam_refs_data_ipam_subnets_subnet:
@@ -247,16 +247,16 @@ resources:
                 },
 	      network_ipam_refs_data_ipam_subnets_addr_from_start: { get_param: network_ipam_refs_data_ipam_subnets_addr_from_start_true },
             }]
-         }
+         }]
 
   template_VirtualNetwork_2:
-    type: OS::Contrail::VirtualNetwork
+    type: OS::ContrailV2::VirtualNetwork
     depends_on: [ template_NetworkIpam_2, template_NetworkPolicy1 ]
     properties:
       name: { get_param: left_vn1 }
-      network_ipam_refs: { get_resource: template_NetworkIpam_2 }
+      network_ipam_refs: [{ get_resource: template_NetworkIpam_2 }]
       network_ipam_refs_data:
-        {
+        [{
           network_ipam_refs_data_ipam_subnets:
             [{
               network_ipam_refs_data_ipam_subnets_subnet:
@@ -266,25 +266,25 @@ resources:
                 },
                network_ipam_refs_data_ipam_subnets_addr_from_start: { get_param: network_ipam_refs_data_ipam_subnets_addr_from_start_true },
  	     }]
-	 }
-      network_policy_refs: { get_param: policy1_fq_name }
+	 }]
+      network_policy_refs: [{ get_param: policy1_fq_name }]
       network_policy_refs_data:
-        {
+        [{
           network_policy_refs_data_sequence:
             {
               network_policy_refs_data_sequence_major: 0,
               network_policy_refs_data_sequence_minor: 0,
             },
-        }
+        }]
         
   template_VirtualNetwork_3:
-    type: OS::Contrail::VirtualNetwork
+    type: OS::ContrailV2::VirtualNetwork
     depends_on: [ template_NetworkIpam_3, template_NetworkPolicy1 ]
     properties:
       name: { get_param: right_vn1 }
-      network_ipam_refs: { get_resource: template_NetworkIpam_3 }
+      network_ipam_refs: [{ get_resource: template_NetworkIpam_3 }]
       network_ipam_refs_data:
-        {
+        [{
           network_ipam_refs_data_ipam_subnets:
             [{
               network_ipam_refs_data_ipam_subnets_subnet:
@@ -294,24 +294,24 @@ resources:
                 },
 	      network_ipam_refs_data_ipam_subnets_addr_from_start: { get_param: network_ipam_refs_data_ipam_subnets_addr_from_start_true },
             }]
-         }
-      network_policy_refs: { get_param: policy1_fq_name }
+         }]
+      network_policy_refs: [{ get_param: policy1_fq_name }]
       network_policy_refs_data:
-        {
+        [{
           network_policy_refs_data_sequence:
             {
               network_policy_refs_data_sequence_major: 0,
               network_policy_refs_data_sequence_minor: 0,
             },
-        }
+        }]
   template_VirtualNetwork_4:
-    type: OS::Contrail::VirtualNetwork
+    type: OS::ContrailV2::VirtualNetwork
     depends_on: [ template_NetworkIpam_4, template_NetworkPolicy2 ]
     properties:
       name: { get_param: left_vn2 }
-      network_ipam_refs: { get_resource: template_NetworkIpam_4 }
+      network_ipam_refs: [{ get_resource: template_NetworkIpam_4 }]
       network_ipam_refs_data:
-        {
+        [{
           network_ipam_refs_data_ipam_subnets:
             [{
               network_ipam_refs_data_ipam_subnets_subnet:
@@ -321,25 +321,25 @@ resources:
                 },
                network_ipam_refs_data_ipam_subnets_addr_from_start: { get_param: network_ipam_refs_data_ipam_subnets_addr_from_start_true },
  	     }]
-	 }
-      network_policy_refs: { get_param: policy2_fq_name }
+	 }]
+      network_policy_refs: [{ get_param: policy2_fq_name }]
       network_policy_refs_data:
-        {
+        [{
           network_policy_refs_data_sequence:
             {
               network_policy_refs_data_sequence_major: 0,
               network_policy_refs_data_sequence_minor: 0,
             },
-        }
+        }]
         
   template_VirtualNetwork_5:
-    type: OS::Contrail::VirtualNetwork
+    type: OS::ContrailV2::VirtualNetwork
     depends_on: [ template_NetworkIpam_5, template_NetworkPolicy2 ]
     properties:
       name: { get_param: right_vn2 }
-      network_ipam_refs: { get_resource: template_NetworkIpam_5 }
+      network_ipam_refs: [{ get_resource: template_NetworkIpam_5 }]
       network_ipam_refs_data:
-        {
+        [{
           network_ipam_refs_data_ipam_subnets:
             [{
               network_ipam_refs_data_ipam_subnets_subnet:
@@ -349,19 +349,19 @@ resources:
                 },
 	      network_ipam_refs_data_ipam_subnets_addr_from_start: { get_param: network_ipam_refs_data_ipam_subnets_addr_from_start_true },
             }]
-         }
-      network_policy_refs: { get_param: policy2_fq_name }
+         }]
+      network_policy_refs: [{ get_param: policy2_fq_name }]
       network_policy_refs_data:
-        {
+        [{
           network_policy_refs_data_sequence:
             {
               network_policy_refs_data_sequence_major: 0,
               network_policy_refs_data_sequence_minor: 0,
             },
-        }
+        }]
 
   template_ServiceTemplate:
-    type: OS::Contrail::ServiceTemplate
+    type: OS::ContrailV2::ServiceTemplate
     properties:
       name: { get_param: service_template_name }
       service_template_properties:
@@ -392,7 +392,7 @@ resources:
       domain: { get_param: domain }
 
   template_ServiceInstance1:
-    type: OS::Contrail::ServiceInstance
+    type: OS::ContrailV2::ServiceInstance
     depends_on: [ template_ServiceTemplate ]
     properties:
       name: { get_param: service_instance1_name }
@@ -414,10 +414,10 @@ resources:
               }
             ],
         }
-      service_template_refs: { get_resource: template_ServiceTemplate }
+      service_template_refs: [{ get_resource: template_ServiceTemplate }]
   
   template_ServiceInstance2:
-    type: OS::Contrail::ServiceInstance
+    type: OS::ContrailV2::ServiceInstance
     depends_on: [ template_ServiceTemplate ]
     properties:
       name: { get_param: service_instance2_name }
@@ -439,30 +439,30 @@ resources:
               }
             ],
         }
-      service_template_refs: { get_resource: template_ServiceTemplate }
+      service_template_refs: [{ get_resource: template_ServiceTemplate }]
 
   template_PortTuple1:
-    type: OS::Contrail::PortTuple
+    type: OS::ContrailV2::PortTuple
     depends_on: [ template_ServiceInstance1 ]
     properties:
       name: { get_attr: [ random_key_1, value ] }
       service_instance: { list_join: [':', { get_attr: [ template_ServiceInstance1, fq_name ] } ] }
   
   template_PortTuple2:
-    type: OS::Contrail::PortTuple
+    type: OS::ContrailV2::PortTuple
     depends_on: [ template_ServiceInstance2 ]
     properties:
       name: { get_attr: [ random_key_2, value ] }
       service_instance: { list_join: [':', { get_attr: [ template_ServiceInstance2, fq_name ] } ] }
 
   template_VirtualMachineInterface_1:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     properties:
       name: { get_attr: [ random_key_1, value ] }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_1, fq_name ] } ] }
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_1, fq_name ] } ] }]
   
   template_VirtualMachineInterface_2:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     depends_on: [ template_PortTuple1 ]
     properties:
       name: { get_attr: [ random_key_2, value ] }
@@ -470,11 +470,11 @@ resources:
         {
           virtual_machine_interface_properties_service_interface_type: { get_param: service_template_properties_interface_type_service_interface_type_2 },
         }
-      port_tuple_refs: { get_resource: template_PortTuple1 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }
+      port_tuple_refs: [{ get_resource: template_PortTuple1 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }]
 
   template_VirtualMachineInterface_3:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     depends_on: [ template_PortTuple1 ]
     properties:
       name: { get_attr: [ random_key_3, value ] }
@@ -482,11 +482,11 @@ resources:
         {
           virtual_machine_interface_properties_service_interface_type: { get_param: service_template_properties_interface_type_service_interface_type_3 },
         }
-      port_tuple_refs: { get_resource: template_PortTuple1 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }
+      port_tuple_refs: [{ get_resource: template_PortTuple1 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }]
 
   template_VirtualMachineInterface_4:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     depends_on: [ template_PortTuple2 ]
     properties:
       name: { get_attr: [ random_key_2, value ] }
@@ -494,11 +494,11 @@ resources:
         {
           virtual_machine_interface_properties_service_interface_type: { get_param: service_template_properties_interface_type_service_interface_type_2 },
         }
-      port_tuple_refs: { get_resource: template_PortTuple2 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_4, fq_name ] } ] }
+      port_tuple_refs: [{ get_resource: template_PortTuple2 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_4, fq_name ] } ] }]
 
   template_VirtualMachineInterface_5:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     depends_on: [ template_PortTuple2 ]
     properties:
       name: { get_attr: [ random_key_3, value ] }
@@ -506,80 +506,80 @@ resources:
         {
           virtual_machine_interface_properties_service_interface_type: { get_param: service_template_properties_interface_type_service_interface_type_3 },
         }
-      port_tuple_refs: { get_resource: template_PortTuple2 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_5, fq_name ] } ] }
+      port_tuple_refs: [{ get_resource: template_PortTuple2 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_5, fq_name ] } ] }]
 
   template_InstanceIp_1:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_1, template_VirtualNetwork_1 ]
     properties:
       name: { get_attr: [ random_key_1, value ] }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_1 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_1, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_1 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_1, fq_name ] } ] }]
 
   template_InstanceIp_2:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_2, template_VirtualNetwork_2 ]
     properties:
       name: { get_attr: [ random_key_2, value ] }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_2 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_2 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }]
 
   template_InstanceIp_3:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_3, template_VirtualNetwork_3 ]
     properties:
       name: { get_attr: [ random_key_3, value ] }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_3 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_3 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }]
 
   template_InstanceIp_4:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_4, template_VirtualNetwork_4 ]
     properties:
       name: { get_attr: [ random_key_4, value ] }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_4 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_4, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_4 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_4, fq_name ] } ] }]
 
   template_InstanceIp_5:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_5, template_VirtualNetwork_5 ]
     properties:
       name: { get_attr: [ random_key_5, value ] }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_5 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_5, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_5 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_5, fq_name ] } ] }]
 
   template_InstanceIp_6:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_6, template_VirtualNetwork_2 ]
     properties:
       name: { get_attr: [ random_key_2, value ] }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_6 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_6 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }]
 
   template_InstanceIp_7:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_7, template_VirtualNetwork_3 ]
     properties:
       name: { get_attr: [ random_key_3, value ] }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_7 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_7 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }]
 
   template_InstanceIp_8:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_8, template_VirtualNetwork_4 ]
     properties:
       name: { get_attr: [ random_key_4, value ] }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_8 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_4, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_8 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_4, fq_name ] } ] }]
 
   template_InstanceIp_9:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_9, template_VirtualNetwork_5 ]
     properties:
       name: { get_attr: [ random_key_5, value ] }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_9 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_5, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_9 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_5, fq_name ] } ] }]
 
   instance:
     type: OS::Nova::Server
@@ -596,28 +596,28 @@ resources:
         - port: { get_resource: template_VirtualMachineInterface_5 }
 
   template_VirtualMachineInterface_6:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     properties:
       name: { get_param: left_vm1_name }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }]
   
   template_VirtualMachineInterface_7:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     properties:
       name: { get_param: right_vm1_name }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }]
  
   template_VirtualMachineInterface_8:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     properties:
       name: { get_param: left_vm2_name }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_4, fq_name ] } ] }
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_4, fq_name ] } ] }]
   
   template_VirtualMachineInterface_9:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     properties:
       name: { get_param: right_vm2_name }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_5, fq_name ] } ] }
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_5, fq_name ] } ] }]
  
   template_leftVM1:
     type: OS::Nova::Server
@@ -660,7 +660,7 @@ resources:
         - port: { get_resource: template_VirtualMachineInterface_9 }
 
   template_NetworkPolicy1:
-    type: OS::Contrail::NetworkPolicy
+    type: OS::ContrailV2::NetworkPolicy
     properties:
       name: { get_param: policy1_name }
       network_policy_entries: { network_policy_entries_policy_rule: [{ 
@@ -689,7 +689,7 @@ resources:
 	}
 
   template_NetworkPolicy2:
-    type: OS::Contrail::NetworkPolicy
+    type: OS::ContrailV2::NetworkPolicy
     properties:
       name: { get_param: policy2_name }
       network_policy_entries: { network_policy_entries_policy_rule: [{ 
diff --git a/contrail_heat/new_templates/servers_with_sec_group.yaml b/contrail_heat/new_templates/servers_with_sec_group.yaml
index b456be4..eaf87aa 100644
--- a/contrail_heat/new_templates/servers_with_sec_group.yaml
+++ b/contrail_heat/new_templates/servers_with_sec_group.yaml
@@ -33,18 +33,18 @@ parameters:
 
 resources:
   template_NetworkIpam:
-    type: OS::Contrail::NetworkIpam
+    type: OS::ContrailV2::NetworkIpam
     properties:
       name: { get_param: private_net_name }
 
   template_VirtualNetwork:
-    type: OS::Contrail::VirtualNetwork
+    type: OS::ContrailV2::VirtualNetwork
     depends_on: [ template_NetworkIpam ]
     properties:
       name: { get_param: private_net_name }
-      network_ipam_refs: { get_resource: template_NetworkIpam }
+      network_ipam_refs: [{ get_resource: template_NetworkIpam }]
       network_ipam_refs_data:
-        {
+        [{
           network_ipam_refs_data_ipam_subnets:
             [{
               network_ipam_refs_data_ipam_subnets_subnet:
@@ -54,35 +54,35 @@ resources:
                 },
               network_ipam_refs_data_ipam_subnets_addr_from_start: { get_param: addr_from_start_true },
             }]
-         }
+         }]
 
   template_InstanceIp_1:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     properties:
       name: { get_param: port_name_1 }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_1 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_1 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }]
 
   template_VirtualMachineInterface_1:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     properties:
       name: { get_param: port_name_1 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }
-      security_group_refs: { list_join: [':', { get_attr: [ test_security_group, fq_name ] } ] }
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }]
+      security_group_refs: [{ list_join: [':', { get_attr: [ test_security_group, fq_name ] } ] }]
 
   template_InstanceIp_2:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     properties:
       name: { get_param: port_name_2 }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_2 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_2 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }]
 
   template_VirtualMachineInterface_2:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     properties:
       name: { get_param: port_name_2 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }
-      security_group_refs: { list_join: [':', { get_attr: [ test_security_group, fq_name ] } ] }
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork, fq_name ] } ] }]
+      security_group_refs: [{ list_join: [':', { get_attr: [ test_security_group, fq_name ] } ] }]
 
   server1:
     type: OS::Nova::Server
@@ -105,7 +105,7 @@ resources:
         - port: { get_resource: template_VirtualMachineInterface_2 }
 
   test_security_group:
-    type: OS::Contrail::SecurityGroup
+    type: OS::ContrailV2::SecurityGroup
     properties:
       name: test_security_group
       security_group_entries:
diff --git a/contrail_heat/new_templates/service_instance.yaml b/contrail_heat/new_templates/service_instance.yaml
index 0bab5be..f22a7d2 100644
--- a/contrail_heat/new_templates/service_instance.yaml
+++ b/contrail_heat/new_templates/service_instance.yaml
@@ -47,13 +47,13 @@ parameters:
 
 resources:
   template_PortTuple:
-    type: OS::Contrail::PortTuple
+    type: OS::ContrailV2::PortTuple
     properties:
       name: { get_param: port_tuple_name }
       service_instance: { get_param: service_instance_name }
 
   template_VirtualMachineInterface_1:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     depends_on: [ template_PortTuple ]
     properties:
       name: { get_param: virtual_network_1 }
@@ -61,11 +61,11 @@ resources:
         {
           virtual_machine_interface_properties_service_interface_type: { get_param: service_interface_type_1 },
         }
-      port_tuple_refs: { get_resource: template_PortTuple }
-      virtual_network_refs: { get_param: virtual_network_1_fqdn }
+      port_tuple_refs: [{ get_resource: template_PortTuple }]
+      virtual_network_refs: [{ get_param: virtual_network_1_fqdn }]
 
   template_VirtualMachineInterface_2:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     depends_on: [ template_PortTuple ]
     properties:
       name: { get_param: virtual_network_2 }
@@ -73,11 +73,11 @@ resources:
         {
           virtual_machine_interface_properties_service_interface_type: { get_param: service_interface_type_2 },
         }
-      port_tuple_refs: { get_resource: template_PortTuple }
-      virtual_network_refs: { get_param: virtual_network_2_fqdn }
+      port_tuple_refs: [{ get_resource: template_PortTuple }]
+      virtual_network_refs: [{ get_param: virtual_network_2_fqdn }]
 
   template_VirtualMachineInterface_3:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     depends_on: [ template_PortTuple ]
     properties:
       name: { get_param: virtual_network_3 }
@@ -85,32 +85,32 @@ resources:
         {
           virtual_machine_interface_properties_service_interface_type: { get_param: service_interface_type_3 },
         }
-      port_tuple_refs: { get_resource: template_PortTuple }
-      virtual_network_refs: { get_param: virtual_network_3_fqdn }
+      port_tuple_refs: [{ get_resource: template_PortTuple }]
+      virtual_network_refs: [{ get_param: virtual_network_3_fqdn }]
 
   template_InstanceIp_1:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_1 ]
     properties:
       name: { get_param: virtual_network_1 }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_1 }
-      virtual_network_refs: { get_param: virtual_network_1_fqdn }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_1 }]
+      virtual_network_refs: [{ get_param: virtual_network_1_fqdn }]
 
   template_InstanceIp_2:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_2 ]
     properties:
       name: { get_param: virtual_network_2 }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_2 }
-      virtual_network_refs: { get_param: virtual_network_2_fqdn }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_2 }]
+      virtual_network_refs: [{ get_param: virtual_network_2_fqdn }]
 
   template_InstanceIp_3:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_3 ]
     properties:
       name: { get_param: virtual_network_3 }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_3 }
-      virtual_network_refs: { get_param: virtual_network_3_fqdn }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_3 }]
+      virtual_network_refs: [{ get_param: virtual_network_3_fqdn }]
 
   instance:
     type: OS::Nova::Server
diff --git a/contrail_heat/new_templates/service_instance_scaling.yaml b/contrail_heat/new_templates/service_instance_scaling.yaml
index 4717d67..152c887 100644
--- a/contrail_heat/new_templates/service_instance_scaling.yaml
+++ b/contrail_heat/new_templates/service_instance_scaling.yaml
@@ -154,28 +154,28 @@ parameters:
 
 resources:
   template_NetworkIpam_1:
-    type: OS::Contrail::NetworkIpam
+    type: OS::ContrailV2::NetworkIpam
     properties:
       name: { get_param: management_network }
 
   template_NetworkIpam_2:
-    type: OS::Contrail::NetworkIpam
+    type: OS::ContrailV2::NetworkIpam
     properties:
       name: { get_param: left_network }
 
   template_NetworkIpam_3:
-    type: OS::Contrail::NetworkIpam
+    type: OS::ContrailV2::NetworkIpam
     properties:
       name: { get_param: right_network }
 
   template_VirtualNetwork_1:
-    type: OS::Contrail::VirtualNetwork
+    type: OS::ContrailV2::VirtualNetwork
     depends_on: [ template_NetworkIpam_1 ]
     properties:
       name: { get_param: management_network }
-      network_ipam_refs: { get_resource: template_NetworkIpam_1 }
+      network_ipam_refs: [{ get_resource: template_NetworkIpam_1 }]
       network_ipam_refs_data:
-        {
+        [{
           network_ipam_refs_data_ipam_subnets:
             [{
               network_ipam_refs_data_ipam_subnets_subnet:
@@ -184,16 +184,16 @@ resources:
                   network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len: { get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_1 },
                 },
             }]
-         }
+         }]
 
   template_VirtualNetwork_2:
-    type: OS::Contrail::VirtualNetwork
+    type: OS::ContrailV2::VirtualNetwork
     depends_on: [ template_NetworkIpam_2 ]
     properties:
       name: { get_param: left_network }
-      network_ipam_refs: { get_resource: template_NetworkIpam_2 }
+      network_ipam_refs: [{ get_resource: template_NetworkIpam_2 }]
       network_ipam_refs_data:
-        {
+        [{
           network_ipam_refs_data_ipam_subnets:
             [{
               network_ipam_refs_data_ipam_subnets_subnet:
@@ -202,16 +202,16 @@ resources:
                   network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len: { get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2 },
                 },
             }]
-         }
+         }]
 
   template_VirtualNetwork_3:
-    type: OS::Contrail::VirtualNetwork
+    type: OS::ContrailV2::VirtualNetwork
     depends_on: [ template_NetworkIpam_3 ]
     properties:
       name: { get_param: right_network }
-      network_ipam_refs: { get_resource: template_NetworkIpam_3 }
+      network_ipam_refs: [{ get_resource: template_NetworkIpam_3 }]
       network_ipam_refs_data:
-        {
+        [{
           network_ipam_refs_data_ipam_subnets:
             [{
               network_ipam_refs_data_ipam_subnets_subnet:
@@ -220,10 +220,10 @@ resources:
                   network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len: { get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_3 },
                 },
             }]
-         }
+         }]
 
   template_ServiceTemplate:
-    type: OS::Contrail::ServiceTemplate
+    type: OS::ContrailV2::ServiceTemplate
     properties:
       name: { get_param: service_template_name }
       service_template_properties:
@@ -259,7 +259,7 @@ resources:
       domain: { get_param: domain }
 
   template_ServiceInstance:
-    type: OS::Contrail::ServiceInstance
+    type: OS::ContrailV2::ServiceInstance
     depends_on: [ template_ServiceTemplate ]
     properties:
       name: { get_param: service_instance_name }
@@ -311,7 +311,7 @@ resources:
               }
             ],
         }
-      service_template_refs: { get_resource: template_ServiceTemplate }
+      service_template_refs: [{ get_resource: template_ServiceTemplate }]
 
   instance_group:
     type: OS::Heat::AutoScalingGroup
diff --git a/contrail_heat/new_templates/svc_port_tuple.yaml b/contrail_heat/new_templates/svc_port_tuple.yaml
index 4e900c6..21f04e9 100644
--- a/contrail_heat/new_templates/svc_port_tuple.yaml
+++ b/contrail_heat/new_templates/svc_port_tuple.yaml
@@ -180,28 +180,28 @@ parameters:
 
 resources:
   template_NetworkIpam_1:
-    type: OS::Contrail::NetworkIpam
+    type: OS::ContrailV2::NetworkIpam
     properties:
       name: { get_param: management_network }
 
   template_NetworkIpam_2:
-    type: OS::Contrail::NetworkIpam
+    type: OS::ContrailV2::NetworkIpam
     properties:
       name: { get_param: left_vn }
 
   template_NetworkIpam_3:
-    type: OS::Contrail::NetworkIpam
+    type: OS::ContrailV2::NetworkIpam
     properties:
       name: { get_param: right_vn }
 
   template_VirtualNetwork_1:
-    type: OS::Contrail::VirtualNetwork
+    type: OS::ContrailV2::VirtualNetwork
     depends_on: [ template_NetworkIpam_1 ]
     properties:
       name: { get_param: management_network }
-      network_ipam_refs: { get_resource: template_NetworkIpam_1 }
+      network_ipam_refs: [{ get_resource: template_NetworkIpam_1 }]
       network_ipam_refs_data:
-        {
+        [{
           network_ipam_refs_data_ipam_subnets:
             [{
               network_ipam_refs_data_ipam_subnets_subnet:
@@ -211,16 +211,16 @@ resources:
                 },
 	      network_ipam_refs_data_ipam_subnets_addr_from_start: { get_param: network_ipam_refs_data_ipam_subnets_addr_from_start_true },
             }]
-         }
+         }]
 
   template_VirtualNetwork_2:
-    type: OS::Contrail::VirtualNetwork
+    type: OS::ContrailV2::VirtualNetwork
     depends_on: [ template_NetworkIpam_2, template_NetworkPolicy ]
     properties:
       name: { get_param: left_vn }
-      network_ipam_refs: { get_resource: template_NetworkIpam_2 }
+      network_ipam_refs: [{ get_resource: template_NetworkIpam_2 }]
       network_ipam_refs_data:
-        {
+        [{
           network_ipam_refs_data_ipam_subnets:
             [{
               network_ipam_refs_data_ipam_subnets_subnet:
@@ -230,25 +230,25 @@ resources:
                 },
                network_ipam_refs_data_ipam_subnets_addr_from_start: { get_param: network_ipam_refs_data_ipam_subnets_addr_from_start_true },
  	     }]
-	 }
-      network_policy_refs: { get_param: policy_fq_name }
+	 }]
+      network_policy_refs: [{ get_param: policy_fq_name }]
       network_policy_refs_data:
-        {
+        [{
           network_policy_refs_data_sequence:
             {
               network_policy_refs_data_sequence_major: 0,
               network_policy_refs_data_sequence_minor: 0,
             },
-        }
+        }]
         
   template_VirtualNetwork_3:
-    type: OS::Contrail::VirtualNetwork
+    type: OS::ContrailV2::VirtualNetwork
     depends_on: [ template_NetworkIpam_3, template_NetworkPolicy ]
     properties:
       name: { get_param: right_vn }
-      network_ipam_refs: { get_resource: template_NetworkIpam_3 }
+      network_ipam_refs: [{ get_resource: template_NetworkIpam_3 }]
       network_ipam_refs_data:
-        {
+        [{
           network_ipam_refs_data_ipam_subnets:
             [{
               network_ipam_refs_data_ipam_subnets_subnet:
@@ -258,19 +258,19 @@ resources:
                 },
 	      network_ipam_refs_data_ipam_subnets_addr_from_start: { get_param: network_ipam_refs_data_ipam_subnets_addr_from_start_true },
             }]
-         }
-      network_policy_refs: { get_param: policy_fq_name }
+         }]
+      network_policy_refs: [{ get_param: policy_fq_name }]
       network_policy_refs_data:
-        {
+        [{
           network_policy_refs_data_sequence:
             {
               network_policy_refs_data_sequence_major: 0,
               network_policy_refs_data_sequence_minor: 0,
             },
-        }
+        }]
 
   template_ServiceTemplate:
-    type: OS::Contrail::ServiceTemplate
+    type: OS::ContrailV2::ServiceTemplate
     properties:
       name: { get_param: service_template_name }
       service_template_properties:
@@ -306,7 +306,7 @@ resources:
       domain: { get_param: domain }
 
   template_ServiceInstance:
-    type: OS::Contrail::ServiceInstance
+    type: OS::ContrailV2::ServiceInstance
     depends_on: [ template_ServiceTemplate ]
     properties:
       name: { get_param: service_instance_name }
@@ -358,17 +358,17 @@ resources:
               }
             ],
         }
-      service_template_refs: { get_resource: template_ServiceTemplate }
+      service_template_refs: [{ get_resource: template_ServiceTemplate }]
 
   template_PortTuple:
-    type: OS::Contrail::PortTuple
+    type: OS::ContrailV2::PortTuple
     depends_on: [ template_ServiceInstance ]
     properties:
       name: { get_attr: [ random_key_1, value ] }
       service_instance: { list_join: [':', { get_attr: [ template_ServiceInstance, fq_name ] } ] }
 
   template_VirtualMachineInterface_1:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     depends_on: [ template_PortTuple ]
     properties:
       name: { get_attr: [ random_key_1, value ] }
@@ -376,11 +376,11 @@ resources:
         {
           virtual_machine_interface_properties_service_interface_type: { get_param: service_template_properties_interface_type_service_interface_type_1 },
         }
-      port_tuple_refs: { get_resource: template_PortTuple }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_1, fq_name ] } ] }
+      port_tuple_refs: [{ get_resource: template_PortTuple }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_1, fq_name ] } ] }]
   
   template_VirtualMachineInterface_2:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     depends_on: [ template_PortTuple ]
     properties:
       name: { get_attr: [ random_key_2, value ] }
@@ -388,11 +388,11 @@ resources:
         {
           virtual_machine_interface_properties_service_interface_type: { get_param: service_template_properties_interface_type_service_interface_type_2 },
         }
-      port_tuple_refs: { get_resource: template_PortTuple }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }
+      port_tuple_refs: [{ get_resource: template_PortTuple }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }]
 
   template_VirtualMachineInterface_3:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     depends_on: [ template_PortTuple ]
     properties:
       name: { get_attr: [ random_key_3, value ] }
@@ -400,48 +400,48 @@ resources:
         {
           virtual_machine_interface_properties_service_interface_type: { get_param: service_template_properties_interface_type_service_interface_type_3 },
         }
-      port_tuple_refs: { get_resource: template_PortTuple }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }
+      port_tuple_refs: [{ get_resource: template_PortTuple }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }]
 
   template_InstanceIp_1:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_1, template_VirtualNetwork_1 ]
     properties:
       name: { get_attr: [ random_key_1, value ] }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_1 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_1, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_1 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_1, fq_name ] } ] }]
 
   template_InstanceIp_2:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_2, template_VirtualNetwork_2 ]
     properties:
       name: { get_attr: [ random_key_2, value ] }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_2 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_2 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }]
 
   template_InstanceIp_3:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_3, template_VirtualNetwork_3 ]
     properties:
       name: { get_attr: [ random_key_3, value ] }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_3 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_3 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }]
 
   template_InstanceIp_4:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_4, template_VirtualNetwork_2 ]
     properties:
       name: { get_attr: [ random_key_4, value ] }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_4 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_4 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }]
 
   template_InstanceIp_5:
-    type: OS::Contrail::InstanceIp
+    type: OS::ContrailV2::InstanceIp
     depends_on: [ template_VirtualMachineInterface_5, template_VirtualNetwork_3 ]
     properties:
       name: { get_attr: [ random_key_5, value ] }
-      virtual_machine_interface_refs: { get_resource: template_VirtualMachineInterface_5 }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }
+      virtual_machine_interface_refs: [{ get_resource: template_VirtualMachineInterface_5 }]
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }]
 
   instance:
     type: OS::Nova::Server
@@ -456,16 +456,16 @@ resources:
         - port: { get_resource: template_VirtualMachineInterface_3 }
 
   template_VirtualMachineInterface_4:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     properties:
       name: { get_param: left_vm_name }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_2, fq_name ] } ] }]
   
   template_VirtualMachineInterface_5:
-    type: OS::Contrail::VirtualMachineInterface
+    type: OS::ContrailV2::VirtualMachineInterface
     properties:
       name: { get_param: right_vm_name }
-      virtual_network_refs: { list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }
+      virtual_network_refs: [{ list_join: [':', { get_attr: [ template_VirtualNetwork_3, fq_name ] } ] }]
   
   template_leftVM:
     type: OS::Nova::Server
@@ -488,7 +488,7 @@ resources:
         - port: { get_resource: template_VirtualMachineInterface_5 }
 
   template_NetworkPolicy:
-    type: OS::Contrail::NetworkPolicy
+    type: OS::ContrailV2::NetworkPolicy
     properties:
       name: { get_param: policy_name }
       network_policy_entries: { network_policy_entries_policy_rule: [{ 
diff --git a/contrail_heat/new_templates/two-tier-web-v3.yaml b/contrail_heat/new_templates/two-tier-web-v3.yaml
index 7be0012..c487a88 100644
--- a/contrail_heat/new_templates/two-tier-web-v3.yaml
+++ b/contrail_heat/new_templates/two-tier-web-v3.yaml
@@ -36,18 +36,18 @@ parameters:
 
 resources:
    net1:
-      type: "OS::Contrail::VirtualNetwork"
+      type: "OS::ContrailV2::VirtualNetwork"
       properties:
          name: { get_param: vn_1_name } 
-         network_policy_refs: { get_resource: policy_web_db }
+         network_policy_refs: [{ get_resource: policy_web_db }]
          network_policy_refs_data:
-           {
+           [{
              network_policy_refs_data_sequence:
                {
                  network_policy_refs_data_sequence_major: 0,
                  network_policy_refs_data_sequence_minor: 0,
                },
-           }
+           }]
  
    net1-subnet1:
       type: "OS::Neutron::Subnet"
@@ -58,18 +58,18 @@ resources:
          network_id: { get_resource: net1 }
 
    net2:
-      type: "OS::Contrail::VirtualNetwork"
+      type: "OS::ContrailV2::VirtualNetwork"
       properties:
          name: { get_param: vn_2_name }
-         network_policy_refs: { get_resource: policy_web_db }
+         network_policy_refs: [{ get_resource: policy_web_db }]
          network_policy_refs_data:
-           {
+           [{
              network_policy_refs_data_sequence:
                {
                  network_policy_refs_data_sequence_major: 0,
                  network_policy_refs_data_sequence_minor: 0,
                },
-           }
+           }]
 
    net2-subnet1:
       type: "OS::Neutron::Subnet"
@@ -108,7 +108,7 @@ resources:
            - port: { get_resource: host2_port0 }
 
    policy_web_db:
-      type: OS::Contrail::NetworkPolicy
+      type: OS::ContrailV2::NetworkPolicy
       properties:
          name: { get_param: policy_name }
          network_policy_entries:
diff --git a/contrail_heat/new_templates/virtual_network_in_different_project.yaml b/contrail_heat/new_templates/virtual_network_in_different_project.yaml
index 9160b38..70b6e41 100644
--- a/contrail_heat/new_templates/virtual_network_in_different_project.yaml
+++ b/contrail_heat/new_templates/virtual_network_in_different_project.yaml
@@ -32,12 +32,12 @@ parameters:
 
 resources:
   template_NetworkIpam_1:
-    type: OS::Contrail::NetworkIpam
+    type: OS::ContrailV2::NetworkIpam
     properties:
       name: { get_param: private_net_1_name }
 
   template_VirtualNetwork_1:
-    type: OS::Contrail::VirtualNetwork
+    type: OS::ContrailV2::VirtualNetwork
     depends_on: [ template_NetworkIpam_1 ]
     properties:
       name: { get_param: private_net_1_name }
diff --git a/contrail_heat/new_templates/virtual_network_with_subnet.yaml b/contrail_heat/new_templates/virtual_network_with_subnet.yaml
index a144a0a..ca819a0 100644
--- a/contrail_heat/new_templates/virtual_network_with_subnet.yaml
+++ b/contrail_heat/new_templates/virtual_network_with_subnet.yaml
@@ -29,12 +29,12 @@ parameters:
 
 resources:
   template_NetworkIpam_1:
-    type: OS::Contrail::NetworkIpam
+    type: OS::ContrailV2::NetworkIpam
     properties:
       name: { get_param: private_net_1_name }
 
   template_VirtualNetwork_1:
-    type: OS::Contrail::VirtualNetwork
+    type: OS::ContrailV2::VirtualNetwork
     depends_on: [ template_NetworkIpam_1 ]
     properties:
       name: { get_param: private_net_1_name }
@@ -47,9 +47,9 @@ resources:
         {
           route_target_list_route_target: [{ get_param: route_target_1 }, { get_param: route_target_2 }],
         }
-      network_ipam_refs: { get_resource: template_NetworkIpam_1 }
+      network_ipam_refs: [{ get_resource: template_NetworkIpam_1 }]
       network_ipam_refs_data:
-        {
+        [{
           network_ipam_refs_data_ipam_subnets:
             [{
               network_ipam_refs_data_ipam_subnets_subnet:
@@ -58,5 +58,5 @@ resources:
                   network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len: { get_param: private_net_1_prefix_len },
                 },
             }]
-         }
+         }]
 
diff --git a/contrail_heat/new_templates/virtual_network_with_two_subnet.yaml b/contrail_heat/new_templates/virtual_network_with_two_subnet.yaml
index 6bd0914..f1424fa 100644
--- a/contrail_heat/new_templates/virtual_network_with_two_subnet.yaml
+++ b/contrail_heat/new_templates/virtual_network_with_two_subnet.yaml
@@ -35,12 +35,12 @@ parameters:
 
 resources:
   template_NetworkIpam_1:
-    type: OS::Contrail::NetworkIpam
+    type: OS::ContrailV2::NetworkIpam
     properties:
       name: { get_param: private_net_1_name }
 
   template_VirtualNetwork_1:
-    type: OS::Contrail::VirtualNetwork
+    type: OS::ContrailV2::VirtualNetwork
     depends_on: [ template_NetworkIpam_1 ]
     properties:
       name: { get_param: private_net_1_name }