diff --git a/src/SOL002/APIVersion/APIVersion.yaml b/src/SOL002/APIVersion/APIVersion.yaml
index a792d68ac5c4a00975913aaa26db3337f3b88ce0..898ca089905b7d025366d19e36dc385f6dc4801f 100644
--- a/src/SOL002/APIVersion/APIVersion.yaml
+++ b/src/SOL002/APIVersion/APIVersion.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 Final Draft V5.2.3
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
 
 paths:
   /vnfconfig/api_versions:
diff --git a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml
index 9d1c851b199a077a9284cc24b62fc179682264db..b1c8fc1a8eb51d10f4690a13da0c8b236eaa88a4 100644
--- a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml
+++ b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 Final Draft V5.2.3
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
 
 servers:
   - url: http://127.0.0.1/vnfconfig/v1
diff --git a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
index 6c5037c292409fd2a1c15e5b82557b89f3c451cb..d781735a49ef5585a7cbc168e124fbb730d2316f 100644
--- a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
+++ b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 Final Draft V5.2.3
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
 
 servers:
   - url: http://127.0.0.1/vnffm/v1
diff --git a/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
index 4909cb90e5fa5c61a724a00a9cf935c358fd350e..2231942999f77789802218c9fc392c2c95bda1eb 100644
--- a/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
+++ b/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 Final Draft V5.2.3
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
 
 servers:
   - url: http://127.0.0.1/callback/v1
diff --git a/src/SOL002/VNFIndicator/VNFIndicator.yaml b/src/SOL002/VNFIndicator/VNFIndicator.yaml
index 300e7c5b403041ef1df91036fbd6e1cb24672d75..023dfbf4eb00109ec9de72eb55cd05987f8276a8 100644
--- a/src/SOL002/VNFIndicator/VNFIndicator.yaml
+++ b/src/SOL002/VNFIndicator/VNFIndicator.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 Final Draft V5.2.3
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
 
 servers:
   - url: http://127.0.0.1/vnfind/v1
diff --git a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml
index 09a3393bfc98d475f9344817dcf712af8dbf631b..9c15f8556400f0b3e99f27460a041daa36508456 100644
--- a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml
+++ b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 Final Draft V5.2.3
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
 
 servers:
   - url: http://127.0.0.1/callback/v1
diff --git a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml
index 9b8163db261f5769131cb827478eb3475a646e8f..f890b73cfa3f02504439b8cd90a53de26f7d8d0b 100644
--- a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml
+++ b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 Final Draft V5.2.3
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
 
 servers:
   - url: http://127.0.0.1/lcmcoord/v1
diff --git a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml
index 896bf346392a0db048da0acf7dd30968bcc96a63..d064ba52a717b6d61a2fbc7911ad8c702d1c338b 100644
--- a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml
+++ b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml
@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 2.15.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 2.16.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 Final Draft V5.2.3
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
 
 servers:
   - url: http://127.0.0.1/vnflcm/v2
diff --git a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
index 7a61e5b6f15ee52a299fd1d779a3532ae1fb81e1..79aa2454c08a7911aec7bfbe676849c03a3e2e65 100644
--- a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
+++ b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 2.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 2.16.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 Final Draft V5.2.3
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
 
 servers:
   - url: http://127.0.0.1/callback/v2
diff --git a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
index 9f5372aa9322a5c101e73215303699556256168e..881adcaf2e422d3e252f46997e2b12c10ae4277e 100644
--- a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
+++ b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
@@ -19,8 +19,8 @@ info:
   version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 Final Draft V5.2.3
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
 
 servers:
   - url: http://127.0.0.1/vnfpm/v2
diff --git a/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
index a41622e7ef5212fec58a5b7b80b6ccdedbb3b723..20432de63657bf75bec0342173384dc6dab2aa94 100644
--- a/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
+++ b/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
@@ -19,8 +19,8 @@ info:
   version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V5.2.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.02.01_60/gs_NFV-SOL002v050201p.pdf
+  description: ETSI GS NFV-SOL 002 Final Draft V5.2.3
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
 
 servers:
   - url: http://127.0.0.1/callback/v2