diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index d368354fda1f18ad06c10185b72b36aca507270a..9cd205605237291429f2c278a5077cfbe840b56f 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -10,8 +10,8 @@ Library           MockServerLibrary
 Library           String
 Library           Collections
 Library           String
-Variables         descriptors/SOL001/VNFD/vnfd_SOL001.yaml
-Variables         descriptors/SOL006/VNFD/vnfd_SOL006.yaml
+#Variables         descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+#Variables         descriptors/SOL006/VNFD/vnfd_SOL006.yaml
 
 *** Keywords ***
 Get all VNF Packages
@@ -196,6 +196,7 @@ PARSE the Descriptor File
     Run Keyword If  '${descriptorType}'=='SOL001'    Fetch Information from SOL001 descriptor file    ELSE    Fetch Information from SOL006 descriptor file
     
 Fetch Information from SOL001 descriptor file
+    Import Variables    ${CURDIR}/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
     ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.properties.descriptor_id}
     ${provider}=    Get Variable Value    ${topology_template.node_templates.properties.provider}
     ${product_name}=    Get Variable Value    ${topology_template.node_templates.properties.product_name}
@@ -209,6 +210,7 @@ Fetch Information from SOL001 descriptor file
     Set Global Variable    ${Descriptor_Version}    ${descriptor_version}
 
 Fetch Information from SOL006 descriptor file
+    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
     ${descriptor_id}=    Get Variable Value    ${nfv.vnfd[0].id}
     ${provider}=    Get Variable Value    ${nfv.vnfd[0].provider}
     ${product_name}=    Get Variable Value    ${nfv.vnfd[0].product-name}