diff --git a/etsi_nfv_sol001_common_types.yaml b/etsi_nfv_sol001_common_types.yaml
index 1bfd19596089cef5d0641eb8402161eeefeb450e..33864db257f0ff049e87ba533eba8c442e99715e 100644
--- a/etsi_nfv_sol001_common_types.yaml
+++ b/etsi_nfv_sol001_common_types.yaml
@@ -1,5 +1,9 @@
 tosca_definitions_version: tosca_simple_yaml_1_2
 description: ETSI NFV SOL 001 common types definitions version 2.6.1
+metadata:
+  template_name: etsi_nfv_sol001_common_types
+  template_author: ETSI_NFV
+  template_version: 2.6.1
 
 data_types:
   tosca.datatypes.nfv.L2AddressData:
diff --git a/etsi_nfv_sol001_nsd_types.yaml b/etsi_nfv_sol001_nsd_types.yaml
index fcfcef7601922a926cc59976760f74b5b27b9166..22047e44459aa254328bf3f8b54d710ee4616889 100644
--- a/etsi_nfv_sol001_nsd_types.yaml
+++ b/etsi_nfv_sol001_nsd_types.yaml
@@ -1,8 +1,12 @@
 tosca_definitions_version: tosca_simple_yaml_1_2
 description: ETSI NFV SOL 001 nsd types definitions version 2.6.1
+metadata:
+  template_name: etsi_nfv_sol001_nsd_types
+  template_author: ETSI_NFV
+  template_version: 2.6.1
 
 imports:
-  - etsi_nfv_sol001_common_types.yaml
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.6.1/etsi_nfv_sol001_common_types.yaml
 
 data_types:
   tosca.datatypes.nfv.ServiceAvailability:
diff --git a/etsi_nfv_sol001_pnfd_types.yaml b/etsi_nfv_sol001_pnfd_types.yaml
index 88908cf131fa6626cff8adaeba6a6df60092483d..6dff2e0a84d6c37955b13cdc6e73af5164b8dbc6 100644
--- a/etsi_nfv_sol001_pnfd_types.yaml
+++ b/etsi_nfv_sol001_pnfd_types.yaml
@@ -1,8 +1,12 @@
 tosca_definitions_version: tosca_simple_yaml_1_2
 description: ETSI NFV SOL 001 pnfd types definitions version 2.6.1
+metadata:
+  template_name: etsi_nfv_sol001_pnfd_types
+  template_author: ETSI_NFV
+  template_version: 2.6.1
 
 imports:
-  - etsi_nfv_sol001_common_types.yaml
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.6.1/etsi_nfv_sol001_common_types.yaml
 
 data_types:     
   tosca.datatypes.nfv.LocationInfo:
diff --git a/etsi_nfv_sol001_vnfd_types.yaml b/etsi_nfv_sol001_vnfd_types.yaml
index 8d7e56cceb42dd665002f180d5c10978faf779eb..ffdd3770c29ead0cecd61129ac6c5f9165c18c7b 100644
--- a/etsi_nfv_sol001_vnfd_types.yaml
+++ b/etsi_nfv_sol001_vnfd_types.yaml
@@ -1,7 +1,12 @@
 tosca_definitions_version: tosca_simple_yaml_1_2
 description: ETSI NFV SOL 001 vnfd types definitions version 2.6.1
+metadata:
+  template_name: etsi_nfv_sol001_vnfd_types
+  template_author: ETSI_NFV
+  template_version: 2.6.1
+
 imports:
-  - etsi_nfv_sol001_common_types.yaml
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.6.1/etsi_nfv_sol001_common_types.yaml
 
 data_types:
   tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements: