diff --git a/src/SOL005/APIVersion/APIVersion.yaml b/src/SOL005/APIVersion/APIVersion.yaml
index 38d98d2052450ad3f5ddb47e82422fd4761dc8b8..16560959137c934ab79a2b11cc3bb417e0b6488a 100644
--- a/src/SOL005/APIVersion/APIVersion.yaml
+++ b/src/SOL005/APIVersion/APIVersion.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V4.5.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf
+  description: ETSI GS NFV-SOL 005 V5.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf
 
 servers:
   - url: http://127.0.0.1/
diff --git a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml
index 0e1d2de5d5c29332e2ba5a413fcb4437dc24eb8b..ec22420fc479faf719a6480ad1279f1822da2d95 100644
--- a/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml
+++ b/src/SOL005/NFVICapacityInformation/NFVICapacityInformation.yaml
@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V4.5.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf
+  description: ETSI GS NFV-SOL 005 V5.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf
   
 servers:
   - url: http://127.0.0.1/nfvici/v1
@@ -145,6 +145,58 @@ paths:
         "504":
           $ref: ../responses/SOL005_resp.yaml#/components/responses/504
 
+  /nfvi_capacity_infos/ccm/{ccmId}:
+    parameters:
+      - $ref: '#/components/parameters/CcmId' 
+      - $ref: ../components/SOL005_params.yaml#/components/parameters/Version
+      - $ref: ../components/SOL005_params.yaml#/components/parameters/Authorization
+    get:
+      description: |
+        This method shall follow the provisions specified in the tables 10.4.3a.3.2-1 and 10.4.3a.3.2-2 for 
+        URI query parameters, request and response data structures, and response codes.
+
+        NOTE: This identifier can be retrieved from the "ccmId" attribute in the CapacityShortageNotification. 
+        It can also be retrieved from the "ccmId" attribute in the message content of the response.
+      parameters:
+        - in: query
+          name: filter
+          description: >
+            Attribute-based filtering expression according to clause 5.2 of ETSI GS NFV-SOL 013. 
+            The NFVO shall support receiving this parameter as part of the URI query string. 
+            The OSS/BSS may supply this parameter. If the OSS/BSS does not supply a filter value 
+            for the timeInterval attribute in the NfviCapacityInfo, a query of the current NFVI 
+            capacity information available by the NFVO is requested. The following attribute names 
+            in the NfviCapacityInfo shall be supported by the NFVO in the filter expression:
+            - cisClusterId
+            - timeInterval
+            - resourceType
+            - capacityMeasurementName
+            - capacity values: {totalCapacity, allocatedCapacity, reservedCapacity, availableCapacity}
+          schema:
+            type: string
+        - $ref: ../components/SOL005_params.yaml#/components/parameters/Accept
+      responses:
+        "200":
+          $ref: '#/components/responses/CcmNfviCapacityInfo.Get.200'
+        "400":
+          $ref: ../responses/SOL005_resp.yaml#/components/responses/400
+        "401":
+          $ref: ../responses/SOL005_resp.yaml#/components/responses/401
+        "403":
+          $ref: ../responses/SOL005_resp.yaml#/components/responses/403
+        "404":
+          $ref: ../responses/SOL005_resp.yaml#/components/responses/404
+        "405":
+          $ref: ../responses/SOL005_resp.yaml#/components/responses/405
+        "406":
+          $ref: ../responses/SOL005_resp.yaml#/components/responses/406
+        "500":
+          $ref: ../responses/SOL005_resp.yaml#/components/responses/500
+        "503":
+          $ref: ../responses/SOL005_resp.yaml#/components/responses/503
+        "504":
+          $ref: ../responses/SOL005_resp.yaml#/components/responses/504
+
   /capacity_thresholds:
     parameters:
       - $ref: ../components/SOL005_params.yaml#/components/parameters/Version
@@ -313,9 +365,22 @@ components:
       name: vimId
       in: path
       description: |
-        Identifier of the VIM with associated NFVI capacity information.
-        This identifier can be retrieved from the "vimId" attribute in the CapacityShortageNotification.
-        It can also be retrieved from the "vimId" attribute in the message content of the response.
+        Identifier of the VIM with associated NFVI capacity information. See note.
+        * NOTE: This identifier can be retrieved from the "vimId" attribute in the CapacityShortageNotification.
+                It can also be retrieved from the "vimId" attribute in the message content of the response.
+      required: true
+      style: simple
+      explode: false
+      schema:
+        type: string
+
+    CcmId:
+      name: ccmId
+      in: path
+      description: |
+        Identifier of the CCM with associated NFVI capacity information. See note.
+        * NOTE: This identifier can be retrieved from the "ccmId" attribute in the CapacityShortageNotification. It can also be
+                retrieved from the "ccmId" attribute in the message content of the response. 
       required: true
       style: simple
       explode: false
@@ -425,6 +490,38 @@ components:
           schema:
             $ref: ./definitions/NFVICapacityInformation_def.yaml#/components/schemas/NfviCapacityInfo
 
+
+    CcmNfviCapacityInfo.Get.200:
+      description: |
+        Shall be returned when information of an individual CCM's NFVI capacity has been read successfully.
+        The response body shall contain a representation of the NFVI capacity information, as defined in clause 10.5.2.4.
+      headers:
+        Version:
+          description: |
+            Version of the API used in the response.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        WWW-Authenticate:
+          description: |
+            Challenge if the corresponding HTTP request has not provided authorization, or error details if the
+            corresponding HTTP request has provided an invalid authorization token.
+          style: simple
+          explode: false
+          schema:
+            type: string
+        Content-Type:
+          description: The MIME type of the body of the response.
+          style: simple
+          explode: false
+          schema:
+            type: string
+      content:
+        application/json:
+          schema:
+            $ref: ./definitions/NFVICapacityInformation_def.yaml#/components/schemas/NfviCapacityInfo
+
     CapacityThresholds.Get.200:
       description: |
         Shall be returned when information about zero or more capacity thresholds has been queried successfully.
diff --git a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml
index 8bc2c9d708d86fa79f0c6a1395ec7ae0a662f83f..886c1c8ba50b9a91f777c3e944b45ee8e98f065d 100644
--- a/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml
+++ b/src/SOL005/NFVICapacityInformationNotification/NFVICapacityInformationNotification.yaml
@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V4.5.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf
+  description: ETSI GS NFV-SOL 005 V5.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v1
diff --git a/src/SOL005/NSDManagement/NSDManagement.yaml b/src/SOL005/NSDManagement/NSDManagement.yaml
index 03a5bae2919e9e63a4f7b3c8cf85b043ac0a04c8..97e5b08da565cb22acc120dcf73e4835fdd2b38d 100644
--- a/src/SOL005/NSDManagement/NSDManagement.yaml
+++ b/src/SOL005/NSDManagement/NSDManagement.yaml
@@ -19,8 +19,8 @@ info:
   version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V4.5.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf
+  description: ETSI GS NFV-SOL 005 V5.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf
 
 servers:
   - url: http://127.0.0.1/nsd/v2
diff --git a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml
index 4cc00b925faaa6d30632f97cc1e51723cc57879b..93daa7c47097b7645572c44737e6b857e13b59e9 100644
--- a/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml
+++ b/src/SOL005/NSDManagementNotification/NSDManagementNotification.yaml
@@ -19,8 +19,8 @@ info:
   version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V4.5.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf
+  description: ETSI GS NFV-SOL 005 V5.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v2
diff --git a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml
index 5052510622da385e27893508d9b5a7d71208a212..acdcfd56c8d69ca2889b48dbc4389943c4ecc9a7 100644
--- a/src/SOL005/NSFaultManagement/NSFaultManagement.yaml
+++ b/src/SOL005/NSFaultManagement/NSFaultManagement.yaml
@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V4.5.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf
+  description: ETSI GS NFV-SOL 005 V5.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf
 
 servers:
   - url: http://127.0.0.1/nsfm/v1
diff --git a/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml b/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml
index 8d992aa9270f53d701d41924455f0118be39952f..f58854830c9bda0f7fd7b8e4107b9f91b1ac5db3 100644
--- a/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml
+++ b/src/SOL005/NSFaultManagement/definitions/SOL005NSFaultManagement_def.yaml
@@ -25,6 +25,10 @@ definitions:
       managedObjectId:
         description: >
           Identifier of the affected NS instance.
+          The Managed Objects for the present document is an NS instance. 
+          An NS instance can have fault monitored sub-object types and identification 
+          information is carried as defined in the respective Alarm definition as defined 
+          in clause 7.4 of ETSI GS NFV-IFA 045, e.g., using the "faultDetails" attribute.
         $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
       rootCauseFaultyComponent:
         description: >
@@ -69,6 +73,10 @@ definitions:
       perceivedSeverity:
         description: >
           Perceived severity of the managed object failure.
+          Valid values applicable to specific Alarms are specified as 
+          "Perceived severity" values of the Alarm applicable to 
+          Os-Ma-nfvo reference point, as defined in clause 7.4 of 
+          ETSI GS NFV-IFA 045.
         $ref: "#/definitions/PerceivedSeverityType"
       eventTime:
         description: >
@@ -77,14 +85,24 @@ definitions:
       eventType:
         description: >
           Type of event.
+          Valid values applicable to specific Alarms are specified as 
+          "Event type" values of the Alarm applicable to Os-Ma-nfvo 
+          reference point, as defined in clause 7.4 of ETSI GS NFV-IFA 045.
         $ref: "#/definitions/EventType"
       faultType:
         description: >
           Additional information to clarify the type of the fault.
+          Valid values applicable to specific Alarms are specified as 
+          "Alarm definition identifier" values of the Alarm applicable 
+          to Os-Ma-nfvo reference point, as defined in clause 7.4 of ETSI
+          GS NFV-IFA 045.
         type: string
       probableCause:
         description: >
           Information about the probable cause of the fault.
+          Valid values applicable to specific Alarms are specified as 
+          "Probable cause" values of the Alarm applicable to Os-Ma-nfvo 
+          reference point, as defined in clause 7.4 of ETSI GS NFV-IFA 045.
         type: string
       isRootCause:
         description: >
@@ -100,7 +118,10 @@ definitions:
           $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
       faultDetails:
         description: >
-          Provides additional information about the fault..
+          Provides additional information about the fault.
+          Valid values applicable to specific Alarms are specified as 
+          "Fault details" values of the Alarm applicable to Os-Ma-nfvo
+          reference point, as defined in clause 7.4 of ETSI GS NFV-IFA 045.
         type: array
         items:
           type: string
@@ -283,6 +304,14 @@ definitions:
         description: >
           The URI of the endpoint to send the notification to.
         $ref: "../../definitions/SOL005_def.yaml#/definitions/Uri"
+      fmConnection:
+        description: >
+          An access information and interface information to monitor the FM of VNF instance
+          by the VNFM. This can include for instance certain interface endpoint URI together
+          with necessary credentials to access it.
+        type: array
+        items:
+           $ref: "../../definitions/SOL005_def.yaml#/definitions/MonitoringConnection"
       _links:
         description: >
           Links for this resource.
diff --git a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml
index acda133d000fc2d53ae3c8fc3551149cd45956e6..401471cbb2e8645ee99334c0a209b3f9d3dcdd3c 100644
--- a/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml
+++ b/src/SOL005/NSFaultManagementNotification/NSFaultManagementNotification.yaml
@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V4.5.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf
+  description: ETSI GS NFV-SOL 005 V5.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v1
diff --git a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml
index 14c509f0637acfb6d87231bf1e91bcd33037b5e4..b345b114d2232f609d5756f5a0dcb273998bfff4 100644
--- a/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml
+++ b/src/SOL005/NSLCMCoordination/NSLCMCoordination.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V4.5.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf
+  description: ETSI GS NFV-SOL 005 V5.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf
 
 servers:
   - url: http://127.0.0.1/lcmcoord/v1
diff --git a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
index 81945e2f6e1c420f8a5dc334fc1d29d89f078bb7..e52d8d79e4c780da12fa2d8ccc520fcb62b8a29b 100644
--- a/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
+++ b/src/SOL005/NSLifecycleManagement/NSLifecycleManagement.yaml
@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 2.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V4.5.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf
+  description: ETSI GS NFV-SOL 005 V5.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf
 
 servers:
   - url: http://127.0.0.1/nslcm/v2
diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml
index 32b3a81370a6bf13142aa6445c61d408d29c06f4..9f2ed65f69b5b9d6fb65b54d4f50df4149629819 100644
--- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml
+++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml
@@ -119,6 +119,29 @@ definitions:
           the healing process, specific to the VNF being healed.
           EXAMPLE: Input parameters to VNF-specific healing procedures.
         $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
+      healingResource:
+        description: >
+          Indicates the kinds of the virtual resource to be healed.
+          Permitted values:
+          - VL
+          - LINKPORT
+          - STORAGE
+          - VIRTUALCP
+          - COMPUTE
+          - OSCONTAINER
+          Default value is COMPUTE when the VDUs of the VNF are realized
+          by a set of virtual machines and OSCONTAINER when the VDUs of
+          the VNF are realized by a set of OS containers.
+        type: array
+        items:
+          type: string
+          enum:
+            - VL
+            - LINKPORT
+            - STORAGE
+            - VIRTUALCP
+            - COMPUTE
+            - OSCONTAINER
 
   TerminateNsRequest:
     description: >
@@ -1191,7 +1214,10 @@ definitions:
 
           In addition, the provisions in clause 6.7 shall apply.
         $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
-
+      vnfmId:
+        description: >
+          Identifier of the VNFM that manages the VNF instance.
+        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
 
   VirtualCpInfo:
     description: > 
@@ -6620,23 +6646,22 @@ definitions:
       This type represents network address data for a virtual CP. 
       It shall comply with the provisions defined in table 6.5.3.12a-1.
       
-      NOTE 1: If the container cluster is set up to be able to configure an external load balancer this address will be
-              used, otherwise it will be ignored by the CISM.
-      NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the
-              container cluster will assign an IP address.
-      NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP
-              address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for
-              Kubernetes® that supports configuration of address pools for load balancer services.
-      NOTE 4: The loadBalancerIp and the addressPoolName attributes shall not be present at the same time.
-
+      * NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the CIS cluster is set up to be 
+                able to configure an external load balancer. Otherwise it shall be ignored.
+      * NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the
+                container cluster will assign an IP address. 
+      * NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP
+                address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for
+                Kubernetes® that supports configuration of address pools for load balancer services.
+      * NOTE 4: The loadBalancerIp, addressPoolName and the externalIp attributes shall not be present at the same time. 
     type: object
     required:
       - type
     properties:
       type:
         description: >
-          Identifier of layer(s) and protocol(s).
-          Permitted values: IP_OVER_ETHERNET.
+          The type of the IP addresses.
+          Permitted values: IPV4, IPV6.
         type: string
         enum:
           - IPV4
@@ -6646,14 +6671,36 @@ definitions:
           Fixed address to assign to an external load balancer.
           See notes 1, 2 and 4.
         $ref: "#/definitions/IpAddress"
+      externalIp:
+        description: >
+          An external IP address assigned to the virtual CP. 
+          This IP address is not managed by CISM. See note 4.
+        $ref: "#/definitions/IpAddress"
       addressPoolName:
         description: >
-          Name of an address pool from which the
-          container cluster will assign an IP address to
-          the virtual CP. See notes 3 and 4.
+          Name of an address pool from which the CIS cluster will assign an IP address to the virtual CP. 
+          See notes 3 and 4.
         type: array
         items:
          type: string
+      loadBalancerSourceRanges:
+        description: >
+          List of client IP address ranges allowed to access an external load balancer. See note 1.
+        type: array
+        items:
+          type: object
+          required:
+           - minAddress
+           - maxAddress
+          properties:
+            minAddress:
+              description: >
+                Lowest IP address belonging to the range.
+              $ref: "#/definitions/IpAddress"
+            maxAddress:
+              description: >
+                Highest IP address belonging to the range.
+              $ref: "#/definitions/IpAddress"
 
 
 
@@ -7451,6 +7498,8 @@ definitions:
               identifier.
       NOTE 2: Component mappings are defined in the VNFD in the source or destination package for the relevant change
               path. See clause 7.1.15.2 in ETSI GS NFV-IFA 011.
+      NOTE 3: In the current version of the present document, only Rolling uprade and Blue-green upgrade types are supported. 
+              The definition of additional upgrade types is left for future specification.
           
     type: object
     required:
@@ -7532,7 +7581,17 @@ definitions:
             instance in delegation mode. Otherwise shall not be
             present
           $ref: "#/definitions/CertificateConfigurationData"
-
+      upgradeType: 
+          description: >
+            Indicates upgrade type when change the current VNF Package on which a VNF instance is based.
+            Permitted values:
+            • ROLLING_UPGRADE
+            • BLUE_GREEN
+            See note 3.
+          type: string
+          enum:
+          - ROLLING_UPGRADE
+          - BLUE_GREEN
 
   DeleteVnfSnapshotData:
     description: >
diff --git a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
index 6f7db86f16a0ae03655db871a9632382873adf9a..49b254685c9237a6ead342b556bd71db3e35750f 100644
--- a/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
+++ b/src/SOL005/NSLifecycleManagementNotification/NSLifecycleManagementNotification.yaml
@@ -14,11 +14,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 2.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V4.5.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf
+  description: ETSI GS NFV-SOL 005 V5.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v2
diff --git a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml
index ef7dc33e732c0d6342f265b949a22f85005c3c67..89007b08f26f79c6b11cd4ec169a865da0682b07 100644
--- a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml
+++ b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml
@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V4.5.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf
+  description: ETSI GS NFV-SOL 005 V5.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf
 
 servers:
   - url: http://127.0.0.1/nspm/v2
@@ -431,7 +431,6 @@ paths:
 #        description: |
 #          Version of the API requested to use when responding to this request.
 #        in: header
-#        required: true
 #        type: string
 #
 #    post:
@@ -650,7 +649,6 @@ paths:
 #        description: |
 #          Version of the API requested to use when responding to this request.
 #        in: header
-#        required: true
 #        type: string
 #
 #    get:
diff --git a/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml b/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml
index 941446ad7c16760034142273a45d513114cc7869..e147b3efaaf6c23fb122132f446951952be9bf25 100644
--- a/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml
+++ b/src/SOL005/NSPerformanceManagement/definitions/SOL005NSPerformanceManagement_def.yaml
@@ -120,6 +120,64 @@ definitions:
           authorization of notifications.
         $ref: "../../definitions/SOL005_def.yaml#/definitions/SubscriptionAuthentication"
 
+  MonitoringConnection:
+    description: >
+      This type represents a MonitoringConnection.
+
+      NOTE: The VNFM can be made aware of monitoring connection information, including their identifiers to be used by
+      configuration means outside the scope of the present document (e.g. using relevant NFV-MANO management
+      APIs as defined in ETSI GS NFV-SOL 009). 
+    type: object
+    required:
+      - id
+      - monitoringType
+    properties:
+      id:
+        description: >
+          Identifier of the monitoring connection. See note
+        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
+      monitoringType:
+        description: >
+          Type of monitoring way.
+          VALUES:
+          • VIM_CISM
+          • EXTERNAL
+          • PAAS
+        type: string
+        enum:
+        - VIM_CISM
+        - EXTERNAL
+        - PAAS
+      vimId:
+        description: >
+          Information about VIM or CISM connection(s) for
+          monitoring resources for the VNF instance.
+          Can be set when MonitoringType is equal to
+          "VIM_CISM". 
+        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
+      paasServiceId:
+        description: >
+          Information about PaasAsset to be used.
+          Can be set when MonitoringType is equal to
+          "PAAS". 
+        $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"      
+      interfaceInfo:
+       description: >
+          Information about the interface(s) to the external monitoring tool, 
+          if available, including interface endpoint e.g. URL API version, and protocol type.
+          Can be set when MonitoringType is equal to “EXTERNAL”.
+       $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
+      accessInfo:
+       description: >
+        Authentication credentials for accessing the external monitoring tool.
+        Examples can include those to support different authentication schemes, 
+        e.g. OAuth, Token, Username/password, etc. Can be set when MonitoringType is equal to “EXTERNAL”.
+       $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
+      extra:
+       description: >
+          Type specific additional information, if applicable.
+       type: string
+
   PmJob:
     description: >
       This type represents a PM job.
@@ -130,6 +188,7 @@ definitions:
       - objectInstanceIds
       - criteria
       - callbackUri
+      - _links
     properties:
       id:
         description: >
@@ -143,8 +202,7 @@ definitions:
         $ref: "../../definitions/SOL005_def.yaml#/definitions/String"
       objectInstanceIds:
         description: >
-          Identifiers of the NS instances for which
-          performance information is collected.
+          Identifiers of the measured object instances for which performance information is collected. 
         type: array
         items:
           $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
@@ -152,13 +210,13 @@ definitions:
         description: >
           Identifiers of the sub-object instances of the measured object
           instance for which performance information is requested to be collected.
-          May be present if a sub-object is defined in clause 6.2 of ETSI GS NFV-IFA 027
-          for the related measured object type.
+          May be present if a sub-object is defined in clause 6.2 of 
+          ETSI GS NFV-IFA 027 for the related measured object type.
           If this attribute is present, the cardinality of the "objectInstanceIds"
           attribute shall be 1.
           If this attribute is absent and a sub-object is defined in clause 6.2 of
-          ETSI GS NFV IFA 027  for the related measured object type, measurements
-          will be taken for all sub-object instances of the measured object instance.
+          ETSI GS NFV IFA 027  for the related measured object type, measurements will 
+          be taken for all sub-object instances of the measured object instance.
         type: array
         items:
           $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInNs"
@@ -181,7 +239,7 @@ definitions:
         properties:
           href:
             description: >
-              The Uri where the report can be obtained.
+              The URI where the report can be obtained.
             $ref: "../../definitions/SOL005_def.yaml#/definitions/Uri"
           readyTime:
             description: >
@@ -195,26 +253,36 @@ definitions:
             description: >
               The size of the report file in bytes, if known.
             type: integer
-          _links:
+            minimum: 0
+      pmJobConnection:
+        description: >
+          An access information and interface information of PM job to monitor the PM of VNF 
+          instance by the VNFM. This can include for instance certain interface endpoint URI together with
+          necessary credentials to access it.
+        type: array
+        items:
+          $ref: "../../definitions/SOL005_def.yaml#/definitions/MonitoringConnection"
+      _links:
+        description: >
+          Links for this resource.
+        type: object
+        required:
+          - self
+        properties:
+          self:
+            description: >
+              URI of this resource.
+            $ref: "../../definitions/SOL005_def.yaml#/definitions/Link"
+          objects:
             description: >
-              Links for this resource.
-            type: object
-            required:
-              - self
-            properties:
-              self:
-                description: >
-                  URI of this resource.
-                $ref: "../../definitions/SOL005_def.yaml#/definitions/Link"
-              objects:
-                description: >
-                  Links to resources representing the measured object
-                  instances for which performance information is
-                  collected. Shall be present if the measured object instance
-                  information is accessible as a resource.
-                type: array
-                items:
-                  $ref: "../../definitions/SOL005_def.yaml#/definitions/Link"
+              Links to resources representing the measure
+              object instances for which performance
+              information is collected. Shall be present if the
+              measured object instance information is
+              accessible as a resource.
+            type: array
+            items:
+              $ref: "../../definitions/SOL005_def.yaml#/definitions/Link"
 
   CreateThresholdRequest:
     description: >
diff --git a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml
index 538b2d14395ce6d12f75abd61dfecc3be976568a..3419344df4576e2602ba9966cfeaffdba16dc873 100644
--- a/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml
+++ b/src/SOL005/NSPerformanceManagementNotification/NSPerformanceManagementNotification.yaml
@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V4.5.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf
+  description: ETSI GS NFV-SOL 005 V5.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v2
diff --git a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
index dab38216f3e8b690f7795131297130b62ea6acf8..2ed63d38c483a742d076943471fc43c858c67f35 100644
--- a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
+++ b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml
@@ -19,8 +19,8 @@ info:
   version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V4.5.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf
+  description: ETSI GS NFV-SOL 005 V5.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf
 
 servers:
   - url: http://127.0.0.1/vnfpkgm/v2
diff --git a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
index 11cc95882b8ba948b6be6498fcc107a99eca338c..ba1f9bcbec0f26e8914f9cd4c6c033fc54c98957 100644
--- a/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
+++ b/src/SOL005/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
@@ -19,8 +19,8 @@ info:
   version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V4.5.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf
+  description: ETSI GS NFV-SOL 005 V5.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v2
diff --git a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml
index 75b97eeb471f5714bbd2504f2bd18aed5a909b27..aaed77e423ed056071f9962c88281e48ad6e02e0 100644
--- a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml
+++ b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml
@@ -19,8 +19,8 @@ info:
   version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 005 V4.5.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/04.05.01_60/gs_NFV-SOL005v040501p.pdf
+  description: ETSI GS NFV-SOL 005 V5.1.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/05.01.01_60/gs_nfv-sol005v050101p.pdf
 
 servers:
   - url: http://127.0.0.1/vnfsnapshotpkgm/v1
diff --git a/src/SOL005/components/SOL005_params.yaml b/src/SOL005/components/SOL005_params.yaml
index b17c2e76d3e489b638b6f1f6f4ec8369d61d6ce6..941b21c3f8b1bc7467e348dc3fe64f783357b58f 100644
--- a/src/SOL005/components/SOL005_params.yaml
+++ b/src/SOL005/components/SOL005_params.yaml
@@ -5,7 +5,6 @@ components:
       description: >
         Version of the API requested to use when responding to this request.
       in: header
-      required: true
       schema:
         type: string
 
diff --git a/src/SOL005/definitions/SOL005_def.yaml b/src/SOL005/definitions/SOL005_def.yaml
index 9699ec99b1f3d639d2be677c9838481b5a9f84f9..f5d8e6bab1486f1ee27b4d8fad56bc9b24202540 100644
--- a/src/SOL005/definitions/SOL005_def.yaml
+++ b/src/SOL005/definitions/SOL005_def.yaml
@@ -486,3 +486,61 @@ definitions:
               The token endpoint from which the access token can be obtained.
               Shall be present if it has not been provisioned out of band.
             $ref: "#/definitions/Uri"
+
+  MonitoringConnection:
+    description: >
+      This type represents a MonitoringConnection.
+
+      NOTE: The VNFM can be made aware of monitoring connection information, including their identifiers to be used by
+      configuration means outside the scope of the present document (e.g. using relevant NFV-MANO management
+      APIs as defined in ETSI GS NFV-SOL 009). 
+    type: object
+    required:
+      - id
+      - monitoringType
+    properties:
+      id:
+        description: >
+          Identifier of the monitoring connection. See note
+        $ref: "#/definitions/Identifier"
+      monitoringType:
+        description: >
+          Type of monitoring way.
+          VALUES:
+          • VIM_CISM
+          • EXTERNAL
+          • PAAS
+        type: string
+        enum:
+        - VIM_CISM
+        - EXTERNAL
+        - PAAS
+      vimId:
+        description: >
+          Information about VIM or CISM connection(s) for
+          monitoring resources for the VNF instance.
+          Can be set when MonitoringType is equal to
+          "VIM_CISM". 
+        $ref: "#/definitions/Identifier"
+      paasServiceId:
+        description: >
+          Information about PaasAsset to be used.
+          Can be set when MonitoringType is equal to
+          "PAAS". 
+        $ref: "#/definitions/Identifier"      
+      interfaceInfo:
+       description: >
+          Information about the interface(s) to the external monitoring tool, 
+          if available, including interface endpoint e.g. URL API version, and protocol type.
+          Can be set when MonitoringType is equal to “EXTERNAL”.
+       $ref: "#/definitions/KeyValuePairs"
+      accessInfo:
+       description: >
+        Authentication credentials for accessing the external monitoring tool.
+        Examples can include those to support different authentication schemes, 
+        e.g. OAuth, Token, Username/password, etc. Can be set when MonitoringType is equal to “EXTERNAL”.
+       $ref: "#/definitions/KeyValuePairs"
+      extra:
+       description: >
+          Type specific additional information, if applicable.
+       type: string