diff --git a/SOL005/NSDManagement-API/IndividualNSDArchiveArtifact.robot b/SOL005/NSDManagement-API/IndividualNSDArchiveArtifact.robot
index 793b9e14f86c9b924026acc434a47f752971b3b2..be54813bc534140fce0a8b91540a9e8144e249cc 100644
--- a/SOL005/NSDManagement-API/IndividualNSDArchiveArtifact.robot
+++ b/SOL005/NSDManagement-API/IndividualNSDArchiveArtifact.robot
@@ -12,7 +12,7 @@ GET Individual NSD Archive Artifact
     ...    Test title: GET Individual NSD Archive Artifact
     ...    Test objective: The objective is to test the retrieval of an individual NSD Archive artifact
     ...    Pre-conditions: One or more NSD archives are on-boarded to the NFVO.
-    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -24,7 +24,7 @@ GET Individual NSD Archive Artifact with include_signatures parameter
     ...    Test title: GET Individual NSD Archive Artifact with include_signatures parameter
     ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more NSD archives are on-boarded to the NFVO.
-    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ GET Individual NSD Archive Artifact in octet stream format
     ...    Test title: GET Individual NSD Archive Artifact in octet stream format
     ...    Test objective: The objective is to test the retrieval of an individual NSD Archive artifact when the NFVO cannot determine the artifact content type. The test performs a validation that the returned artifcat in is octet-stream format. 
     ...    Pre-conditions: One or more NSD archives are on-boarded to the NFVO.
-    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO cannot determine the content type of the artifact
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ GET Individual NSD Archive Artifact with Range Request and NFVO supporting Range
     ...    Test title: GET Individual NSD Archive Artifact with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the retrieval of an individual NSD Archive artifact when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
     ...    Pre-conditions: One or more NSD archives are on-boarded to the NFVO.
-    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the NSD Archive artifact
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ GET Individual NSD Archive Artifact with Range Request and NFVO not supporting R
     ...    Test title: GET Individual NSD Archive Artifact with Range Request and NFVO not supporting Range Requests
     ...    Test objective: The objective is to test that the retrieval of an individual NSD archive artifact, when using a range request to return single range of bytes from the file and the NFVO not supporting it, returns the full NSD Archive artifact.
     ...    Pre-conditions: One or more NSD archives are on-boarded to the NFVO.
-    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support range requests to return single range of bytes from the NSD Archive artifact
     ...    Post-Conditions: none    
@@ -76,7 +76,7 @@ GET Individual NSD Archive Artifact with invalid resource identifier
     ...    Test title: GET Individual NSD Archive Artifact with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual NSD Archive Artifact fails when using an invalid resource identifier
     ...    Pre-conditions: One or more NSD archives are on-boarded to the NFVO.
-    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -89,7 +89,7 @@ GET Individual NSD Archive Artifact - Not Acceptable
     ...    Test title: GET Individual NSD Archive Artifact - Not Acceptable
     ...    Test objective: The objective is to test that the retrieval of an individual NSD Archive artifact fails when related request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided
     ...    Pre-conditions: One or more NSD archives are on-boarded to the NFVO.
-    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none      
@@ -102,7 +102,7 @@ GET Individual NSD Archive Artifact with conflict due to onboarding state
     ...    GET Individual NSD Archive Artifact with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of an individual NSD Archive Artifact fails due to a conflict when the NSD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the NSD archive for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -115,7 +115,7 @@ GET Individual NSD Archive Artifact with invalid Range Request
     ...    Test title: GET Individual NSD Archive Artifact with invalid Range Request
     ...    Test objective: The objective is to test that the retrieval of an Individual NSD Archive fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more NSD Archives are on-boarded to the NFVO.
-    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the NSD Archive artifact
     ...    Post-Conditions: none      
@@ -127,7 +127,7 @@ POST Individual NSD Archive Artifact - Method not implemented
     ...    Test title: POST Individual NSD Archive Artifact - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create an individual artifact contained in an NSD archive.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4c.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4c.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -139,7 +139,7 @@ PUT Individual NSD Archive Artifact - Method not implemented
     ...    Test title: PUT Individual NSD Archive Artifact - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an Individual NSD Archive artifact
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4c.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4c.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -151,7 +151,7 @@ PATCH Individual NSD Archive Artifact - Method not implemented
     ...    Test title: PATCH Individual NSD Archive Artifact - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update an Individual NSD Archive artifact
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4c.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4c.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -163,7 +163,7 @@ DELETE Individual NSD Archive Artifact - Method not implemented
     ...    Test title: DELETE Individual NSD Archive Artifact - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete an Individual NSD Archive artifact
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4c.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4c.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -175,7 +175,7 @@ GET Individual NSD Archive Artifact with permitted authorization scope
     ...    Test title: GET Individual NSD Archive Artifact with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of an individual NSD Archive artifact with permitted authorization scope
     ...    Pre-conditions: One or more NSD archives are on-boarded to the NFVO.
-    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -187,7 +187,7 @@ GET Individual NSD Archive Artifact with not permitted authorization scope
     ...    Test title: GET Individual NSD Archive Artifact with not permitted authorization scope
     ...    Test objective: The objective is to test that the retrieval of an individual NSD Archive artifact fails when using not permitted authorization scope
     ...    Pre-conditions: One or more NSD archives are on-boarded to the NFVO.
-    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
index 4d889561b93a52f255048594cbd938478ed7038d..e0917ef40dc012492cb39f085633fb55c5f984f1 100644
--- a/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualNSDescriptor.robot
@@ -14,7 +14,7 @@ GET Individual Network Service Descriptor Information
     ...    Test title: GET Individual Network Service Descriptor Information
     ...    Test objective: The objective is to test the retrieval of an individual Network Service Descriptor information and perform a JSON schema validation of the collected data structure
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -30,7 +30,7 @@ GET Individual Network Service Descriptor Information with invalid resource iden
     ...    Test title: GET Individual Network Service Descriptor Information with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual Network Service Descriptor Information fails when using an invalid resource identifier
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -43,7 +43,7 @@ Disable Individual Network Service Descriptor
     ...    Test title: Disable Individual Network Service Descriptor  
     ...    Test objective: The objective is to test the disabling of an individual Network Service Descriptor and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in enabled operational state.
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor is in operational state DISABLED and usage state is not modified
@@ -59,7 +59,7 @@ Enable Individual Network Service Descriptor
     ...    Test title: Enable Individual Network Service Descriptor
     ...    Test objective: The objective is to test the enabling of an individual Network Service Descriptor and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in DISABLED operational state (Test ID 5.3.1.2.3).
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor is in operational state ENABLED and usage state is not modified
@@ -74,7 +74,7 @@ Enable Individual Network Service Descriptor with conflict due to operational st
     ...    Test title: Enable Individual Network Service Descriptor with conflict due to operational state ENABLED
     ...    Test objective: The objective is to test that enabling an individual Network Service Descriptor that is already in ENABLED operational state failsand perform a JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in ENABLED operational state (Test ID 5.3.1.2.4).
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -87,7 +87,7 @@ Enable Individual Network Service Descriptor with conflict due to onboarding sta
     ...    Test title: Enable Individual Network Service Descriptor with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of an Network Service Descriptor fails due to a conflict when the Network Service Descriptor is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in ENABLED operational state. The onboarding state of the Network Service Descriptor for which the enabling is requested is different from ONBOARDED.
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -100,7 +100,7 @@ Enable Individual Network Service Descriptor with HTTP Etag precondition failure
     ...    Test title:  Enable Individual Network Service Descriptor with HTTP Etag precondition failure
     ...    Test objective: The objective is to test that the retrieval of an Network Service Descriptor fails due to a precondition failure when using an uncorrect Http Etag identified.
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in ENABLED operational state (Test ID 5.3.1.2.4).
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -112,7 +112,7 @@ Enable Individual Network Service Descriptor with HTTP Conditional Request Not S
     ...    Test title:  Enable Individual Network Service Descriptor with HTTP Conditional Request Not Supported Precondition Failure
     ...    Test objective: The objective is to test that the retrieval of an Network Service Descriptor fails if the API Producer does not support "Last-Modified" and "ETag" HTTP Headers
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in ENABLED operational state (Test ID 5.3.1.2.4).
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: API Producer does not support "Last-Modified" and "ETag" HTTP Headers
     ...    Post-Conditions: none
@@ -135,7 +135,7 @@ DELETE Individual Network Service Descriptor
     ...    Test title:  DELETE Individual Network Service Descriptor
     ...    Test objective: The objective is to test the deletion of an individual Network Service Descriptor.
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in DISABLED operational state and NOT_IN_USE usage state.
-    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor is not available anymore in the NFVO 
@@ -148,7 +148,7 @@ DELETE Individual Network Service Descriptor in operational state ENABLED
     ...    Test title:  DELETE Individual Network Service Descriptor in operational state ENABLED
     ...    Test objective: The objective is to test that the deletion of an individual Network Service Descriptor in operational state ENABLED fails. The test also performs a JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in ENABLED operational state (Test ID 5.3.1.2.4).
-    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor is not deleted by the failed operation. 
@@ -162,7 +162,7 @@ POST Individual Network Service Descriptor - Method not implemented
     ...    Test title: POST Individual Network Service Descriptor - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -174,7 +174,7 @@ PUT Individual Network Service Descriptor - Method not implemented
     ...    Test title: PUT Individual Network Service Descriptor - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a new Network Service Descriptor
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -186,7 +186,7 @@ DELETE Individual Network Service Descriptor with permitted authorization scope
     ...    Test title:  DELETE Individual Network Service Descriptor with permitted authorization scope
     ...    Test objective: The objective is to test the deletion of an individual Network Service Descriptor with permitted authorization scope.
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in DISABLED operational state and NOT_IN_USE usage state.
-    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor is not available anymore in the NFVO 
@@ -200,7 +200,7 @@ DELETE Individual Network Service Descriptor with not permitted authorization sc
     ...    Test title:  DELETE Individual Network Service Descriptor with not permitted authorization scope
     ...    Test objective: The objective is to test that the deletion of an individual Network Service Descriptor fails when using a not permitted authorization scope.
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in DISABLED operational state and NOT_IN_USE usage state.
-    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Network Service Descriptor is not available anymore in the NFVO 
diff --git a/SOL005/NSDManagement-API/IndividualPNFDArchiveArtifact.robot b/SOL005/NSDManagement-API/IndividualPNFDArchiveArtifact.robot
index a3e0251781a0b65f838bcc65affd8d9dec20c9b8..3a7d6c4e152f089b1a31f409b98560340dad6b35 100644
--- a/SOL005/NSDManagement-API/IndividualPNFDArchiveArtifact.robot
+++ b/SOL005/NSDManagement-API/IndividualPNFDArchiveArtifact.robot
@@ -12,7 +12,7 @@ GET Individual PNFD Archive Artifact
     ...    Test title: GET Individual PNFD Archive Artifact
     ...    Test objective: The objective is to test the retrieval of an individual PNFD Archive artifact
     ...    Pre-conditions: One or more PNFD archives are on-boarded in the NFVO.
-    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -24,7 +24,7 @@ GET Individual PNFD Archive Artifact with include_signatures parameter
     ...    Test title: GET Individual PNFD Archive Artifact with include_signatures parameter
     ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully and also contain security certificates when requested with "include_signature" parameter, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more PNFD archives are on-boarded to the NFVO.
-    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ GET Individual PNFD Archive Artifact in octet stream format
     ...    Test title: GET Individual PNFD Archive Artifact in octet stream format
     ...    Test objective: The objective is to test the retrieval of an individual PNFD Archive artifact when the NFVO cannot determine the artifact content type. The test performs a validation that the returned artifcat in is octet-stream format. 
     ...    Pre-conditions: One or more PNFD archives are on-boarded to the NFVO.
-    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO cannot determine the content type of the artifact
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ GET Individual PNFD Archive Artifact with Range Request and NFVO supporting Rang
     ...    Test title: GET Individual PNFD Archive Artifact with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the retrieval of an individual PNFD Archive artifact when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
     ...    Pre-conditions: One or more PNFD archives are on-boarded in the NFVO.
-    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the PNFD Archive artifact
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ GET Individual PNFD Archive Artifact with Range Request and NFVO not supporting
     ...    Test title: GET Individual PNFD Archive Artifact with Range Request and NFVO not supporting Range Requests
     ...    Test objective: The objective is to test that the retrieval of an individual PNFD archive artifact, when using a range request to return single range of bytes from the file and the NFVO not supporting it, returns the full PNFD Archive artifact.
     ...    Pre-conditions: One or more PNFD archives are on-boarded in the NFVO.
-    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support range requests to return single range of bytes from the PNFD Archive artifact
     ...    Post-Conditions: none    
@@ -76,7 +76,7 @@ GET Individual PNFD Archive Artifact with invalid resource identifier
     ...    Test title: GET Individual PNFD Archive Artifact with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual PNFD Archive Artifact fails when using an invalid resource identifier
     ...    Pre-conditions: One or more PNFD archives are on-boarded in the NFVO.
-    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -89,7 +89,7 @@ GET Individual PNFD Archive Artifact - Not Acceptable
     ...    Test title: GET Individual PNFD Archive Artifact - Not Acceptable
     ...    Test objective: The objective is to test that the retrieval of an individual PNFD Archive artifact fails when related request contained an "Accept" header not compatible with the Content type "application/zip" but the "include_signatures" flag was provided
     ...    Pre-conditions: One or more PNFD archives are on-boarded to the NFVO.
-    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none      
@@ -102,7 +102,7 @@ GET Individual PNFD Archive Artifact with conflict due to onboarding state
     ...    GET Individual PNFD Archive Artifact with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of an individual PNFD Archive Artifact fails due to a conflict when the PNFD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the PNFD archive for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -115,7 +115,7 @@ GET Individual PNFD Archive Artifact with invalid Range Request
     ...    Test title: GET Individual PNFD Archive Artifact with invalid Range Request
     ...    Test objective: The objective is to test that the retrieval of an Individual PNFD Archive fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more PNFD Archives are on-boarded to the NFVO.
-    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the PNFD Archive artifact
     ...    Post-Conditions: none      
@@ -128,7 +128,7 @@ POST Individual PNFD Archive Artifact - Method not implemented
     ...    Test title: POST Individual PNFD Archive Artifact - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create an individual artifact contained in an PNFD archive.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7c.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7c.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -140,7 +140,7 @@ PUT Individual PNFD Archive Artifact - Method not implemented
     ...    Test title: PUT Individual PNFD Archive Artifact - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify an Individual PNFD Archive artifact
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7c.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7c.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -152,7 +152,7 @@ PATCH Individual PNFD Archive Artifact - Method not implemented
     ...    Test title: PATCH Individual PNFD Archive Artifact - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update an Individual PNFD Archive artifact
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7c.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7c.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -164,7 +164,7 @@ DELETE Individual PNFD Archive Artifact - Method not implemented
     ...    Test title: DELETE Individual PNFD Archive Artifact - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete an Individual PNFD Archive artifact
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7c.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7c.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -176,7 +176,7 @@ GET Individual PNFD Archive Artifact with permitted authorization scope
     ...    Test title: GET Individual PNFD Archive Artifact with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of an individual PNFD Archive artifact with permitted authorization scope
     ...    Pre-conditions: One or more PNFD archives are on-boarded in the NFVO.
-    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -188,7 +188,7 @@ GET Individual PNFD Archive Artifact with not permitted authorization scope
     ...    Test title: GET Individual PNFD Archive Artifact with not permitted authorization scope
     ...    Test objective: The objective is to test that the retrieval of an individual PNFD Archive artifact fails when using not permitted authorization scope
     ...    Pre-conditions: One or more PNFD archives are on-boarded in the NFVO.
-    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7c.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot b/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot
index d5e0aa8e94b772a9b5afe1df2426766755999828..638ff186f17a2eceddcca29a2ab5bbf721cc5c4f 100644
--- a/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot
+++ b/SOL005/NSDManagement-API/IndividualPnfDescriptor.robot
@@ -13,7 +13,7 @@ GET Individual PNF Descriptor Information
     ...    Test title: GET Individual PNF Descriptor Information
     ...    Test objective: The objective is to test the retrieval of an individual PNF Descriptor information and perform a JSON schema validation of the collected data structure
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -28,7 +28,7 @@ GET Individual PNF Descriptor Information with invalid resource identifier
     ...    Test title: GET Individual PNF Descriptor Information with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual PNF Descriptor Information fails when using an invalid resource identifier
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ Update Individual PNF Descriptor
     ...    Test title: Update Individual PNF Descriptor
     ...    Test objective: The objective is to test the update of an individual PNF Descriptor and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNF Descriptor is modified according to the update request
@@ -55,7 +55,7 @@ Update Individual PNF Descriptor with HTTP Etag precondition failure
     ...    Test title:  Update Individual PNF Descriptor with HTTP Etag precondition failure
     ...    Test objective: The objective is to test that the update of a PNF Descriptor fails due to a precondition failure when using an uncorrect Http Etag identified.
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ Update Individual PNF Descriptor with HTTP Conditional Request Not Supported Pre
     ...    Test title:  Update Individual PNF Descriptor with HTTP Conditional Request Not Supported Precondition Failure
     ...    Test objective: The objective is to test that the update of a PNF Descriptor fails due to the API Producer not supporting "Last-Modified" and "ETag" HTTP Headers
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.6.3.4, 4.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.6.3.4, 4.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: API Producer does not support "Last-Modified" and "ETag" HTTP Headers
     ...    Post-Conditions: none
@@ -79,7 +79,7 @@ POST Individual PNF Descriptor - Method not implemented
     ...    Test title: POST Individual PNF Descriptor - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new PNF Descriptor
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -91,7 +91,7 @@ PUT Individual PNF Descriptor - Method not implemented
     ...    Test title: PUT Individual PNF Descriptor - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a new PNF Descriptor
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -103,7 +103,7 @@ DELETE Individual PNF Descriptor
     ...    Test title:  DELETE Individual PNF Descriptor
     ...    Test objective: The objective is to test the deletion of an individual PNF Descriptor.
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNF Descriptor is not available anymore in the NFVO 
@@ -116,7 +116,7 @@ Update Individual PNF Descriptor with permitted authorization scope
     ...    Test title: Update Individual PNF Descriptor with permitted authorization scope
     ...    Test objective: The objective is to test the update of an individual PNF Descriptor with permitted authorization scope
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNF Descriptor is modified according to the update request
@@ -130,7 +130,7 @@ Update Individual PNF Descriptor with not permitted authorization scope
     ...    Test title: Update Individual PNF Descriptor with not permitted authorization scope
     ...    Test objective: The objective is to test that the update of an individual PNF Descriptor fails when using not permitted authorization scope
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNF Descriptor is modified according to the update request
diff --git a/SOL005/NSDManagement-API/IndividualSubscription.robot b/SOL005/NSDManagement-API/IndividualSubscription.robot
index baf663bfeedf5e242ae6b876f0e49d48676fbb44..622952e6fe2c2d72cffa0e5d8301732b65ba867e 100644
--- a/SOL005/NSDManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSDManagement-API/IndividualSubscription.robot
@@ -12,7 +12,7 @@ GET Individual NSD Management Subscription
     ...    Test title: GET Individual NSD Management Subscription
     ...    Test objective: The objective is to test the retrieval of individual NSD Management subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -27,7 +27,7 @@ GET Individual NSD Management Subscription with invalid resource identifier
     ...    Test title: GET Individual NSD Management Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual NSD Management subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ DELETE Individual NSD Management Subscription with invalid resource identifier
     ...    Test title: DELETE Individual NSD Management Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual NSD Management subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -52,7 +52,7 @@ POST Individual NSD Management Subscription - Method not implemented
     ...    Test title: POST Individual NSD Management Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new NSD Management Subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PUT Individual NSD Management Subscription - Method not implemented
     ...    Test title: PUT Individual NSD Management Subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing NSD Management subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ PATCH Individual NSD Management Subscription - Method not implemented
     ...    Test title: PATCH Individual NSD Management Subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing NSD Management subscription
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ DELETE Individual NSD Management Subscription
     ...    Test title: DELETE Individual NSD Management Subscription
     ...    Test objective: The objective is to test the deletion of an individual NSD Management subscription
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD Management Subscription is not available anymore in the NFVO    
@@ -101,7 +101,7 @@ GET Individual NSD Management Subscription with permitted authorization scope
     ...    Test title: GET Individual NSD Management Subscription with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of individual NSD Management subscription with permitted authorization scope
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -116,7 +116,7 @@ GET Individual NSD Management Subscription with not permitted authorization scop
     ...    Test title: GET Individual NSD Management Subscription with not permitted authorization scope
     ...    Test objective: The objective is to test that the retrieval of individual NSD Management subscription fails when not permitted authorization scope
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/NSD.robot b/SOL005/NSDManagement-API/NSD.robot
index f0a9a3a855cf305f315f18cd0ed9a9582d8255ff..717e099658224f31aa919de70525ec9a9b843e9e 100644
--- a/SOL005/NSDManagement-API/NSD.robot
+++ b/SOL005/NSDManagement-API/NSD.robot
@@ -12,7 +12,7 @@ Get single file NSD in Plain Format
     ...    Test title: Get single file NSD in Plain Format
     ...    Test objective: The objective is to test the retrieval of the NSD in plain format within a NSD archive and perform a validation that returned content is in plain format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NSD is implemented as a single file
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ Get NSD in Zip Format
     ...    Test title: Get NSD in Zip Format
     ...    Test objective: The objective is to test the retrieval of the NSD in zip format within a NSD archive and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ Get single file NSD in Plain or Zip Format
     ...    Test title: Get single file NSDin Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the single file NSD within a NSD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that response is in Plain or Zip format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NSD is implemented as a single file
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ Get multi file NSD in Plain or Zip Format
     ...    Test title: Get multi file NSD in Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the multi file NSD within a NSD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NSD is implemented as a multi file
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ Get multi file NSD in Plain Format
     ...    Test title: Get multi file NSD in Plain Format
     ...    Test objective: The objective is to test that the retrieval of the multi file NSD within a NSD archive fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NSD is implemented as a multi file
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ Get NSD Content with invalid resource identifier
     ...    Test title: Get NSD Content with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of the NSD within a NSD archive fails when using an invalid resource identifier
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ Get NSD with conflict due to onboarding state
     ...    Test title: Get NSD with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of the NSD within a NSD archive fails due to a conflict when the NSD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the NSD is different from ONBOARDED.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -103,7 +103,7 @@ Get NSD with security information
     ...    Test title: Get NSD with security information
     ...    Test objective: The objective is to test the retrieval of the NSD within a NSD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -116,7 +116,7 @@ POST NSD - Method not implemented
     ...    Test title: POST NSD - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4a.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4a.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -128,7 +128,7 @@ PUT NSD - Method not implemented
     ...    Test title: PUT NSD - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -140,7 +140,7 @@ PATCH NSD - Method not implemented
     ...    Test title: PATCH NSD - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4a.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4a.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -152,7 +152,7 @@ DELETE NSD - Method not implemented
     ...    Test title: DELETE NSD - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4a.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4a.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -164,7 +164,7 @@ Get single file NSD in Plain Format with permitted authorization scope
     ...    Test title: Get single file NSD in Plain Format with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of the NSD in plain format within a NSD archive with permitted authorization scope
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NSD is implemented as a single file
     ...    Post-Conditions: none
@@ -177,7 +177,7 @@ Get single file NSD in Plain Format with not permitted authorization scope
     ...    Test title: Get single file NSD in Plain Format with not permitted authorization scope
     ...    Test objective: The objective is to test that the retrieval of the NSD in plain format within a NSD archive fails when using a not permitted authorization scope
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NSD is implemented as a single file
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/NSDArchiveContent.robot b/SOL005/NSDManagement-API/NSDArchiveContent.robot
index f14230a009ce60c9f5726f9c1005ee1deca92f19..e25bbbb20cbabe9a3d92039067022d771b52fa96 100644
--- a/SOL005/NSDManagement-API/NSDArchiveContent.robot
+++ b/SOL005/NSDManagement-API/NSDArchiveContent.robot
@@ -24,7 +24,7 @@ Get NSD Content in Zip Format
     ...    Test title: Get NSD Content in Zip Format
     ...    Test objective: The objective is to test the retrieval of the NSD Content in zip format and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -70,7 +70,7 @@ Get NSD Content with invalid resource identifier
     ...    Test title: Get NSD Content with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of the NSD Content fails when using an invalid resource identifier
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -83,7 +83,7 @@ Get NSD Content with conflict due to onboarding state
     ...    Test title: Get NSD Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of the NSD Content fails due to a conflict when the NSD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the NSD for which the NSD Content is requested is different from ONBOARDED.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -96,7 +96,7 @@ GET NSD Content with Range Request and NFVO supporting Range Requests
     ...    Test title: GET NSD Content with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the retrieval of NSD Content when using a range request to return single range of bytes from the file, with the NFVO supporting it. The test also perform a validation that returned content matches the issued range
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the NSD file
     ...    Post-Conditions: none
@@ -111,7 +111,7 @@ GET NSD Content with Range Request and NFVO not supporting Range Requests
     ...    Test title: GET NSD Content with Range Request and NFVO not supporting Range Requests
     ...    Test objective: The objective is to test that the retrieval of NSD Content, when using a range request to return single range of bytes from the file and the NFVO not supporting it, returns the full NSD file.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support range requests to return single range of bytes from the NSD file
     ...    Post-Conditions: none    
@@ -124,7 +124,7 @@ GET NSD Content with invalid Range Request
     ...    Test title: GET NSD Content with invalid Range Request
     ...    Test objective: The objective is to test that the retrieval of NSD Content fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports range requests to return single range of bytes from the NSD file
     ...    Post-Conditions: none      
@@ -137,7 +137,7 @@ Upload NSD Content as Zip file in asynchronous mode
     ...    Test title: Upload NSD Content as Zip file in asynchronous mode
     ...    Test objective: The objective is to test the upload of an NSD Content in Zip format when the NFVO supports the asynchronous upload mode.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the upload of NSD contents in asynchronous mode
     ...    Post-Conditions: NSD Uploaded
@@ -161,7 +161,7 @@ Upload NSD Content as Zip file in synchronous mode
     ...    Test title: Upload NSD Content as Zip file in synchronous mode
     ...    Test objective: The objective is to test the upload of an NSD Content in Zip format when the NFVO supports the synchronous upload mode.
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the upload of NSD contents in synchronous mode
     ...    Post-Conditions: The NSD content is successfully uploaded and available in the NFVO
@@ -185,7 +185,7 @@ Upload NSD Content with conflict due to onboarding state
     ...    Test title: Upload NSD Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the upload of the NSD Content fails due to a conflict when the NSD is not in onboarding state CREATED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the NSD for which the NSD Content is requested is different from ONBOARDED.
-    ...    Reference: Clause 5.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -198,7 +198,7 @@ POST NSD Content - Method not implemented
     ...    Test title: POST NSD Content - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -210,7 +210,7 @@ PATCH NSD Content - Method not implemented
     ...    Test title: PATCH NSD Content - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -222,7 +222,7 @@ DELETE NSD Content - Method not implemented
     ...    Test title: DELETE NSD Content - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -234,7 +234,7 @@ Upload NSD Content as Zip file in synchronous mode with permitted authorization
     ...    Test title: Upload NSD Content as Zip file in synchronous mode  with permitted authorization scope
     ...    Test objective: The objective is to test the upload of an NSD Content in Zip format with permitted authorization scope
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the upload of NSD contents in synchronous mode
     ...    Post-Conditions: The NSD content is successfully uploaded and available in the NFVO
@@ -247,7 +247,7 @@ Upload NSD Content as Zip file in synchronous mode with not permitted authorizat
     ...    Test title: Upload NSD Content as Zip file in synchronous mode with not permitted authorization scope
     ...    Test objective: The objective is to test that the upload of an NSD Content in Zip format fails when using a not permitted authorization scope
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the upload of NSD contents in synchronous mode
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/NSDArchiveManifest.robot b/SOL005/NSDManagement-API/NSDArchiveManifest.robot
index 9e47bb997338e48f6975ceff9a98c4000546cd62..1655d8fcedc29513b68d59405b090e52448d2f63 100644
--- a/SOL005/NSDManagement-API/NSDArchiveManifest.robot
+++ b/SOL005/NSDManagement-API/NSDArchiveManifest.robot
@@ -12,7 +12,7 @@ Get NSD Archive Manifest
     ...    Test title: Get NSD Archive Manifest
     ...    Test objective: The objective is to test that GET method reads the content of the manifest file within an NSD archive
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ Get NSD Archive Manifest with security information
     ...    Test title: Get NSD Archive Manifest with security information
     ...    Test objective: The objective is to test the retrieval of content of the manifest file within an NSD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ Get NSD Archive Manifest with conflict due to onboarding state
     ...    Test title: Get NSD Archive Manifest with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of content of the manifest file within an NSD archive fails due to a conflict when the NSD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the NSD is different from ONBOARDED.
-    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -51,7 +51,7 @@ POST NSD Archive Manifest - Method not implemented
     ...    Test title: POST NSD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4b.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4b.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ PUT NSD Archive Manifest - Method not implemented
     ...    Test title: PUT NSD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4b.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4b.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ PATCH NSD Archive Manifest - Method not implemented
     ...    Test title: PATCH NSD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4b.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4b.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -87,7 +87,7 @@ DELETE NSD Archive Manifest - Method not implemented
     ...    Test title: DELETE NSD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4b.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4b.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -99,7 +99,7 @@ Get NSD Archive Manifest with permitted authorization scope
     ...    Test title: Get NSD Archive Manifest with permitted authorization scope
     ...    Test objective: The objective is to test that GET method reads the content of the manifest file within an NSD archive with permitted authorization scope
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -112,7 +112,7 @@ Get NSD Archive Manifest with not permitted authorization scope
     ...    Test title: Get NSD Archive Manifest with not permitted authorization scope
     ...    Test objective: The objective is to test that GET method reads the content of the manifest file within an NSD archive fails when using not permitted authorization scope
     ...    Pre-conditions: One or more NSDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/NotificationEndpoint.robot b/SOL005/NSDManagement-API/NotificationEndpoint.robot
index f5a4fc5d8529575c3008fe5210c8d76261609d41..06b8e7421957ee4dbb37199a7c24de69c5fa76c1 100644
--- a/SOL005/NSDManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSDManagement-API/NotificationEndpoint.robot
@@ -14,7 +14,7 @@ NSD Onboarding Notification
     ...    Test title: NSD Onboarding Notification
     ...    Test objective: The objective is to test that NSD Onboarding Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A NSD management subscription for onboarding notification is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -26,7 +26,7 @@ NSD Onboarding Failure Notification
     ...    Test title: NSD Onboarding Failure Notification
     ...    Test objective: The objective is to test that NSD Onboarding Failure Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A NSD management subscription for onboarding failure notification is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -38,7 +38,7 @@ NSD Change Notification
     ...    Test title: NSD Change Notification
     ...    Test objective: The objective is to test that NSD Change Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A NSD management subscription for change notification is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -50,7 +50,7 @@ NSD Deletion Notification
     ...    Test title: NSD Deletion Notification
     ...    Test objective: The objective is to test that NSD Deletion Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A NSD management subscription for deletion notification is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -62,7 +62,7 @@ Pnfd Onboarding Notification
     ...    Test title: Pnfd Onboarding Notification
     ...    Test objective: The objective is to test that Pnfd Onboarding Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A Pnfd management subscription for onboarding notification is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -74,7 +74,7 @@ Pnfd Onboarding Failure Notification
     ...    Test title: Pnfd Onboarding Failure Notification
     ...    Test objective: The objective is to test that Pnfd Onboarding Failure Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A Pnfd management subscription for onboarding failure notification is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -86,7 +86,7 @@ Pnfd Deletion Notification
     ...    Test title: pnfd Deletion Notification
     ...    Test objective: The objective is to test that Pnfd Deletion Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A Pnfd management subscription for deletion notification is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSDManagement-API/Notifications.robot b/SOL005/NSDManagement-API/Notifications.robot
index 35b85aa94f31f3ce0eb25a114bf44a0bca89b400..e72a4659a268707406ae9ee96eb729c793b9d325 100644
--- a/SOL005/NSDManagement-API/Notifications.robot
+++ b/SOL005/NSDManagement-API/Notifications.robot
@@ -15,7 +15,7 @@ NSD Onboarding Notification
     ...    Test title: NSD Onboarding Notification
     ...    Test objective: The objective is to test the dispatch of NSD Onboarding notification when the NSD onboarding operation is successfully completed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NSD management subscription for onboarding notifications is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -28,7 +28,7 @@ NSD Onboarding Failure Notification
     ...    Test title: NSD Onboarding Failure Notification
     ...    Test objective: The objective is to test the dispatch of NSD Onboarding failure notification when the NSD onboarding operation fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NSD management subscription for onboarding failure notifications is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -41,7 +41,7 @@ NSD Operational State Change Notification
     ...    Test title: NSD Operational State Change Notification
     ...    Test objective: The objective is to test the dispatch of NSD Operational State Change notification when the NSD operational status change in the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NSD management subscription for operational state change notifications is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -54,7 +54,7 @@ NSD Deletion Notification
     ...    Test title: NSD Deletion Notification
     ...    Test objective: The objective is to test the dispatch of NSD Deletion notification when the NSD is deleted from the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A NSD management subscription for deletion notifications is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ PNFD Onboarding Notification
     ...    Test title: PNFD Onboarding Notification
     ...    Test objective: The objective is to test the dispatch of PNFD Onboarding notification when the PNFD onboarding operation is successfully completed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A PNFD management subscription for onboarding notifications is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -80,7 +80,7 @@ PNFD Onboarding Failure Notification
     ...    Test title: PNFD Onboarding Failure Notification
     ...    Test objective: The objective is to test the dispatch of PNFD Onboarding failure notification when the PNFD onboarding operation fails, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A PNFD management subscription for onboarding failure notifications is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -93,7 +93,7 @@ PNFD Deletion Notification
     ...    Test title: PNFD Deletion Notification
     ...    Test objective: The objective is to test the dispatch of PNFD Deletion notification when the PNFD is deleted from the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A PNFD management subscription for deletion notifications is available in the NFVO.
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/PNFD.robot b/SOL005/NSDManagement-API/PNFD.robot
index d39fd0bf506127f3bb8f166078029bc83b97ee41..181d2abf87a2a3ecd4e2f400cbaeac11e6b8c30b 100644
--- a/SOL005/NSDManagement-API/PNFD.robot
+++ b/SOL005/NSDManagement-API/PNFD.robot
@@ -13,7 +13,7 @@ Get single file PNFD in Plain Format
     ...    Test title: Get single file PNFD in Plain Format
     ...    Test objective: The objective is to test the retrieval of the PNFD in plain format within a PNFD archive and perform a validation that returned content is in plain format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The PNFD is implemented as a single file
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ Get PNFD in Zip Format
     ...    Test title: Get PNFD in Zip Format
     ...    Test objective: The objective is to test the retrieval of the PNFD in zip format within a PNFD archive and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ Get single file PNFD in Plain or Zip Format
     ...    Test title: Get single file PNFDin Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the single file PNFD within a PNFD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that response is in Plain or Zip format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The PNFD is implemented as a single file
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ Get multi file PNFD in Plain or Zip Format
     ...    Test title: Get multi file PNFD in Plain or Zip Format
     ...    Test objective: The objective is to test the retrieval of the multi file PNFD within a PNFD archive when requesting Plain or Zip format to NFVO by including both formats in the request, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The PNFD is implemented as a multi file
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ Get multi file PNFD in Plain Format
     ...    Test title: Get multi file PNFD in Plain Format
     ...    Test objective: The objective is to test that the retrieval of the multi file PNFD within a PNFD archive fails when requesting it in Plain format, and perform a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The PNFD is implemented as a multi file
     ...    Post-Conditions: none
@@ -78,7 +78,7 @@ Get PNFD Content with invalid resource identifier
     ...    Test title: Get PNFD Content with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of the PNFD within a PNFD archive fails when using an invalid resource identifier
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -91,7 +91,7 @@ Get PNFD with conflict due to onboarding state
     ...    Test title: Get PNFD with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of the PNFD within a PNFD archive fails due to a conflict when the PNFD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the PNFD is different from ONBOARDED.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -104,7 +104,7 @@ Get PNFD with security information
     ...    Test title: Get PNFD with security information
     ...    Test objective: The objective is to test the retrieval of the PNFD within a PNFD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -117,7 +117,7 @@ POST PNFD - Method not implemented
     ...    Test title: POST PNFD - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new PNFD
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7a.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7a.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ PUT PNFD - Method not implemented
     ...    Test title: PUT PNFD - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update PNFD
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7a.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7a.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -141,7 +141,7 @@ PATCH PNFD - Method not implemented
     ...    Test title: PATCH PNFD - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update PNFD
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7a.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7a.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -153,7 +153,7 @@ DELETE PNFD - Method not implemented
     ...    Test title: DELETE PNFD - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete PNFD
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7a.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7a.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -165,7 +165,7 @@ Get single file PNFD in Plain Format with permitted authorization scope
     ...    Test title: Get single file PNFD in Plain Format with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of the PNFD in plain format within a PNFD archive with permitted authorization scope
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The PNFD is implemented as a single file
     ...    Post-Conditions: none
@@ -178,7 +178,7 @@ Get single file PNFD in Plain Format with not permitted authorization scope
     ...    Test title: Get single file PNFD in Plain Format with not permitted authorization scope
     ...    Test objective: The objective is to test that the retrieval of the PNFD in plain format within a PNFD archive fails when using a not permitted authorization scope
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The PNFD is implemented as a single file
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/PNFDArchiveContent.robot b/SOL005/NSDManagement-API/PNFDArchiveContent.robot
index 7605003a8b9e0665f10cb5d6501b29ed1fbd42c7..9416ab4caef471f98f20f95b622a5bdbaccf9705 100644
--- a/SOL005/NSDManagement-API/PNFDArchiveContent.robot
+++ b/SOL005/NSDManagement-API/PNFDArchiveContent.robot
@@ -13,7 +13,7 @@ Get PNFD Content
     ...    Test title: Get PNFD Content
     ...    Test objective: The objective is to test the retrieval of the PNFD Content in zip format and perform a validation that returned content is in plain format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ Get PNFD Content with invalid resource identifier
     ...    Test title: Get PNFD Content with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of the PNFD Content fails when using an invalid resource identifier
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ Get PNFD Content with conflict due to onboarding state
     ...    Test title: Get PNFD Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of the PNFD Content fails due to a conflict when the PNFD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the PNFD for which the PNFD Content is requested is different from ONBOARDED.
-    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -52,7 +52,7 @@ Upload PNFD Content as zip file
     ...    Test title: Upload PNFD Content as zip file
     ...    Test objective: The objective is to test the upload of a PNFD Content in plain text format.
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The uploaded PNFD content is available in the NFVO
@@ -65,7 +65,7 @@ Upload PNFD Content with conflict due to onboarding state
     ...    Test title: Upload PNFD Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the upload of the PNFD Content fails due to a conflict when the PNFD is not in onboarding state CREATED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the PNFD for which the PNFD Content is requested is different from CREATED.
