diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.yml b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.yml
index 7eca3a8..e0c4206 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.yml
@@ -13,8 +13,7 @@
         type: string 
       nf_naming:
         type: org.openecomp.datatypes.Naming
-        Default: true
-      availability_zone_max_count: 
+      availability_zone_max_count:
         type: integer     
         default: 1 
         constraints:
@@ -26,7 +25,6 @@
       multi_stage_design:
         type: boolean
         default: false
-        type: string
       sdnc_model_name:
         type: string
       sdnc_model_version:
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml
index ba8ee3c..472db54 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml
@@ -113,7 +113,7 @@
         status: supported
       attachments:
         description: The list of attachments of the volume
-        type: string
+        type: list
         status: supported
         entry_schema:
           type: string
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.yml
index 51a8ce5..12f9372 100644
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.yml
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.yml
@@ -90,7 +90,7 @@
         type: boolean
         description: Identifies whether all the local networks associate with the tunnel or not.
         required: false
-        default: 'false'
+        default: false
       site2_id:
         type: string
         description: Identifier of second DCI overlay tunnel endpoint. This could be IP address of domain controller.
@@ -132,7 +132,7 @@
         type: boolean
         description: Identifies whether all the local networks associate with the tunnel or not.
         required: false
-        default: 'false'
+        default: false
     requirements:
     - virtualLink:
         capability: tosca.capabilities.network.Linkable
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml
index a7fc263..b2fff70 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp-heat/nodes.yml
@@ -1248,7 +1248,7 @@
         status: supported
       attachments:
         description: The list of attachments of the volume
-        type: string
+        type: list
         status: supported
         entry_schema:
           type: string
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml
index 9219a5d..6ac610a 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml
@@ -1185,7 +1185,7 @@
         status: supported
       attachments:
         description: The list of attachments of the volume
-        type: string
+        type: list
         status: supported
         entry_schema:
           type: string
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml
index 74e308b..f1a3827 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml
@@ -1225,7 +1225,7 @@
         description: Description of the volume
         status: supported
       attachments:
-        type: string
+        type: list
         description: The list of attachments of the volume
         status: supported
         entry_schema: