diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index 69ba1070986fd512aa339d7d7bd3455202619282..b07e7dec7ad123d01a6c51f098a85f98697fe1f6 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -373,7 +373,7 @@ GET NSD Content with invalid Range Request
 
 Send PUT Request to upload NSD Content as zip file in asynchronous mode
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
-    ${body}=  Get Binary File  ${contentZipFile}
+    ${body}=  Get Binary File  ${contentZipNsd}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
@@ -381,7 +381,7 @@ Send PUT Request to upload NSD Content as zip file in asynchronous mode
 
 Send PUT Request to upload NSD Content as zip file in synchronous mode
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_JSON}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
-    ${body}=  Get Binary File  ${contentZipFile}
+    ${body}=  Get Binary File  ${contentZipNsd}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
@@ -405,7 +405,7 @@ Check Postcondition NSD Content is uploaded and available in the NFVO
 Send PUT Request to upload NSD Content with conflict due to onboarding state
     Log    Trying to perform a PUT. This method upload the content of a NSD
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
-    ${body}=  Get Binary File  ${contentZipFile}
+    ${body}=  Get Binary File  ${contentZipNsd}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content     data=${body}
     Log         ${response}
     ${response}=    Create Dictionary   status=${response.status_code}  headers=${response.headers}     body=${response.json()}
@@ -700,8 +700,8 @@ Get PNFD Content with conflict due to onboarding state
 
 Send PUT Request to upload PNFD Content as zip file
     Log    Trying to perform a PUT. This method upload the content of a PNFD
-    Create Session      pnfd     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}      headers={"Accept": "${ACCEPT_PLAIN}", "Content-Type": "${ACCEPT_PLAIN}", "Authorization": "${AUTHORIZATION}"}      verify=False
-    ${body}=  Get Binary File  ${contentFilePnfd}
+    Create Session      pnfd     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}      headers={"Accept": "${ACCEPT_PLAIN}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
+    ${body}=  Get Binary File  ${contentZipPnfd}
     ${response}=    Put Request     pnfd     ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content     data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
diff --git a/SOL005/NSDManagement-API/environment/variables.txt b/SOL005/NSDManagement-API/environment/variables.txt
index e1e647560ad4d5668ea33a8fa65b5bb76ce63c1f..01738ff5db33341403edcce122583d5ba5b03f68 100644
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
@@ -64,7 +64,8 @@ ${NFVO_RANGE_OK}    1
 ${range}          bytes=0-1023
 ${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
 ${onboardingStateNsdInfoId}    b992a851-08b1-45a8-9282-a5f7a7df04a6
-${contentZipFile}    files/nsdContent.zip
+${contentZipNsd}    files/nsd.zip
+${contentFileNsd}    files/nsd.zip
 ${creatingNsdInfoId}    71241932-994a-46e2-ad6c-1740674dda44
 ${BAD_AUTHORIZATION}    Bear sometoken
 ${original_etag}    1234
@@ -82,7 +83,8 @@ ${erroneous_pnfdInfoId}  erroneous_pnfdInfoId
 ${enabledPnfdInfoId}  40853bda-8a8f-4f63-9130-cef439f65348
 ${erroneous_pnfdId}    erroneousPnfdId
 ${onboardingStatePnfdId}    8ed2bf1f-f6ae-4d18-b478-bfab02fd4cd2
-${contentFilePnfd}    files/pnfdContent.zip
+${contentZipPnfd}    files/pnfd.zip
+${contentFilePnfd}    files/pnfd.yml
 ${creatingPnfdId}    2e4ce0ef-3ea8-49f9-92dd-8771866015bb
 ${userDefinedDataSet}    some
 
diff --git a/SOL005/NSDManagement-API/files/nsd.yml b/SOL005/NSDManagement-API/files/nsd.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8cddb97b87b4ffd6fc73cca904805de2a21f3ab1
--- /dev/null
+++ b/SOL005/NSDManagement-API/files/nsd.yml
@@ -0,0 +1,3 @@
+nsd:
+-id: nsd_id
+-name: nsd_name
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/files/nsd.zip b/SOL005/NSDManagement-API/files/nsd.zip
new file mode 100644
index 0000000000000000000000000000000000000000..3da59324d05257bf196313ef7c3fddcb70eebdd8
Binary files /dev/null and b/SOL005/NSDManagement-API/files/nsd.zip differ
diff --git a/SOL005/NSDManagement-API/files/pnfd.yml b/SOL005/NSDManagement-API/files/pnfd.yml
new file mode 100644
index 0000000000000000000000000000000000000000..faeeb52565b4184071d6172d62151e79e30147e0
--- /dev/null
+++ b/SOL005/NSDManagement-API/files/pnfd.yml
@@ -0,0 +1,3 @@
+pnfd:
+-id: pnfd_id
+-name: pnfd_name
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/files/pnfd.zip b/SOL005/NSDManagement-API/files/pnfd.zip
new file mode 100644
index 0000000000000000000000000000000000000000..b7c575541e64bd2f2b3d9fa979c7e6ef4d877139
Binary files /dev/null and b/SOL005/NSDManagement-API/files/pnfd.zip differ
diff --git a/SOL005/NSDManagement-API/files/pnfdContent.zip b/SOL005/NSDManagement-API/files/pnfdContent.zip
deleted file mode 100644
index 16151601c098de41c91ba4301540a3bfb355cbdb..0000000000000000000000000000000000000000
Binary files a/SOL005/NSDManagement-API/files/pnfdContent.zip and /dev/null differ
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 7cf7edbb5484ad414fc9903162d35a3752adfbd8..9473c3fbf2719dae6171521e7f6260f9bc169fb4 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -525,7 +525,7 @@ Send PUT Request for individual VNF Package Content
 Send PUT Request to upload VNF Package Content
     Log    Trying to perform a PUT. This method upload the content of a NSD
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
-    ${body}=  Get Binary File     files/vnfPackage.zip
+    ${body}=  Get Binary File     ${contentZipVnfPackage}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${newVnfPackageId}/package_content    data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
@@ -542,7 +542,7 @@ Check Postcondition VNF Package Content is uploaded and available in the NFVO
 Send PUT Request to upload VNF Package Content with conflict due to onboarding state
     Log    Trying to perform a PUT. This method upload the content of a NSD
     Create Session      nbi     ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}  headers={"Accept": "${ACCEPT_ZIP}", "Content-Type": "application/zip", "Authorization": "${AUTHORIZATION}"}      verify=False
-    ${body}=  Get Binary File     files/vnfPackage.zip
+    ${body}=  Get Binary File     ${contentZipVnfPackage}
     ${response}=    Put Request     nbi     ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${creatingVnfPackageId}/package_content    data=${body}
     Should Be Empty     ${response.text}
     ${response}=    Create Dictionary   status=${response.status_code}
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 9f677fc5d85fbb39d322a7f7dce0ea641d1497de..948974169ada1d25eaa0882f1aac13757b4e8917 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -49,6 +49,8 @@ ${disabledVnfPackageId}    87a2c9d3-00ea-4032-8c67-a5106d001868
 ${vnfPackageId}  788106a2-d692-44f3-a86d-384f0ce35e42
 ${instantiatedVnfPackageId}  0b79bab50daca910b000d4f1a2b675d604257e42
 
+${contentZipVnfPackage}    files/vnfPackage.zip
+
 ${ACCEPT_PLAIN}    text/plain
 ${ACCEPT_ZIP}     application/zip
 ${CONTENT_TYPE_PLAIN}    text/plain
diff --git a/SOL005/VNFPackageManagement-API/files/vnfPackage.zip b/SOL005/VNFPackageManagement-API/files/vnfPackage.zip
new file mode 100644
index 0000000000000000000000000000000000000000..9fcfb621d458e16f5e725f85d697d327ff8ab439
Binary files /dev/null and b/SOL005/VNFPackageManagement-API/files/vnfPackage.zip differ