-    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -78,7 +78,7 @@ POST PNFD Content - Method not implemented
     ...    Test title: POST PNFD Content - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new PNF Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ PATCH PNFD Content - Method not implemented
     ...    Test title: PATCH PNFD Content - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update PNF Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -102,7 +102,7 @@ DELETE PNFD Content - Method not implemented
     ...    Test title: DELETE PNFD Content - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete PNF Descriptor content
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -114,7 +114,7 @@ Get PNFD Content with Range Request and NFVO supporting Range Requests
     ...    Test title: Get PNFD Content with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the retrieval of the PNFD Content in plain format when using a range request to return single range of bytes from the file, with the NFVO supporting it
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -128,7 +128,7 @@ Get PNFD Content with invalid Range Request
     ...    Test title: Get PNFD Content with invalid Range Request
     ...    Test objective: The objective is to test the retrieval of the PNFD Content in plain format and perform a validation that returned content is in plain format
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -141,7 +141,7 @@ Upload PNFD Archive Content
     ...    Test title: Upload PNFD Archive Content
     ...    Test objective: The objective is to test the PNFD archive has been accepted for uploading, but the processing has not been completed.
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -154,7 +154,7 @@ Upload PNFD Content as zip file with permitted authorization scope
     ...    Test title: Upload PNFD Content as zip file with permitted authorization scope
     ...    Test objective: The objective is to test the upload of a PNFD Content in zip format with permitted authorization scope.
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The uploaded PNFD content is available in the NFVO
@@ -167,7 +167,7 @@ Upload PNFD Content as zip file with not permitted authorization scope
     ...    Test title: Upload PNFD Content as zip file with not permitted authorization scope
     ...    Test objective: The objective is to test the upload of a PNFD Content in zip format fails when using not permitted authorization scope.
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: noe
diff --git a/SOL005/NSDManagement-API/PNFDArchiveManifest.robot b/SOL005/NSDManagement-API/PNFDArchiveManifest.robot
index a069715f0db2a23b70897ccddf5fa3a481ff2228..46dc4dafb7a6a39165986caf5de58e0c8f5921dd 100644
--- a/SOL005/NSDManagement-API/PNFDArchiveManifest.robot
+++ b/SOL005/NSDManagement-API/PNFDArchiveManifest.robot
@@ -12,7 +12,7 @@ Get PNFD Archive Manifest
     ...    Test title: Get PNFD Archive Manifest
     ...    Test objective: The objective is to test that GET method reads the content of the manifest file within an PNFD archive
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ Get PNFD Archive Manifest with security information
     ...    Test title: Get PNFD Archive Manifest with security information
     ...    Test objective: The objective is to test the retrieval of content of the manifest file within an PNFD archive shall include in the ZIP archive the security information when requested with "include_signature" parameter
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ Get PNFD Archive Manifest with conflict due to onboarding state
     ...    Test title: Get PNFD Archive Manifest with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of content of the manifest file within an PNFD archive fails due to a conflict when the PNFD is not in onboarding state ONBOARDED in the NFVO. The test also performs a validation of the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: The onboarding state of the PNFD is different from ONBOARDED.
-    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -51,7 +51,7 @@ POST PNFD Archive Manifest - Method not implemented
     ...    Test title: POST PNFD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7b.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7b.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ PUT PNFD Archive Manifest - Method not implemented
     ...    Test title: PUT PNFD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7b.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7b.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ PATCH PNFD Archive Manifest - Method not implemented
     ...    Test title: PATCH PNFD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7b.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7b.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -87,7 +87,7 @@ DELETE PNFD Archive Manifest - Method not implemented
     ...    Test title: DELETE PNFD Archive Manifest - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete Network Service Descriptor Archive Manifest
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7b.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7b.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -99,7 +99,7 @@ Get PNFD Archive Manifest with permitted authorization scope
     ...    Test title: Get PNFD Archive Manifest with permitted authorization scope
     ...    Test objective: The objective is to test that GET method reads the content of the manifest file within an PNFD archive with permitted authorization scope
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -112,7 +112,7 @@ Get PNFD Archive Manifest with not permitted authorization scope
     ...    Test title: Get PNFD Archive Manifest with not permitted authorization scope
     ...    Test objective: The objective is to test that GET method to read the content of the manifest file within an PNFD archive fails when a not permitted authorization scope
     ...    Pre-conditions: One or more PNFDs are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.7b.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/PNFDescriptors.robot b/SOL005/NSDManagement-API/PNFDescriptors.robot
index f79b7a455835b3878fe8e6f5245808c61d707748..63d2c52080b2c98d2cedf1efe188d18f0b55695a 100644
--- a/SOL005/NSDManagement-API/PNFDescriptors.robot
+++ b/SOL005/NSDManagement-API/PNFDescriptors.robot
@@ -13,7 +13,7 @@ GET all PNF Descriptors Information
     ...    Test title: GET all PNF Descriptors Information
     ...    Test objective: The objective is to test the retrieval of all the PNF Descriptors information and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ GET PNF Descriptors Information with attribute-based filter
     ...    Test title: GET PNF Descriptors Information with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of PNF Descriptors information using attribute-based filter, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ GET PNF Descriptors Information with invalid attribute-based filter
     ...    Test title: GET PNF Descriptors Information with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of PNF Descriptors information fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ GET all PNF Descriptors Information with "all_fields" attribute selector
     ...    Test title: GET all PNF Descriptors Information with "all_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all PNF Descriptors Information with "all_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "all_fileds" selector
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ GET all PNF Descriptors Information with "exclude_default" attribute selector
     ...    Test title: GET all PNF Descriptors Information with "exclude_default" attribute selector
     ...    Test objective: The objective is to test the retrieval of all PNF Descriptors Information with "exclude_default" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_default" selector
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -81,7 +81,7 @@ GET all PNF Descriptors Information with "fields" attribute selector
     ...    Test title: GET all PNF Descriptors Information with "fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all PNF Descriptors Information with "fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "fields" selector
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "fields" attribute selector
     ...    Post-Conditions: none
@@ -95,7 +95,7 @@ GET all PNF Descriptors Information with "exclude_fields" attribute selector
     ...    Test title: GET all PNF Descriptors Information with "exclude_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all PNF Descriptors Information with "exclude_fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_fields" selector
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "exclude_fields" attribute selector
     ...    Post-Conditions: none
@@ -109,7 +109,7 @@ Create new PNF Descriptor Resource
     ...    Test title:  Create new PNF Descriptor Resource
     ...    Test objective: The objective is to test the creation of a new Create new PNF Descriptor resource and perform the JSON schema validation of the returned structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNF Descriptor resource is successfully created on the NFVO
@@ -124,7 +124,7 @@ PUT all PNF Descriptors - Method not implemented
     ...    Test title: PUT all PNF Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify PNF Descriptors Information
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -136,7 +136,7 @@ PATCH all PNF Descriptors - Method not implemented
     ...    Test title: PATCH all PNF Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update NF Descriptors Information
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -148,7 +148,7 @@ DELETE all PNF Descriptors - Method not implemented
     ...    Test title: DELETE all PNF Descriptors Information - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete PNF Descriptors Information
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -160,7 +160,7 @@ GET all PNF Descriptors Information as Paged Response
     ...    Test title: GET all PNF Descriptors Information as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the PNF Descriptors information as a Paged Response.
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -173,7 +173,7 @@ GET PNF Descriptors Information - Bad Request Response too Big
     ...    Test title: GET PNF Descriptors Information - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of PNF Descriptors information fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -186,7 +186,7 @@ GET all PNF Descriptors Information with "exclude_default" and "fields" attribut
     ...    Test title: GET all PNF Descriptors Information with "exclude_default" and "fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of all PNF Descriptors Information with "exclude_default" and "fields" attribute selector, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued "exclude_default" and "fields" selector
     ...    Pre-conditions: One or more PNF Descriptors are onboarded in the NFVO.
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the use of "exclude_default" and "fields" attribute selector
     ...    Post-Conditions: none
