diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
similarity index 97%
rename from SOL005/NSLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
rename to SOL005/NSLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
index d9a374060f15a1857724ff859a0e25be8389f4f9..797d8bec31aa7ffd1b7f267e692012b4626e4b69 100644
--- a/SOL005/NSLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
@@ -88,14 +88,14 @@ topology_template:
             root: 10000
             leaf: 10000
     internal_vdu_b_1_cp:
-      type: tosca.nodes.nfv.VduCp
+      type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 2
       requirements:
         - virtual_binding: VDU-B-1
         - virtual_link: internal_vl
     internal_vdu_b_2_cp:
-      type: tosca.nodes.nfv.VduCp
+      type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 0
       requirements:
@@ -120,7 +120,7 @@ topology_template:
           size: '1'
       artifacts:
         sw_image:
-          type: tosca.artifacts.nfv.SwImage
+          type: "tosca.artifacts.nfv.SwImage"
           file: vdu-b-1.qcow2
     vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
deleted file mode 100644
index 4b84be92b170b0f908ffb2776f5cf1ba82675d40..0000000000000000000000000000000000000000
--- a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-nfv:
-  vnfd:
-    - id: VNF-B-2df
-      provider: ETSI TST WG
-      product-name: TST010 reference VNF-B with 2 DFs
-      software-version: '2.1'
-      version: '2.1'
-      vnfm-info: ETSI VNFM
-      vdu:
-        id: vdu-b-1
-        name: VNF-B VDU 1
-        int-cpd:
-          - id: left
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: right
-            layer-protocol: ethernet
-        virtual-compute-desc: vdu-b-1-vcd
-        virtual-storage-desc: vdu-b-1-vsd
-        sw-image-desc: vdu-b-1-image
-      virtual-compute-desc:
-        id: vdu-b-1-vcd
-        virtual-memory:
-          size: '4.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
-        id: vdu-b-1-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
-        id: vdu-b-1-image
-        name: VNF-B image
-        version: '1.1'
-        checksum:
-          algorithm: sha-224
-          hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
-        size: '1'
-        image: 'http://someurl.com/VNF-B.qcow2'
-      ext-cpd:
-        - id: ext-b-left
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: left
-          layer-protocol: ethernet
-        - id: management
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: management
-          layer-protocol: ethernet
-        - id: ext-b-right
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: right
-          layer-protocol: ethernet
-      df:
-        - id: small
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '2'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: single
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '1'
-          default-instantiation-level: single
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
-        - id: big
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '4'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: triple
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '3'
-          default-instantiation-level: double
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
diff --git a/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d033e5a2efae992aa21024892c5ef676f3d442a0
--- /dev/null
+++ b/SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
@@ -0,0 +1,138 @@
+nfv:
+  vnfd:
+    - id: VNF-B-2vdu
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 VDUs
+      software-version: '2.2'
+      version: '2.2'
+      vnfm-info: ETSI VNFM
+      vdu:
+        id: vdu-b-1
+        name: VNF-B VDU 1
+        int-cpd:
+          - id: left
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: internal
+            layer-protocol: ethernet
+            int-virtual-link-desc: internal-vl
+        virtual-compute-desc: vdu-b-1-vcd
+        virtual-storage-desc: vdu-b-1-vsd
+        sw-image-desc: vdu-b-1-image
+      vdu:
+        id: vdu-b-2
+        name: VNF-B VDU 2
+        int-cpd:
+          - id: right
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: internal
+            layer-protocol: ethernet
+            int-virtual-link-desc: internal-vl
+        virtual-compute-desc: vdu-b-2-vcd
+        virtual-storage-desc: vdu-b-2-vsd
+        sw-image-desc: vdu-b-2-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      virtual-compute-desc:
+        id: vdu-b-2-vcd
+        virtual-memory:
+          size: '6.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-2-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-2-image
+        name: VNF-B-2 image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B-2.qcow2'
+      int-virtual-link-desc:
+        - id: internal-vl
+          flavour:
+            id: internal-vl-flavour
+            qos:
+              latency: '1'
+              packet-delay-variation: '1'
+              packet-loss-ratio: '0.05'
+          connectivity-type:
+            layer-protocol: ethernet     
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-2
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        id: normal
+        vdu-profile:
+          - id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          - id: vdu-b-2
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'          
+        instantiation-level:
+          - id: double
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '2'
+              - vdu-id: vdu-b-2
+                number-of-instances: '2'
+          - id: single
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '1'
+              - vdu-id: vdu-b-2
+                number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml b/SOL005/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
similarity index 96%
rename from SOL005/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
rename to SOL005/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
index 1712e2b33317c38a21aecfaacf75bdecddb5ba7d..797d8bec31aa7ffd1b7f267e692012b4626e4b69 100644
--- a/SOL005/VNFPackageManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml
+++ b/SOL005/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml
@@ -75,7 +75,7 @@ topology_template:
         virtual_link_left:
         virtual_binding: VDU-B-1
     internal_vl:
-      type: tosca.nodes.nfv.VnfVirtualLink
+      type: "tosca.nodes.nfv.VnfVirtualLink"
       properties:
         connectivity_type:
           layer_protocols: [ ipv4 ]
@@ -88,14 +88,14 @@ topology_template:
             root: 10000
             leaf: 10000
     internal_vdu_b_1_cp:
-      type: tosca.nodes.nfv.VduCp
+      type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 2
       requirements:
         - virtual_binding: VDU-B-1
         - virtual_link: internal_vl
     internal_vdu_b_2_cp:
-      type: tosca.nodes.nfv.VduCp
+      type: "tosca.nodes.nfv.VduCp"
       properties:
         order: 0
       requirements:
@@ -120,7 +120,7 @@ topology_template:
           size: '1'
       artifacts:
         sw_image:
-          type: tosca.artifacts.nfv.SwImage
+          type: "tosca.artifacts.nfv.SwImage"
           file: vdu-b-1.qcow2
     vdu-b-1-vsd:
       type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
diff --git a/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml b/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
deleted file mode 100644
index 4b84be92b170b0f908ffb2776f5cf1ba82675d40..0000000000000000000000000000000000000000
--- a/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-nfv:
-  vnfd:
-    - id: VNF-B-2df
-      provider: ETSI TST WG
-      product-name: TST010 reference VNF-B with 2 DFs
-      software-version: '2.1'
-      version: '2.1'
-      vnfm-info: ETSI VNFM
-      vdu:
-        id: vdu-b-1
-        name: VNF-B VDU 1
-        int-cpd:
-          - id: left
-            layer-protocol: ethernet
-          - id: management
-            layer-protocol: ethernet
-          - id: right
-            layer-protocol: ethernet
-        virtual-compute-desc: vdu-b-1-vcd
-        virtual-storage-desc: vdu-b-1-vsd
-        sw-image-desc: vdu-b-1-image
-      virtual-compute-desc:
-        id: vdu-b-1-vcd
-        virtual-memory:
-          size: '4.0'
-        virtual-cpu:
-          num-virtual-cpu: '2'
-      virtual-storage-desc:
-        id: vdu-b-1-vsd
-        type-of-storage: root-storage
-        size-of-storage: '0'
-      sw-image-desc:
-        id: vdu-b-1-image
-        name: VNF-B image
-        version: '1.1'
-        checksum:
-          algorithm: sha-224
-          hash: somehashfortst010
-        container-format: bare
-        disk-format: qcow2
-        min-disk: '1'
-        min-ram: '2.0'
-        size: '1'
-        image: 'http://someurl.com/VNF-B.qcow2'
-      ext-cpd:
-        - id: ext-b-left
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: left
-          layer-protocol: ethernet
-        - id: management
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: management
-          layer-protocol: ethernet
-        - id: ext-b-right
-          int-cpd:
-            vdu-id: vdu-b-1
-            cpd: right
-          layer-protocol: ethernet
-      df:
-        - id: small
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '2'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: single
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '1'
-          default-instantiation-level: single
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
-        - id: big
-          vdu-profile:
-            id: vdu-b-1
-            min-number-of-instances: '1'
-            max-number-of-instances: '4'
-          instantiation-level:
-            - id: double
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '2'
-            - id: triple
-              vdu-level:
-                vdu-id: vdu-b-1
-                number-of-instances: '3'
-          default-instantiation-level: double
-          lcm-operations-configuration:
-            scale-vnf-to-level-op-config:
-              arbitrary-target-levels-supported: 'true'
-            terminate-vnf-op-config:
-              min-graceful-termination: '1'
-            operate-vnf-op-config:
-              min-graceful-stop-timeout: '1'
diff --git a/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml b/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d033e5a2efae992aa21024892c5ef676f3d442a0
--- /dev/null
+++ b/SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml
@@ -0,0 +1,138 @@
+nfv:
+  vnfd:
+    - id: VNF-B-2vdu
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 VDUs
+      software-version: '2.2'
+      version: '2.2'
+      vnfm-info: ETSI VNFM
+      vdu:
+        id: vdu-b-1
+        name: VNF-B VDU 1
+        int-cpd:
+          - id: left
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: internal
+            layer-protocol: ethernet
+            int-virtual-link-desc: internal-vl
+        virtual-compute-desc: vdu-b-1-vcd
+        virtual-storage-desc: vdu-b-1-vsd
+        sw-image-desc: vdu-b-1-image
+      vdu:
+        id: vdu-b-2
+        name: VNF-B VDU 2
+        int-cpd:
+          - id: right
+            layer-protocol: ethernet
+          - id: management
+            layer-protocol: ethernet
+          - id: internal
+            layer-protocol: ethernet
+            int-virtual-link-desc: internal-vl
+        virtual-compute-desc: vdu-b-2-vcd
+        virtual-storage-desc: vdu-b-2-vsd
+        sw-image-desc: vdu-b-2-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      virtual-compute-desc:
+        id: vdu-b-2-vcd
+        virtual-memory:
+          size: '6.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-2-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-2-image
+        name: VNF-B-2 image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B-2.qcow2'
+      int-virtual-link-desc:
+        - id: internal-vl
+          flavour:
+            id: internal-vl-flavour
+            qos:
+              latency: '1'
+              packet-delay-variation: '1'
+              packet-loss-ratio: '0.05'
+          connectivity-type:
+            layer-protocol: ethernet     
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-2
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        id: normal
+        vdu-profile:
+          - id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          - id: vdu-b-2
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'          
+        instantiation-level:
+          - id: double
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '2'
+              - vdu-id: vdu-b-2
+                number-of-instances: '2'
+          - id: single
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '1'
+              - vdu-id: vdu-b-2
+                number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
\ No newline at end of file