diff --git a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml
index 2825e2fe8a0254694eeaa4f7fc700777db540c22..ec968cd67fd3dfb495270f6022385f3dba01c46a 100644
--- a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml
+++ b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml
@@ -5,21 +5,10 @@ info:
   title: SOL005 - NSD Management Notification interface
   description: >
     SOL005 - NSD Management Notification interface
-
-
     IMPORTANT: Please note that this file might be not aligned to the current
     version of the ETSI Group Specification it refers to. In case of
     discrepancies the published ETSI Group Specification takes precedence.
-
-
-    In clause 4.3.2 of ETSI GS NFV-SOL 002 v2.4.1, an attribute-based
-    filtering mechanism is defined. This mechanism is currently not
-    included in the corresponding OpenAPI design for this GS version. Changes
-    to the attribute-based filtering mechanism are being considered in v2.5.1
-    of this GS for inclusion in the corresponding future ETSI NFV OpenAPI
-    design.
-
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=
+    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
   license:
     name: "ETSI Forge copyright notice"
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
diff --git a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml
index 1ed4cd04f78e3bfd3b3538db3687852a127bfa69..a1c54956971db7b3c7d96b9eb8037ffd02fb4845 100644
--- a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml
+++ b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml
@@ -5,21 +5,10 @@ info:
   title: "SOL005 - NS Fault Management Notification interface"
   description: >
     SOL005 - NS Fault Management Notification interface
-
-
     IMPORTANT: Please note that this file might be not aligned to the current
     version of the ETSI Group Specification it refers to. In case of
     discrepancies the published ETSI Group Specification takes precedence.
-
-
-    In clause 4.3.2 of ETSI GS NFV-SOL 002 v2.4.1, an attribute-based
-    filtering mechanism is defined. This mechanism is currently not
-    included in the corresponding OpenAPI design for this GS version. Changes
-    to the attribute-based filtering mechanism are being considered in v2.5.1
-    of this GS for inclusion in the corresponding future ETSI NFV OpenAPI
-    design.
-
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=
+    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
   license:
     name: "ETSI Forge copyright notice"
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
diff --git a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
index 663d408807f8c908ab6c0722a1b3060006d56f77..036a27ecf11ad19110d77250d6b623f775ae538d 100644
--- a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
+++ b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
@@ -5,21 +5,10 @@ info:
   title: "SOL005 - NS Lifecycle Management Notification interface"
   description: >
     SOL005 - NS Lifecycle Management Notification interface
-
-
     IMPORTANT: Please note that this file might be not aligned to the current
     version of the ETSI Group Specification it refers to. In case of
     discrepancies the published ETSI Group Specification takes precedence.
-
-
-    In clause 4.3.2 of ETSI GS NFV-SOL 002 v2.4.1, an attribute-based
-    filtering mechanism is defined. This mechanism is currently not
-    included in the corresponding OpenAPI design for this GS version. Changes
-    to the attribute-based filtering mechanism are being considered in v2.5.1
-    of this GS for inclusion in the corresponding future ETSI NFV OpenAPI
-    design.
-
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=
+    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
   license:
     name: "ETSI Forge copyright notice"
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
diff --git a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml
index 02d1d581ff7baeccaba2aff4b7ddddef02f7779a..0cb0476b6810a42415ea7720500cac54168d6f15 100644
--- a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml
+++ b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml
@@ -5,21 +5,10 @@ info:
   title: "SOL005 - NS Performance Management Notification interface"
   description: >
     SOL005 - NS Performance Management Notification interface
-
-
     IMPORTANT: Please note that this file might be not aligned to the current
     version of the ETSI Group Specification it refers to. In case of
     discrepancies the published ETSI Group Specification takes precedence.
-
-
-    In clause 4.3.2 of ETSI GS NFV-SOL 002 v2.4.1, an attribute-based
-    filtering mechanism is defined. This mechanism is currently not
-    included in the corresponding OpenAPI design for this GS version. Changes
-    to the attribute-based filtering mechanism are being considered in v2.5.1
-    of this GS for inclusion in the corresponding future ETSI NFV OpenAPI
-    design.
-
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=
+    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
   license:
     name: "ETSI Forge copyright notice"
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
diff --git a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
index d4cb991e172c6f465c926379e998fc79de3948f4..84dcca6067b8adfe3d3ee9abc1865b36c5ecdebd 100644
--- a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
+++ b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
@@ -16,8 +16,9 @@ info:
   contact:
     name: "NFV-SOL WG"
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V2.4.1
-  url: http://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.04.01_60/gs_NFV-SOL005v020401p.pdf
+  description: ETSI GS NFV-SOL 005 V2.5.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.05.01_60/gs_NFV-SOL005v020501p.pdf
+
 basePath: /vnfpkgm/v1
 schemes:
   - https
diff --git a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
index 01d4d686b2ba320d2b9ef0206b8a331fae69b225..c53a7f4e97e74b3ca8c031d65edced2eae75b0d0 100644
--- a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
+++ b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
@@ -4,21 +4,10 @@ info:
   title: "SOL005 - VNF Package Management Notification interface"
   description: >
     SOL005 - VNF Package Management Notification interface
-
-
     IMPORTANT: Please note that this file might be not aligned to the current
     version of the ETSI Group Specification it refers to. In case of
     discrepancies the published ETSI Group Specification takes precedence.
-
-
-    In clause 4.3.2 of ETSI GS NFV-SOL 002 v2.4.1, an attribute-based
-    filtering mechanism is defined. This mechanism is currently not
-    included in the corresponding OpenAPI design for this GS version. Changes
-    to the attribute-based filtering mechanism are being considered in v2.5.1
-    of this GS for inclusion in the corresponding future ETSI NFV OpenAPI
-    design.
-
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=
+    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
   license:
     name: "ETSI Forge copyright notice"
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt