diff --git a/src/SOL005/APIVersion/APIVersion.yaml b/src/SOL005/APIVersion/APIVersion.yaml
index 6cdc238386f357aad9c63188efb13d4c1fd8e69a..edff856fac3e69f4851e0b7746fff04edcb65e99 100644
--- a/src/SOL005/APIVersion/APIVersion.yaml
+++ b/src/SOL005/APIVersion/APIVersion.yaml
@@ -6,7 +6,7 @@ info:
     SOL005 - API version Interface IMPORTANT: Please note that this file might be not aligned to the current version of
     the ETSI Group Specification it refers to and has not been approved by the ETSI NFV ISG. In case of discrepancies the
     published ETSI Group Specification takes precedence.
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
+    Please report bugs to Please report bugs to https://forge.etsi.org/rep/nfv/SOL005/issues
   contact:
     name: NFV-SOL WG
   license:
@@ -16,7 +16,7 @@ info:
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.3.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.07.01_60/gs_NFV-SOL005v020701p.pdf
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL005ed331_Os-Ma-nfvo_APIs_-_spec/NFV-SOL005ed331v304.zip
 
 servers:
   - url: http://127.0.0.1/
diff --git a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml
index cab9636eef597284bb901684de288b3e38e55c03..fdb4a3c3d7a1955813e68f5f1ff5de90b0313260 100644
--- a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml
+++ b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml
@@ -7,7 +7,7 @@ info:
     IMPORTANT: Please note that this file might be not aligned to the current version of the ETSI Group Specification it
     refers to and has not been approved by the ETSI NFV ISG. In case of discrepancies the published ETSI Group Specification
     takes precedence.
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
+    Please report bugs to https://forge.etsi.org/rep/nfv/SOL005/issues
   contact:
     name: NFV-SOL WG
   license:
@@ -17,7 +17,7 @@ info:
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.3.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.07.01_60/gs_NFV-SOL005v020701p.pdf
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL005ed331_Os-Ma-nfvo_APIs_-_spec/NFV-SOL005ed331v304.zip
 
 servers:
   - url: http://127.0.0.1/nfvici/v1
diff --git a/src/SOL005/NSDManagement/NSDManagement.yaml b/src/SOL005/NSDManagement/NSDManagement.yaml
index 10bde42bea853eb9cfeead7cd1c07115698d91f8..970798a03eb8fed2a7e7f8e3cbc455838a845000 100644
--- a/src/SOL005/NSDManagement/NSDManagement.yaml
+++ b/src/SOL005/NSDManagement/NSDManagement.yaml
@@ -9,7 +9,7 @@ info:
     version of the ETSI Group Specification it refers to and has not been
     approved by the ETSI NFV ISG. In case of discrepancies the published ETSI
     Group Specification takes precedence.
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
+    Please report bugs to https://forge.etsi.org/rep/nfv/SOL005/issues
   contact:
     name: NFV-SOL WG
   license:
@@ -19,7 +19,7 @@ info:
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.3.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.06.01_60/gs_NFV-SOL005v020701p.pdf
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL005ed331_Os-Ma-nfvo_APIs_-_spec/NFV-SOL005ed331v304.zip
 
 servers:
   - url: http://127.0.0.1/nsd/v2
diff --git a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml
index 42f7f9d709a9f666dac941f6a882502c124b0a9c..055ee080e8e74cc91d66832390e3c973347fa8a5 100644
--- a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml
+++ b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml
@@ -8,7 +8,7 @@ info:
     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.
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
+    Please report bugs to https://forge.etsi.org/rep/nfv/SOL005/issues
   contact:
     name: NFV-SOL WG
   license:
@@ -18,7 +18,7 @@ info:
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.3.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.06.01_60/gs_NFV-SOL005v020701p.pdf
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL005ed331_Os-Ma-nfvo_APIs_-_spec/NFV-SOL005ed331v304.zip
 
 servers:
   - url: http://127.0.0.1/callback/v2
diff --git a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml
index 5e09bc8999e25b7478c19cc6753bb6209c7de11c..090f8d4b3af65b86e494db35b306d5ebbb2b6050 100644
--- a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml
+++ b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml
@@ -7,7 +7,7 @@ info:
     IMPORTANT: Please note that this file might be not aligned to the current version of the ETSI Group Specification
     it refers to and has not been approved by the ETSI NFV ISG. In case of discrepancies the published ETSI Group
     Specification takes precedence.
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
+    Please report bugs to https://forge.etsi.org/rep/nfv/SOL005/issues
   contact:
     name: NFV-SOL WG
   license:
@@ -17,7 +17,7 @@ info:
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.3.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.06.01_60/gs_NFV-SOL005v020701p.pdf
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL005ed331_Os-Ma-nfvo_APIs_-_spec/NFV-SOL005ed331v304.zip
 
 servers:
   - url: http://127.0.0.1/nsfm/v1
diff --git a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml
index 5117052f2f0a7213727f1b8d9229286fb595b6d5..c05ae792be0964e3f099e38be6e35b48dc0df4d3 100644
--- a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml
+++ b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml
@@ -5,7 +5,7 @@ info:
     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.
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
+    Please report bugs to https://forge.etsi.org/rep/nfv/SOL005/issues
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
@@ -13,7 +13,7 @@ info:
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.3.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.06.01_60/gs_NFV-SOL005v020701p.pdf
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL005ed331_Os-Ma-nfvo_APIs_-_spec/NFV-SOL005ed331v304.zip
 
 servers:
   - url: http://127.0.0.1/callback/v1
diff --git a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
index 6d52d09c516aa3cf63d5d83223d2c658432003c9..b475d6abb86d53cf1a20e3ec0675ca26f157f47f 100644
--- a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
+++ b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
@@ -7,7 +7,7 @@ info:
     IMPORTANT: Please note that this file might be not aligned to the current version of the ETSI Group Specification it
     refers to and has not been approved by the ETSI NFV ISG. In case of discrepancies the published ETSI Group Specification
     takes precedence.
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
+    Please report bugs to https://forge.etsi.org/rep/nfv/SOL005/issues
   contact:
     name: NFV-SOL WG
   license:
@@ -17,7 +17,7 @@ info:
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.3.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.07.01_60/gs_NFV-SOL005v020701p.pdf
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL005ed331_Os-Ma-nfvo_APIs_-_spec/NFV-SOL005ed331v304.zip
 
 servers:
   - url: http://127.0.0.1/nslcm/v1
diff --git a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
index 41aecb0906e224f801ea0be720bbe72cdfd43a17..7be20b86c9411f6eefa3341d18ef96d76a94ca33 100644
--- a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
+++ b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
@@ -6,7 +6,7 @@ info:
     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.
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
+    Please report bugs to https://forge.etsi.org/rep/nfv/SOL005/issues
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
@@ -14,7 +14,7 @@ info:
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.3.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.07.01_60/gs_NFV-SOL005v020701p.pdf
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL005ed331_Os-Ma-nfvo_APIs_-_spec/NFV-SOL005ed331v304.zip
 
 servers:
   - url: http://127.0.0.1/callback/v1
diff --git a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml
index 0d1e66ed90feeb8cf91cd103adff60384e3f5191..dcd931cfff393b2010d83fd820ab22fc49b129e8 100644
--- a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml
+++ b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml
@@ -9,7 +9,7 @@ info:
     version of the ETSI Group Specification it refers to and has not been
     approved by the ETSI NFV ISG. In case of discrepancies the published ETSI
     Group Specification takes precedence.
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
+    Please report bugs to https://forge.etsi.org/rep/nfv/SOL005/issues
   contact:
     name: NFV-SOL WG
   license:
@@ -19,7 +19,7 @@ info:
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.3.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.06.01_60/gs_NFV-SOL005v020701p.pdf
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL005ed331_Os-Ma-nfvo_APIs_-_spec/NFV-SOL005ed331v304.zip
 
 servers:
   - url: http://127.0.0.1/nspm/v2
diff --git a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml
index 16bc3af733df22d61037b8a8f565633eaed27557..5052c0230a5d6061694f9824fe732a52ccac68cd 100644
--- a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml
+++ b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml
@@ -8,7 +8,7 @@ info:
     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.
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
+    Please report bugs to https://forge.etsi.org/rep/nfv/SOL005/issues
   contact:
     name: NFV-SOL WG
   license:
@@ -18,7 +18,7 @@ info:
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.3.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.06.01_60/gs_NFV-SOL005v020701p.pdf
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL005ed331_Os-Ma-nfvo_APIs_-_spec/NFV-SOL005ed331v304.zip
 
 servers:
   - url: http://127.0.0.1/callback/v2
diff --git a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
index 0d25066e10cbaec23078c9f030c2cb0dfaa0e3f2..4e2ce279d0f0e86c96553720b4b2df69387b320d 100644
--- a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
+++ b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
@@ -6,7 +6,7 @@ info:
     SOL005 - VNF Package Management Interface
     IMPORTANT: Please note that this file might be not aligned to the current version of the ETSI Group Specification it
     refers to and has not been approved by the ETSI NFV ISG. In case of discrepancies the published ETSI Group Specification
-    takes precedence. Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
+    takes precedence. Please report bugs to https://forge.etsi.org/rep/nfv/SOL005/issues
   contact:
     name: NFV-SOL WG
   license:
@@ -15,8 +15,8 @@ info:
   version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V2.7.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.07.01_60/gs_NFV-SOL005v020701p.pdf
+  description: ETSI GS NFV-SOL 005 V3.3.1
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL005ed331_Os-Ma-nfvo_APIs_-_spec/NFV-SOL005ed331v304.zip
 
 servers:
   - url: http://127.0.0.1/vnfpkgm/v2
diff --git a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
index 4efd459935e8b3e976f1f3688344827eeae99e0b..e63efc8e043f0344b749931a98ce96521753907b 100644
--- a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
+++ b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
@@ -6,7 +6,7 @@ info:
     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.
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
+    Please report bugs to https://forge.etsi.org/rep/nfv/SOL005/issues
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
@@ -14,7 +14,7 @@ info:
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.3.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.07.01_60/gs_NFV-SOL005v020701p.pdf
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL005ed331_Os-Ma-nfvo_APIs_-_spec/NFV-SOL005ed331v304.zip
 
 servers:
   - url: http://127.0.0.1/callback/v1
diff --git a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml
index 2c6c6b36d28a5d17f09522989371908677f0e473..49219b18b86f23dcaf2d3a7b95f923d600f59e56 100644
--- a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml
+++ b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml
@@ -8,7 +8,7 @@ info:
     IMPORTANT: Please note that this file might be not aligned to the current
     version of the ETSI Group Specification it refers to and has not been approved by the ETSI NFV ISG.
     In case of discrepancies the published ETSI Group Specification takes precedence.
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
+    Please report bugs to https://forge.etsi.org/rep/nfv/SOL005/issues
   contact:
     name: NFV-SOL WG
   license:
@@ -18,7 +18,7 @@ info:
 
 externalDocs:
   description: ETSI GS NFV-SOL 005 V3.3.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.06.01_60/gs_NFV-SOL005v020701p.pdf
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL005ed331_Os-Ma-nfvo_APIs_-_spec/NFV-SOL005ed331v304.zip
 
 servers:
   - url: http://127.0.0.1/vnfsnapshotpkgm/v1