@@ -200,7 +200,7 @@ Create new PNF Descriptor Resource with permitted authorization scope
     ...    Test title:  Create new PNF Descriptor Resource with permitted authorization scope
     ...    Test objective: The objective is to test the creation of a new Create new PNF Descriptor resource with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The PNF Descriptor resource is successfully created on the NFVO
@@ -215,7 +215,7 @@ Create new PNF Descriptor Resource with not permitted authorization scope
     ...    Test title:  Create new PNF Descriptor Resource with not permitted authorization scope
     ...    Test objective: The objective is to test that the creation of a new Create new PNF Descriptor resource fails when using not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSDManagement-API/Subscriptions.robot b/SOL005/NSDManagement-API/Subscriptions.robot
index bbe5044a87ce978a94b4e2614cd8df21e0915dd1..f1d9bcd6473f5133d11d59394dda4d74b27ce0d7 100644
--- a/SOL005/NSDManagement-API/Subscriptions.robot
+++ b/SOL005/NSDManagement-API/Subscriptions.robot
@@ -15,7 +15,7 @@ Get All NSD Management Subscriptions
     ...    Test title: Get All NSD Management Subscriptions
     ...    Test objective: The objective is to test the retrieval of all NSD Management subscriptions and perform a JSON schema validation of the returned subscriptions data structure
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -28,7 +28,7 @@ Get NSD Management Subscriptions with attribute-based filter
     ...    Test title: Get NSD Management Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of NSD Management subscriptions using attribute-based filter, perform a JSON schema validation of the collected data structure, and verify that the retrieved information matches the issued attribute-based filters 
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -42,7 +42,7 @@ Get NSD Management Subscriptions with invalid attribute-based filter
     ...    Test title: Get NSD Management Subscriptions with attribute-based filters
     ...    Test objective: The objective is to test that the retrieval of NSD Management subscriptions fails when using invalid attribute-based filters, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -55,7 +55,7 @@ GET NSD Management Subscription with invalid resource endpoint
     ...    Test title: GET NSD Management Subscription with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of all NSD Management subscriptions fails when using invalid resource endpoint.
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -68,7 +68,7 @@ Create new NSD Management subscription
     ...    Test title: Create new NSD Management subscription
     ...    Test objective: The objective is to test the creation of a new NSD Management subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD Management subscription is successfully set and it matches the issued subscription
@@ -84,7 +84,7 @@ Create duplicated NSD Management subscription with NFVO not creating duplicated
     ...    Test title: Create duplicated NSD Management subscription with NFVO not creating duplicated subscriptions
     ...    Test objective: The objective is to test the attempt of a creation of a duplicated NSD Management subscription and check that no new subscription is created by the NFVO and a link to the original subscription is returned
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO does not support the creation of duplicated subscriptions
     ...    Post-Conditions: The existing NSD Management subscription returned is available in the NFVO
@@ -100,7 +100,7 @@ Create duplicated NSD Management subscription with NFVO creating duplicated subs
     ...    Test title: Create duplicated NSD Management subscription with NFVO creating duplicated subscriptions
     ...    Test objective: The objective is to test the creation of a duplicated NSD Management subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO supports the creation of duplicated subscriptions
     ...    Post-Conditions: The duplicated NSD Management subscription is successfully set and it matches the issued subscription    
@@ -115,7 +115,7 @@ PUT NSD Management Subscriptions - Method not implemented
     ...    Test title: PUT NSD Management Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify NSD Management subscriptions
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -127,7 +127,7 @@ PATCH NSD Management Subscriptions - Method not implemented
     ...    Test title: PATCH NSD Management Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update NSD Management subscriptions
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -139,7 +139,7 @@ DELETE NSD Management Subscriptions - Method not implemented
     ...    Test title: DELETE NSD Management Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete NSD Management subscriptions
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NSD Management subscriptions are not deleted by the failed operation 
@@ -152,7 +152,7 @@ Get All NSD Management Subscriptions as Paged Response
     ...    Test title: Get All NSD Management Subscriptions as Paged Response
     ...    Test objective: The objective is to test the retrieval of all NSD Management subscriptions as a Paged Response.
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -165,7 +165,7 @@ Get NSD Management Subscriptions - Bad Request Response too Big
     ...    Test title: Get NSD Management Subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of NSD Management subscriptions fails because reponse is too big, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -178,7 +178,7 @@ Create new NSD Management subscription - Unprocessable Content
     ...    Test title: Create new NSD Management subscription - Unprocessable Content
     ...    Test objective: The objective is to test the creation of a new NSD Management subscription fials when content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -190,7 +190,7 @@ Get All NSD Management Subscriptions with permitted authorization scope
     ...    Test title: Get All NSD Management Subscriptions with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all NSD Management subscriptions with permitted authorization scope
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -203,7 +203,7 @@ Get All NSD Management Subscriptions with not permitted authorization scope
     ...    Test title: Get All NSD Management Subscriptions with not permitted authorization scope
     ...    Test objective: The objective is to test that the retrieval of all NSD Management subscriptions fails when using a not permitted authorization scope
     ...    Pre-conditions: At least one NSD Management subscription is available in the NFVO.
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
diff --git a/SOL005/NSDManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml b/SOL005/NSDManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml
index f0ef3b27b9303f96fc72ea9909190c3f1cf196a0..92cf5f34ae4bc18534bae23b8a65512f8c067f37 100644
--- a/SOL005/NSDManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml
+++ b/SOL005/NSDManagement-API/descriptors/SOL001/NSD/nsd_SOL001.yaml
@@ -27,7 +27,7 @@ topology_template:
         flavour_id: "VNF-A_flavor"
         flavour_description: "VNF-A flavor"
         vnfm_info: 
-          - 'etsivnfm:v2.3.1'
+          - 'etsivnfm:v5.1.1'
       requirements:
         virtualLink:
           ext_a_right: "vl_right"
@@ -47,7 +47,7 @@ topology_template:
         flavourId: "VNF-B_flavor"
         flavourDescription: "VNF-B flavor"
         vnfm_info: 
-          - 'etsivnfm:v4.5.1'
+          - 'etsivnfm:v5.1.1'
       requirements:
         virtualLink:
           ext_b_left: "vl_left"