diff --git a/SOL005/VNFPackageManagement-API/AccessConfigurationForExternalArtifacts.robot b/SOL005/VNFPackageManagement-API/AccessConfigurationForExternalArtifacts.robot
index 2bfc5170428268dbb3b8a112b0a7c0acbb782837..8b631c345fc7b9bcd80533a2217a46de3ddce86c 100644
--- a/SOL005/VNFPackageManagement-API/AccessConfigurationForExternalArtifacts.robot
+++ b/SOL005/VNFPackageManagement-API/AccessConfigurationForExternalArtifacts.robot
@@ -11,7 +11,7 @@ Get Access configuration for external artifacts
     ...    Test title: Get Access configuration for external artifacts
     ...    Test objective: The objective is to test the GET method reads the access configuration information that is used by the NFVO to get the content of external VNF package artifacts and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4a.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 Access configuration for external artifacts - Not Found
     ...    Test title: Get Access configuration for external artifacts - Not Found
     ...    Test objective: The objective is to test that the retrieval of access configuration information that is used by the NFVO to get the content of external VNF package artifacts fails because resource is not present.
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4a.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 @@ PUT Access configuration for external artifacts
     ...    Test title: Access configuration for external artifacts
     ...    Test objective: The objective is to test that PUT method provides the access configuration information for the NFVO to download the content of external VNF package artifacts.
     ...    Pre-conditions:  the individual VNF package resource shall have been created, and the value of "onboardingState" attribute shall equal to "CREATED" or "ERROR"
-    ...    Reference: Clause 9.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ PUT Access configuration for external artifacts - Downloading
     ...    Test title: Access configuration for external artifacts - Downloading
     ...    Test objective: The objective is to test that VNF package has been uploaded successfully previously, to indicate that the access configuration information has been stored successfully by the NFVO and the NFVO now starts downloading external artifacts.
     ...    Pre-conditions:  the individual VNF package resource shall have been created, and the value of "onboardingState" attribute shall equal to "CREATED" or "ERROR"
-    ...    Reference: Clause 9.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PUT Access configuration for external artifacts - Conflict
     ...    Test title: Access configuration for external artifacts
     ...    Test objective: The objective is to test that PUT method provides the access configuration information for the NFVO to download the content of external VNF package artifacts.
     ...    Pre-conditions:  the individual VNF package resource shall have been created, and the value of "onboardingState" attribute is neither "CREATED" nor "ERROR"
-    ...    Reference: Clause 9.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4a.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ POST Access configuration for external artifacts - Method not implemented
     ...    Test title: POST Access configuration for external artifacts - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create access configuration for external artifacts
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.4a.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4a.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ PATCH Access configuration for external artifacts - Method not implemented
     ...    Test title: PATCH Access configuration for external artifacts - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update access configuration for external artifacts
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.4a.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4a.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -101,7 +101,7 @@ DELETE Access configuration for external artifacts - Method not implemented
     ...    Test title: DELETE Access configuration for external artifacts - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete access configuration for external artifacts
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.4a.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4a.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -113,7 +113,7 @@ Get Access configuration for external artifacts with permitted authorization sco
     ...    Test title: Get Access configuration for external artifacts with permitted authorization scope
     ...    Test objective: The objective is to test the GET method reads the access configuration information that is used by the NFVO to get the content of external VNF package artifacts with permitted authorization scope
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -126,7 +126,7 @@ Get Access configuration for external artifacts with not permitted authorization
     ...    Test title: Get Access configuration for external artifacts with not permitted authorization scope
     ...    Test objective: The objective is to test that the GET method to read the access configuration information fails when using not permitted authorization scope
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4a.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/VNFPackageManagement-API/IndividualSubscription.robot b/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
index 1a27c4e7730be352b9acabab94ae451a3d42a826..1da33107e6ce81a9cfb78dd160bacec7568e6904 100644
--- a/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualSubscription.robot
@@ -12,7 +12,7 @@ GET Individual VNF Package Subscription
     ...    Test title: GET Individual VNF Package Subscription
     ...    Test objective: The objective is to test the retrieval of individual VNF package subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.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 VNF Package Subscription with invalid resource identifier
     ...    Test title: GET Individual VNF Package Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.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 VNF Package Subscription with invalid resource identifier
     ...    Test title: DELETE Individual VNF Package Subscription with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual VNF package subscription fails when using an invalid resource identifier
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.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 VNF Package Subscription - Method not implemented
     ...    Test title: POST Individual VNF Package Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Package Subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.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 VNF Package Subscription - Method not implemented
     ...    Test title: PUT Individual VNF Package Subscription - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Package subscription
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.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 VNF Package Subscription - Method not implemented
     ...    Test title: PATCH Individual VNF Package Subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF Package subscription
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.9.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.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 VNF Package Subscription
     ...    Test title: DELETE Individual VNF Package Subscription
     ...    Test objective: The objective is to test the deletion of an individual VNF package subscription
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package Subscription is not available anymore in the NFVO    
@@ -101,7 +101,7 @@ GET Individual VNF Package Subscription with permitted authorization scope
     ...    Test title: GET Individual VNF Package Subscription with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of individual VNF package subscription with permitted authorization scope
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.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 VNF Package Subscription with not permitted authorization scope
     ...    Test title: GET Individual VNF Package Subscription with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of individual VNF package subscription fails when using not permitted authorization scope
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.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/VNFPackageManagement-API/IndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
index 3b071cb1dd680eb0cc9d6e1d57e67abb9ed05779..a1db021a511eddd95dfa94f99c2afb0bd184f415 100644
--- a/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualVNFPackage.robot
@@ -11,7 +11,7 @@ GET Individual VNF Package
     ...    Test title: GET Individual VNF Package
     ...    Test objective: The objective is to test the retrieval of an individual VNF package information perform a JSON schema validation of the collected data structure
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.3.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 Individual VNF Package with invalid resource identifier
     ...    Test title: GET Individual VNF Package with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package fails when using an invalid resource identifier
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.3.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 @@ POST Individual VNF Package - Method not implemented
     ...    Test title: POST Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ PUT Individual VNF Package - Method not implemented
     ...    Test title: PUT Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ Disable Individual VNF Package
     ...    Test title: Disable Individual VNF Package  
     ...    Test objective: The objective is to test the disabling of an individual VNF Package  and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO in ENABLED operational state.
-    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package is in operational state DISABLED
@@ -77,7 +77,7 @@ Disable Individual VNF Package with conflict due to operational state DISABLED
     ...    Test title: Disable Individual VNF Package with conflict due to operational state DISABLED
     ...    Test objective: The objective is to test that disabling an individual VNF Package that is already in DISABLED operational state fails and perform a JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO in DISABLED operational state (Test ID 5.3.5.2.5).
-    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -90,7 +90,7 @@ Enable Individual VNF Package
     ...    Test title: Enable Individual VNF Package
     ...    Test objective: The objective is to test the enabling of an individual VNF Package and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO in DISABLED operational state (Test ID 5.3.5.2.5).
-    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package is in operational state ENABLED
@@ -104,7 +104,7 @@ Enable Individual VNF Package with conflict due to operational state ENABLED
     ...    Test title: Enable Individual VNF Package with conflict due to operational state ENABLED
     ...    Test objective: The objective is to test that enabling an individual VNF Package that is already in ENABLED operational state fails and perform a JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO in ENABLED operational state (Test ID 5.3.5.2.7).
-    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -117,7 +117,7 @@ DELETE Individual VNF Package
     ...    Test title: DELETE Individual VNF Package
     ...    Test objective: The objective is to test the deletion of an individual VNF Package
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO in DISABLED operational state
-    ...    Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package is not available anymore in the NFVO 
@@ -130,7 +130,7 @@ DELETE Individual VNF Package in operational state ENABLED
     ...    Test title:  DELETE Individual VNF Package in operational state ENABLED
     ...    Test objective: The objective is to test that the deletion of an individual VNF Package in operational state ENABLED fails. The test also performs a JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: One or more VNF Package are onboarded in the NFVO in ENABLED operational state (Test ID 5.3.1.2.7).
-    ...    Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package is not deleted by the failed operation. 
@@ -144,7 +144,7 @@ DELETE Individual VNF Package used for instantiated VNF instances
     ...    Test title:  DELETE Individual VNF Package used for instantiated VNF instances
     ...    Test objective: The objective is to test that the deletion of an individual VNF Package that is used in instantiated VNF instances fails. The test also performs a JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: One or more VNF instances are instantiated based on the concerned VNF package.
-    ...    Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package is not deleted by the failed operation. 
@@ -158,7 +158,7 @@ Disable Individual VNF Package with permitted authorization scope
     ...    Test title: Disable Individual VNF Package with permitted authorization scope
     ...    Test objective: The objective is to test the disabling of an individual VNF Package with permitted authorization scope
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO in ENABLED operational state.
-    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package is in operational state DISABLED
@@ -172,7 +172,7 @@ Disable Individual VNF Package with not permitted authorization scope
     ...    Test title: Disable Individual VNF Package with not permitted authorization scope
     ...    Test objective: The objective is to test that the disabling of an individual VNF Package fails when using not permitted authorization scope
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO in ENABLED operational state.
-    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot b/SOL005/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
index e776f0254af75c0391457a20fa84c82d8c11e088..348a32cc63add7e6f8193390fc240ad93505d670 100644
--- a/SOL005/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
+++ b/SOL005/VNFPackageManagement-API/IndividualVNFPackageArtifacts.robot
@@ -11,7 +11,7 @@ GET Individual VNF Package Artifact
     ...    Test title: GET Individual VNF Package Artifact
     ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -23,7 +23,7 @@ GET Individual VNF Package Artifact in octet stream format
     ...    Test title: GET Individual VNF Package Artifact in octet stream format
     ...    Test objective: The objective is to test the retrieval of an individual VNF package 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 VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.7.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
@@ -36,7 +36,7 @@ GET Individual VNF Package Artifact with Range Request and NFVO supporting Range
     ...    Test title: GET Individual VNF Package Artifact with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the retrieval of an individual VNF package 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 VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.7.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 VNF package artifact
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ GET Individual VNF Package Artifact with Range Request and NFVO not supporting R
     ...    Test title: GET Individual VNF Package Artifact with Range Request and NFVO not supporting Range Requests
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact, when using a range request to return single range of bytes from the file and the NFVO not supporting it, returns the full VNF Package artifact.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.7.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 VNF package artifact
     ...    Post-Conditions: none    
@@ -62,7 +62,7 @@ GET Individual VNF Package Artifact with invalid Range Request
     ...    Test title: GET Individual VNF Package Artifact with invalid Range Request
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.7.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 VNF package artifact
     ...    Post-Conditions: none      
@@ -74,7 +74,7 @@ GET Individual VNF Package Artifact with invalid resource identifier
     ...    Test title: GET Individual VNF Package Artifact with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails when using an invalid resource identifier
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -87,7 +87,7 @@ GET Individual VNF Package Artifact with conflict due to onboarding state
     ...    Test title: GET Individual VNF Package Artifact with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package artifact fails due to a conflict when the VNF Package 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 VNF package for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -100,7 +100,7 @@ POST Individual VNF Package Artifact - Method not implemented
     ...    Test title: POST Individual VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -112,7 +112,7 @@ PUT Individual VNF Package Artifact - Method not implemented
     ...    Test title: PUT Individual VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -124,7 +124,7 @@ PATCH Individual VNF Package Artifact - Method not implemented
     ...    Test title: PATCH Individual VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -136,7 +136,7 @@ DELETE Individual VNF Package Artifact - Method not implemented
     ...    Test title: DELETE Individual VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -148,7 +148,7 @@ GET Individual VNF Package Artifact with permitted authorization scope
     ...    Test title: GET Individual VNF Package Artifact with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact with permitted authorization scope
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -160,7 +160,7 @@ GET Individual VNF Package Artifact with not permitted authorization scope
     ...    Test title: GET Individual VNF Package Artifact with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of an individual VNF package artifact fails when using not permitted authorization scope
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.7.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/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
index 1815de9bf09f9b64902dabb0e3a77e013b6cedbc..87d165b929eb265e9485143c1041a201f4bb0210 100644
--- a/SOL005/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/ManifestInIndividualVNFPackage.robot
@@ -11,7 +11,7 @@ Get Manifest in Individual VNF Package
     ...    Test title: Get Manifest in Individual VNF Package
     ...    Test objective: The objective is to test that content of manifest within a NVF Package is read successfully.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4b.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 Manifest in Individual VNF Package with security information
     ...    Test title: Get Manifest in Individual VNF Package with security information
     ...    Test objective: The objective is to test the retrieval of the Manifest in individual VNF package shall include in the ZIP archive the security information when requested with "include_signature" parameter, and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4b.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 Manifest in Individual VNF Package - Not Acceptable
     ...    Test title: Get Manifest in Individual VNF Package - Not Acceptable
     ...    Test objective: The objective is to test that the "Accept" header is not compatible with Content type "application/zip" but "incude_signature" is provided.\
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ Get Manifest in Individual VNF Package - Conflict
     ...    Test title: Get Manifest in Individual VNF Package - Conflict
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the resource.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ POST Manifest in Individual VNF Package - Method not implemented
     ...    Test title: POST Manifest in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new Manifest
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.4b.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4b.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ PUT Manifest in Individual VNF Package - Method not implemented
     ...    Test title: PUT Manifest in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a Manifest
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4b.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -87,7 +87,7 @@ PATCH Manifest in Individual VNF Package - Method not implemented
     ...    Test title: PATCH Manifest in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update a Manifest
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4b.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -99,7 +99,7 @@ DELETE Manifest in Individual VNF Package - Method not implemented
     ...    Test title: DELETE Manifest in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a Manifest
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4b.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -111,7 +111,7 @@ Get Manifest in Individual VNF Package with permitted authorization scope
     ...    Test title: Get Manifest in Individual VNF Package with permitted authorization scope
     ...    Test objective: The objective is to test that content of manifest within a NVF Package is read successfully with permitted authorization scope.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -124,7 +124,7 @@ Get Manifest in Individual VNF Package with not permitted authorization scope
     ...    Test title: Get Manifest in Individual VNF Package with not permitted authorization scope
     ...    Test objective: The objective is to test that content of manifest within a NVF Package fails when using not permitted authorization scope.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4b.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.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/VNFPackageManagement-API/NotificationEndpoint.robot b/SOL005/VNFPackageManagement-API/NotificationEndpoint.robot
index edb0d5a56c32f9f0b922681ce295cd8f2647e02a..1c3e46bf7de1ee26628c5f907cbef30e11c4e659 100644
--- a/SOL005/VNFPackageManagement-API/NotificationEndpoint.robot
+++ b/SOL005/VNFPackageManagement-API/NotificationEndpoint.robot
@@ -14,7 +14,7 @@ VNF Package Onboarding Notification
     ...    Test title: VNF Package Onboarding Notification
     ...    Test objective: The objective is to test that VNF Package Onboarding Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF package subscription for onboarding notifications is available in the NFVO.
-    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.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 @@ VNF Package Change Notification
     ...    Test title: VNF Package Change Notification
     ...    Test objective: The objective is to test that VNF Package Change Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF package subscription for change notifications is available in the NFVO.
-    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.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/VNFPackageManagement-API/Notifications.robot b/SOL005/VNFPackageManagement-API/Notifications.robot
index f31ef8dca7b2b1fff2874434416e0ffe150f822f..b7618d1d8f95446ab3c3528986c0d939693a3769 100644
--- a/SOL005/VNFPackageManagement-API/Notifications.robot
+++ b/SOL005/VNFPackageManagement-API/Notifications.robot
@@ -16,7 +16,7 @@ VNF Package Onboarding Notification
     ...    Test title: VNF Package Onboarding Notification
     ...    Test objective: The objective is to test the dispatch of VNF Package Onboarding notification when the VNF package 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 VNF package subscription for onboarding notifications is available in the NFVO.
-    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -29,7 +29,7 @@ VNF Package Operational State Change Notification
     ...    Test title: VNF Package Operational State Change Notification
     ...    Test objective: The objective is to test the dispatch of VNF Package Change notification when the VNF package operational state is modified, 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 VNF package subscription for change notifications is available in the NFVO.
-    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -43,7 +43,7 @@ VNF Package Deletion Notification
     ...    Test title: VNF Package Deletion Notification
     ...    Test objective: The objective is to test the dispatch of VNF Package Change notification when the VNF package is deleted on 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 VNF package subscription for change notifications is available in the NFVO.
-    ...    Reference: Clause 9.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.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/VNFPackageManagement-API/Subscriptions.robot b/SOL005/VNFPackageManagement-API/Subscriptions.robot
index e64445da2319059c7b58450aea861f0e4e733898..e210a47532bcfe15c449b65a90c8843466da0836 100644
--- a/SOL005/VNFPackageManagement-API/Subscriptions.robot
+++ b/SOL005/VNFPackageManagement-API/Subscriptions.robot
@@ -16,7 +16,7 @@ Get All VNF Package Subscriptions
     ...    Test title: GET all VNF Package Subscriptions
     ...    Test objective: The objective is to test the retrieval of all VNF package subscriptions and perform a JSON schema validation of the returned subscriptions data structure
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -29,7 +29,7 @@ Get VNF Package Subscriptions with attribute-based filter
     ...    Test title: Get VNF Package Subscriptions with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF package 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 VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.8.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 @@ Get VNF Package Subscriptions with invalid attribute-based filter
     ...    Test title: Get VNF Package Subscriptions with attribute-based filters
     ...    Test objective: The objective is to test that the retrieval of VNF package 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 VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -56,7 +56,7 @@ GET VNF Package Subscription with invalid resource endpoint
     ...    Test title: GET VNF Package Subscription with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of all VNF package subscriptions fails when using invalid resource endpoint.
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -69,7 +69,7 @@ Create new VNF Package subscription
     ...    Test title: Create new VNF Package subscription
     ...    Test objective: The objective is to test the creation of a new VNF package subscription and perform a JSON schema and content validation of the returned subscription data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF package subscription is successfully set and it matches the issued subscription    
@@ -85,7 +85,7 @@ Create duplicated VNF Package subscription with NFVO not creating duplicated sub
     ...    Test title: Create duplicated VNF Package subscription with NFVO not creating duplicated subscriptions
     ...    Test objective: The objective is to test the attempt of a creation of a duplicated VNF package 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 VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.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 VNF package subscription returned is available in the NFVO
@@ -101,7 +101,7 @@ Create duplicated VNF Package subscription with NFVO creating duplicated subscri
     ...    Test title: Create duplicated VNF Package subscription with NFVO creating duplicated subscriptions
     ...    Test objective: The objective is to test the creation of a duplicated VNF package subscription and perform a JSON schema and content validation of the returned duplicated subscription data structure
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.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 VNF package subscription is successfully set and it matches the issued subscription
@@ -116,7 +116,7 @@ PUT VNF Package Subscriptions - Method not implemented
     ...    Test title: PUT VNF Package Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF package subscriptions
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -128,7 +128,7 @@ PATCH VNF Package Subscriptions - Method not implemented
     ...    Test title: PATCH VNF Package Subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF package subscriptions
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -151,7 +151,7 @@ Get All VNF Package Subscriptions as Paged Response
     ...    Test title: GET all VNF Package Subscriptions as Paged Response
     ...    Test objective: The objective is to test the retrieval of all VNF package subscriptions as paged response.
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -164,7 +164,7 @@ Get VNF Package Subscriptions - Bad Request Response too Big
     ...    Test title: Get VNF Package Subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF package subscriptions fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -177,7 +177,7 @@ Get All VNF Package Subscriptions with permitted authorization scope
     ...    Test title: GET all VNF Package Subscriptions with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all VNF package subscriptions with permitted authorization scope
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.8.3.2 - 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 VNF Package Subscriptions with not permitted authorization scope
     ...    Test title: GET all VNF Package Subscriptions with not permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of all VNF package subscriptions fails when using not permitted authorization scope
     ...    Pre-conditions: At least one VNF package subscription is available in the NFVO.
-    ...    Reference: Clause 9.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.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/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot b/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
index 6507002eb5a8131041a3167864e103e08c418b07..df555eb8a3ed509faa551c8dce8f1cee71a343f3 100644
--- a/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
+++ b/SOL005/VNFPackageManagement-API/VNFDInIndividualVNFPackage.robot
@@ -22,7 +22,7 @@ Get VNFD in Individual VNF Package in Zip Format
     ...    Test title: Get VNFD in Individual VNF Package in Zip Format
     ...    Test objective: The objective is to test the retrieval of the VNFD in zip format for an individual VNF package and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4.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 @@ Get VNFD in Individual VNF Package with invalid resource identifier
     ...    Test title: Get VNFD in Individual VNF Package with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of the VNFD for an individual VNF Package fails when using an invalid resource identifier
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4.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 VNFD in Individual VNF Package with conflict due to onboarding state
     ...    Test title: Get VNFD in Individual VNF Package with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of the VNFD for an individual VNF Package fails due to a conflict when the VNF Package 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 VNF package for which the VNFD is requested is different from ONBOARDED.
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -94,7 +94,7 @@ POST VNFD in Individual VNF Package - Method not implemented
     ...    Test title: POST VNFD in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNFD
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -106,7 +106,7 @@ PUT VNFD in Individual VNF Package - Method not implemented
     ...    Test title: PUT VNFD in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNFD
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -118,7 +118,7 @@ PATCH VNFD in Individual VNF Package - Method not implemented
     ...    Test title: PATCH VNFD in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update a VNFD
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -130,7 +130,7 @@ DELETE VNFD in Individual VNF Package - Method not implemented
     ...    Test title: DELETE VNFD in Individual VNF Package - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNFD
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -142,7 +142,7 @@ Get VNFD in Individual VNF Package with security information
     ...    Test title: Get VNFD in Individual VNF Package with security information
     ...    Test objective: The objective is to test the retrieval of the VNFD in zip format for an individual VNF package shall include in the ZIP archive the security information when requested with "include_signature" parameter, and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -155,7 +155,7 @@ Get VNFD in Individual VNF Package in Zip Format with permitted authorization sc
     ...    Test title: Get VNFD in Individual VNF Package in Zip Format with permitted authorization scope
     ...    Test objective: The objective is to test the retrieval of the VNFD in zip format for an individual VNF package with permitted authorization scope
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -168,7 +168,7 @@ Get VNFD in Individual VNF Package in Zip Format with not permitted authorizatio
     ...    Test title: Get VNFD in Individual VNF Package in Zip Format with not permitted authorization scope
     ...    Test objective: The objective is to test that the retrieval of the VNFD in zip format for an individual VNF package fails when using not permitted authorization scope
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.4.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/VNFPackageManagement-API/VNFPackageArtifacts.robot b/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
index d7624582ea60cdefe4e991419584bbc45de92e75..6271a580a79286a134acbbef6969de7f45605a3d 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageArtifacts.robot
@@ -12,7 +12,7 @@ Get VNF Package Artifact
     ...    Test title: Get VNF Package Artifact
     ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully, and perform a validation that returned content is in Zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.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 VNF Package Artifact with "exclude_all_mano_artifacts" parameter
     ...    Test title: Get VNF Package Artifact with "exclude_all_mano_artifacts" 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 it doesnot contain additional MANO artifacts  when requested with "exclude_all_mano_artifacts" parameter
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.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 VNF Package Artifact with "exclude_all_non_mano_artifacts" parameter
     ...    Test title: Get VNF Package Artifact with "exclude_all_non_mano_artifacts" 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 it doesnot contain non-MANO Artifacts when requested with "exclude_all_non_mano_artifacts" parameter
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.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 @@ Get VNF Package Artifact with "select_non_mano_artifact_sets" parameter
     ...    Test title: Get VNF Package Artifact with "select_non_mano_artifact_sets" 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 non_MANO artifacts set when requested with "select_non_mano_artifact_sets" parameter
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ Get VNF Package Artifact with "include_signatures" parameter
     ...    Test title: Get VNF Package 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 VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
     ...    Test title: Get VNF Package Artifact with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the GET request read the whole content of the archive containing the artifact files successfully 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 VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.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 VNF package artifact
     ...    Post-Conditions: none
@@ -91,7 +91,7 @@ Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artif
     ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "select_non_mano_artifact_sets"
     ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "select_non_mano_artifact_sets" are present in request
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.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 VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artif
     ...    Test title: Get VNF Package Artifact with invalid URI parameters "exclude_all_non_mano_artifacts", "exclude_all_mano_artifactss"
     ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when both "exclude_all_non_mano_artifacts" and "exclude_all_mano_artifacts" are present in request
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.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 @@ Get VNF Package Artifact with invalid URI parameters undifend select_non_mano_ar
     ...    Test title: Get VNF Package Artifact with invalid URI parameters undefined select_non_mano_artifact_sets
     ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when one or more value provided in "select_non_mano_artifact_sets" are not provided in Manifest.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -130,7 +130,7 @@ Get VNF Package Artifact with conflict due to onboarding state
     ...    Test title: Get VNF Package Artifact with conflict due to onboarding state
     ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails due to a conflict when the VNF Package 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 VNF package for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -143,7 +143,7 @@ GET VNF Package Artifact with invalid Range Request
     ...    Test title: GET VNF Package Artifact with invalid Range Request
     ...    Test objective: The objective is to test that the GET request to read the whole content of the archive containing the artifact files fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.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 VNF package artifact
     ...    Post-Conditions: none      
@@ -156,7 +156,7 @@ POST VNF Package Artifact - Method not implemented
     ...    Test title: POST VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package artifact
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.5a.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -168,7 +168,7 @@ PUT VNF Package Artifact - Method not implemented
     ...    Test title: PUT VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -180,7 +180,7 @@ PATCH VNF Package Artifact - Method not implemented
     ...    Test title: PATCH VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -192,7 +192,7 @@ DELETE VNF Package Artifact - Method not implemented
     ...    Test title: DELETE VNF Package Artifact - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package artifact
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -204,7 +204,7 @@ Get VNF Package Artifact with "include_external_artifacts" parameter
     ...    Test title: Get VNF Package Artifact with "include_external_artifacts" parameter
     ...    Test objective: The objective is to test that GET request reads the whole content of the archive containing the external artifacts successfully when requested with "include_external_artifacts" parameter
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -217,7 +217,7 @@ Get VNF Package Artifact with permitted authorization scope
     ...    Test title: Get VNF Package Artifact with permitted authorization scope
     ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files successfully with permitted authorization scope
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -230,7 +230,7 @@ Get VNF Package Artifact with not permitted authorization scope
     ...    Test title: Get VNF Package Artifact with not permitted authorization scope
     ...    Test objective: The objective is to test that the GET request read the whole content of the archive containing the artifact files fails when using not permitted authorization scope
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5a.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5a.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/VNFPackageManagement-API/VNFPackageContent.robot b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
index 78e7d82b4a79064527315f820b88cd00ae6465e1..b32069b839d269e48ef9145dd487ba1da9c45798 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageContent.robot
@@ -12,7 +12,7 @@ GET Individual VNF Package Content
     ...    Test title: GET Individual VNF Package Content
     ...    Test objective: The objective is to test the retrieval of an individual VNF package content and perform a validation that returned content is in zip format
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5.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 Individual VNF Package Content with Range Request and NFVO supporting Range
     ...    Test title: GET Individual VNF Package Content with Range Request and NFVO supporting Range Requests
     ...    Test objective: The objective is to test the retrieval of an individual VNF package 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 VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5.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 VNF package file
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ GET Individual VNF Package Content with Range Request and NFVO not supporting Ra
     ...    Test title: GET Individual VNF Package Content with Range Request and NFVO not supporting Range Requests
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package content, when using a range request to return single range of bytes from the file and the NFVO not supporting it, returns the full VNF Package file.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5.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 VNF package file
     ...    Post-Conditions: none    
@@ -53,7 +53,7 @@ GET Individual VNF Package Content with invalid Range Request
     ...    Test title: GET Individual VNF Package Content with invalid Range Request
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package content fails when using a range request that does not match any available byte range in the file.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5.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 VNF package file
     ...    Post-Conditions: none      
@@ -65,7 +65,7 @@ GET Individual VNF Package Content with invalid resource identifier
     ...    Test title: GET Individual VNF Package Content with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package content fails when using an invalid resource identifier
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -78,7 +78,7 @@ GET Individual VNF Package Content with conflict due to onboarding state
     ...    Test title: GET Individual VNF Package Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the retrieval of an individual VNF package content fails due to a conflict when the VNF Package 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 VNF package for which the content is requested is different from ONBOARDED.
-    ...    Reference: Clause 9.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5.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 @@ POST Individual VNF Package Content - Method not implemented
     ...    Test title: POST Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create new VNF Package content
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -103,7 +103,7 @@ Upload VNF Package Content
     ...    Test title: Upload VNF Package Content
     ...    Test objective: The objective is to test the upload of a VNF Package Content in Zip format.
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package content is successfully uploaded and available in the NFVO
@@ -116,7 +116,7 @@ Upload VNF Package Content with conflict due to onboarding state
     ...    Test title: Upload VNF Package Content with conflict due to onboarding state
     ...    Test objective: The objective is to test that the upload of the VNF Package Content fails due to a conflict when the VNF Package 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 VNF Package for which the content is requested is different from CREATED.
-    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -129,7 +129,7 @@ PATCH Individual VNF Package Content - Method not implemented
     ...    Test title: PATCH Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package content
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -141,7 +141,7 @@ DELETE Individual VNF Package Content - Method not implemented
     ...    Test title: DELETE Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package content
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -153,7 +153,7 @@ Upload VNF Package Content with permitted authorization scope
     ...    Test title: Upload VNF Package Content with permitted authorization scope
     ...    Test objective: The objective is to test the upload of a VNF Package Content in Zip format with permitted authorization scope.
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package content is successfully uploaded and available in the NFVO
@@ -166,7 +166,7 @@ Upload VNF Package Content with not permitted authorization scope
     ...    Test title: Upload VNF Package Content with not permitted authorization scope
     ...    Test objective: The objective is to test the upload of a VNF Package Content in Zip format fails when using not permitted authorization scope.
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot b/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot
index 46655346dbd2785855f9310a60e614ac6f6a6f1a..4e8e6adda8a29a035d94d0f43eebac7d796ef988 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageContentViaURI.robot
@@ -12,7 +12,7 @@ Upload VNF Package Content from URI
     ...    Test title: Upload VNF Package Content from URI
     ...    Test objective: The objective is to test the upload of a VNF Package Content from URI.
     ...    Pre-conditions: One or more VNF Packages are in onboarding state CREATED in the NFVO.
-    ...    Reference: Clause 9.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ Upload VNF Package Content from URI with conflict due to onboarding state
     ...    Test title: Upload VNF Package Content from URI with conflict due to onboarding state
     ...    Test objective: The objective is to test that the upload of the VNF Package Content from URI fails due to a conflict when the VNF Package 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 VNF Package for which the content is requested is different from CREATED.
-    ...    Reference: Clause 9.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -38,7 +38,7 @@ GET Individual VNF Package Content from URI - Method not implemented
     ...    Test title: GET Individual VNF Package Content from URI - Method not implemented
     ...    Test objective: The objective is to test that GET  method is not allowed to retrieve a VNF Package content from URI
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ PUT Individual VNF Package Content from URI - Method not implemented
     ...    Test title: PUT Individual VNF Package Content from URI - Method not implemented
     ...    Test objective: The objective is to test that PUT  method is not allowed to modify a VNF Package content from URI
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ PATCH Individual VNF Package Content from URI - Method not implemented
     ...    Test title: PATCH Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that PATCH  method is not allowed to update a VNF Package content from URI
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -74,7 +74,7 @@ DELETE Individual VNF Package Content from URI - Method not implemented
     ...    Test title: DELETE Individual VNF Package Content - Method not implemented
     ...    Test objective: The objective is to test that DELETE  method is not allowed to delete a VNF Package content from URI
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -86,7 +86,7 @@ Upload VNF Package Content from URI with permitted authorization scope
     ...    Test title: Upload VNF Package Content from URI with permitted authorization scope
     ...    Test objective: The objective is to test the upload of a VNF Package Content from URI with permitted authorization scope.
     ...    Pre-conditions: One or more VNF Packages are in onboarding state CREATED in the NFVO.
-    ...    Reference: Clause 9.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -99,7 +99,7 @@ Upload VNF Package Content from URI with not permitted authorization scope
     ...    Test title: Upload VNF Package Content from URI with not permitted authorization scope
     ...    Test objective: The objective is to test the upload of a VNF Package Content from URI fails when using not permitted authorization scope.
     ...    Pre-conditions: One or more VNF Packages are in onboarding state CREATED in the NFVO.
-    ...    Reference: Clause 9.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.6.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/VNFPackageManagement-API/VNFPackages.robot b/SOL005/VNFPackageManagement-API/VNFPackages.robot
index 0d7f69bd65e0d2524be14a32d48da8716a5f4fd5..6e431f433a9087a5c4ab0258849f59d533d37001 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackages.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackages.robot
@@ -11,7 +11,7 @@ GET all VNF Packages
     ...    Test title: GET all VNF Packages
     ...    Test objective: The objective is to test the retrieval of all the available VNF packages information and perform a JSON schema and content validation of the collected data structure
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.2.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 VNF Packages with attribute-based filter
     ...    Test title: GET VNF Packages with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF packages using attribute-based filter, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.2.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 VNF Packages with invalid attribute-based filter
     ...    Test title: GET VNF Packages with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF packages fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.2.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 all VNF Packages with malformed authorization token
     ...    Test title: Get all VNF Packages Information with malformed authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF Packages fails when using malformed authorization token
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.5.3.3, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 4.5.3.3, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ Get all VNF Packages without authorization token
     ...    Test title: Get all VNF Packages without authorization token
     ...    Test objective: The objective is to test that the retrieval of VNF Packages fails when omitting the authorization token
     ...    Pre-conditions: One or more VNF Packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.5.3.3, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 4.5.3.3, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The NFVO requires the usage of access tokens for authorizing the API requests.
     ...    Post-Conditions: none
@@ -79,7 +79,7 @@ GET VNF Packages with "all_fields" attribute selector
     ...    Test title: GET VNF Packages with "all_fields" attribute selector
     ...    Test objective: The objective is to test the retrieval of VNF packages 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 VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -93,7 +93,7 @@ GET VNF Packages with "exclude_default" attribute selector
     ...    Test title: GET VNF Packages with exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of VNF packages 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 VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none        
@@ -107,7 +107,7 @@ GET VNF Packages with "fields" attribute selector
     ...    Test title: GET VNF Packages with fields attribute selector
     ...    Test objective: The objective is to test the retrieval of VNF packages 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 VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFM supports the use of fields attribute selector
     ...    Post-Conditions: none
@@ -121,7 +121,7 @@ GET VNF Packages with "exclude_fields" attribute selector
     ...    Test title: GET VNF Packages with exclude_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of VNF packages 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 VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 4.3.3.2.1, 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -135,7 +135,7 @@ GET all VNF Packages with invalid resource endpoint
     ...    Test title: GET VNF Packages with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF packages fails when using invalid resource endpoint
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -148,7 +148,7 @@ Create new VNF Package Resource
     ...    Test title: Create new VNF Package Resource
     ...    Test objective: The objective is to test the creation of a new VNF Package Resource and perform the JSON schema validation of the returned structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package Resource is successfully created on the NFVO
@@ -164,7 +164,7 @@ PUT all VNF Packages - Method not implemented
     ...    Test title: PUT all VNF Packages - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify existing VNF Packages
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -176,7 +176,7 @@ PATCH all VNF Packages - Method not implemented
     ...    Test title: PATCH all VNF Packages - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update existing VNF Packages
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -188,7 +188,7 @@ DELETE all VNF Packages - Method not implemented
     ...    Test title: DELETE all VNF Packages - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete existing VNF Packages
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -200,7 +200,7 @@ GET all VNF Packages as Paged Response
     ...    Test title: GET all VNF Packages as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF packages information as paged response.
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -213,7 +213,7 @@ GET VNF Packages - Bad Request Response too Big
     ...    Test title: GET VNF Packages - Bad Request Response too Big
     ...    Test objective: The objective is to test that the retrieval of VNF packages fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: One or more VNF packages are onboarded in the NFVO.
-    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -226,7 +226,7 @@ Create new VNF Package Resource with permitted authorization scope
     ...    Test title: Create new VNF Package Resource with permitted authorization scope
     ...    Test objective: The objective is to test the creation of a new VNF Package Resource with permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The VNF Package Resource is successfully created on the NFVO
@@ -242,7 +242,7 @@ Create new VNF Package Resource with not permitted authorization scope
     ...    Test title: Create new VNF Package Resource with not permitted authorization scope
     ...    Test objective: The objective is to test that the creation of a new VNF Package Resource fails when using not permitted authorization scope
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
+    ...    Reference: Clause 9.4.2.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/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml b/SOL005/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
index 250f1c705d7ff857e9b3873effa2f3855661e50d..2753aebf0e26881942399eb1bf8827403d426c22 100644
--- a/SOL005/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+++ b/SOL005/VNFPackageManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_yaml_1_3
 description: "TST010 reference VNF-B"
 
 imports:
-  - https://forge.etsi.org/rep/nfv/SOL001/raw/v4.4.1/etsi_nfv_sol001_vnfd_types.yaml  
+  - https://forge.etsi.org/rep/nfv/SOL001/raw/v5.1.1/etsi_nfv_sol001_vnfd_types.yaml  
 
 metadata:
   descriptor_id: "VNF-B"
@@ -44,7 +44,7 @@ node_types:
         type: list
         entry_schema:
           type: string
-        default: [ 'etsivnfm:v4.5.1' ]
+        default: [ 'etsivnfm:v5.1.1' ]
     interfaces:
       Vnflcm:
         type: "tosca.interfaces.nfv.Vnflcm"
@@ -153,7 +153,7 @@ topology_template:
         flavour_id: "VNF-B_flavor"
         flavour_description: "VNF-B flavor"
         vnfm_info: 
-          - etsivnfm:v2.3.1 
+          - etsivnfm:v5.1.1 
       interfaces:
         Vnflcm:
           type: "tosca.interfaces.nfv.Vnflcm"