diff --git a/Readme.md b/Readme.md
index b87803ada9cace801b0a1764050d3c1216cb8449..34878d5f15dd2c527df0e38b664b3260dbb8796e 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,7 +1,7 @@
 # NFV SOL002 and SOL003 APIs
 
 This repository hosts the [OpenAPI](https://www.openapis.org/) specificatons and other documentation
-for the APIs defined in ETSI NFV GSs SOL002 and SOL003 v5.2.1.
+for the APIs defined in ETSI NFV GSs SOL002 and SOL003 v5.3.1.
 
 The APIs described in this repository are defined for the following reference points:
 
diff --git a/src/SOL002/APIVersion/APIVersion.yaml b/src/SOL002/APIVersion/APIVersion.yaml
index 898ca089905b7d025366d19e36dc385f6dc4801f..044016b25ff2f410d9ece81d802a9d9b306abfea 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 Final Draft V5.2.3
-  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 paths:
   /vnfconfig/api_versions:
diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml
index ae340f875f8fadefc82325938d270c8ee32afe3c..ae8eeed8a3cf3d8851705ed95b7e567610ca434e 100644
--- a/src/SOL002/General_Definitions/SOL002_def.yaml
+++ b/src/SOL002/General_Definitions/SOL002_def.yaml
@@ -364,7 +364,7 @@ definitions:
           - DYNAMIC
       cpuOperationalPowerStates:
         description: >
-          Provides the list of operational power states (i.e., P and C states)
+          Provides the list of operational power states (i.e. P and C states)
           defined for the virtual CPU (see note 2).
         $ref: "#/definitions/KeyValuePairs"
 
diff --git a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml
index d43f6e8381e135955e7f7a3a250179b73a2dc775..9a3b4d4d6955dd6b7aa37018ac2cad6e6d1f0d75 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 Final Draft V5.2.3
-  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnfconfig/v1
diff --git a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml
index ed3ca2d658d618db8c94690c4acb139f5fef0242..370fa975996a34520566c2e74cbaa4a99ce356c2 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 Final Draft V5.2.3
-  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnffm/v1
diff --git a/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
index 2231942999f77789802218c9fc392c2c95bda1eb..88c958559d9cf96cc56ab206752563b1315fddd0 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 Final Draft V5.2.3
-  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v1
diff --git a/src/SOL002/VNFIndicator/VNFIndicator.yaml b/src/SOL002/VNFIndicator/VNFIndicator.yaml
index d2df8cf6d574f549572b24cd1c1ddce448b349e3..64744e8d143279bb469dccda09f8b0af3dfddccc 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 Final Draft V5.2.3
-  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnfind/v1
diff --git a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml
index 9c15f8556400f0b3e99f27460a041daa36508456..3878ed06a6bf7e56ce364d456ced907ccb86d2d5 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 Final Draft V5.2.3
-  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v1
diff --git a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml
index 8974c86db208ee8dcc03532af91218f358888355..269c85d8002a66e9a8e035252f8c6c75d5b7bf86 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 Final Draft V5.2.3
-  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/lcmcoord/v1
diff --git a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml
index e356e06ef4a9acf0c06291a4113a01b2fcaeeb8e..5579f8ce09361e24834804612037bbaf43397282 100644
--- a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml
+++ b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml
@@ -19,8 +19,8 @@ info:
   version: 2.16.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 Final Draft V5.2.3
-  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnflcm/v2
diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml
index 5d5c7c8d4bab7ce9a602114527ab2ffdd9516c4f..51bab13aa9623ddc9e4de2b91f312d2e45e0f3c1 100644
--- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml
+++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml
@@ -3048,7 +3048,7 @@ definitions:
            associated with this power profile, as provided in the VNFD.
            VNFM exposes and can use this information to control the VNF
            instance to operate according to the power profile and selected
-           power state, e.g., monitoring actual energy or power consumption
+           power state, e.g. monitoring actual energy or power consumption
            of the VNF instance and compare against the estimated one.
          $ref: "#/definitions/PowerConsumptionInfo"
 
diff --git a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
index 79aa2454c08a7911aec7bfbe676849c03a3e2e65..681683c564b5a19974ddbd2ae115be77aec4497e 100644
--- a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
+++ b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
@@ -19,8 +19,8 @@ info:
   version: 2.16.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 Final Draft V5.2.3
-  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v2
diff --git a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml
index 232d0a21a7361fc361c0a0db4a65431b55c1c6eb..37412bd1ecc69401e5fec231c84ce9263953399f 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 Final Draft V5.2.3
-  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnfpm/v2
diff --git a/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
index 20432de63657bf75bec0342173384dc6dab2aa94..ed712135b7f9f7639392fc1da35a56be90baf365 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 Final Draft V5.2.3
-  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed531/NFV-SOL002ed531v523.zip
+  description: ETSI GS NFV-SOL 002 V5.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.03.01_60/gs_NFV-SOL002v050301p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v2