diff --git a/SOL005/NSPerformanceManagement-API/environment/notifications.txt b/SOL005/NSPerformanceManagement-API/environment/notifications.txt
index 33ef78e1e4a0d71c97cf66ea7e65992604d249fa..cd1193ae50b7d17b51b86c8ce7582d1fbed8db59 100644
--- a/SOL005/NSPerformanceManagement-API/environment/notifications.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/notifications.txt
@@ -1,6 +1,6 @@
 *** Variables ***
-${callback_uri}    http://172.21.248.145
-${callback_port}    9191
+${callback_uri}    http://localhost
+${callback_port}    9091
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404
diff --git a/SOL005/NSPerformanceManagement-API/environment/reports.txt b/SOL005/NSPerformanceManagement-API/environment/reports.txt
index 66d8761ae62abf9eab32a221c69e7353f919f98d..6ac5f7c0b020825db1e44161c95118d9b08b5dbd 100644
--- a/SOL005/NSPerformanceManagement-API/environment/reports.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/reports.txt
@@ -1,6 +1,6 @@
 *** Variables ***
+${pmJobId}        1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
 ${reportId}       0fb4c875-e07f-46ca-a9dd-13907667a568
-${reportId}       177bc531-1fd0-4701-a3bb-8f54c3722e05
 ${erroneousReportId}    erroneousReportId
 ${newReportId}    newReportId
 ${response}=    httpresponse
diff --git a/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt b/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
index 617d28b0f331c93bc732a9cf425468dd4386c0fa..23b0dd07b95fb53b3a1022e25b0b003eb8e46d2a 100644
--- a/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
+++ b/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
@@ -1,5 +1,5 @@
 *** Variables ***
 ${erroneousVnfPackageId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
-${disabledVnfPackageId}    ed355ce0-6263-44d2-a4ba-bdc0f454c97d
-${vnfPackageId}  75b51c1c-c723-44ba-86b0-d67c82bc1025
-${instantiatedVnfPackageId}  	01fbfb86-0074-46e5-aa40-ef5b05f7650d
\ No newline at end of file
+${disabledVnfPackageId}    87a2c9d3-00ea-4032-8c67-a5106d001868
+${vnfPackageId}  788106a2-d692-44f3-a86d-384f0ce35e42
+${instantiatedVnfPackageId}  0b79bab50daca910b000d4f1a2b675d604257e42
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 01e17dede1035b3a79fd97dd7f11e89aed5fc854..349e8767a9f1a1c4c6b001d6e5c714ee28f8ebb0 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -14,7 +14,7 @@ ${apiName}        vnfpkgm
 ${FIELD_USAGE}    1
 ${NFVO_PLAIN}     1
 ${NFVO_FIELDS}    1
-${onboardingStateVnfPkgId}   fabe092e-5f61-48b7-8feb-aac1cb39da77   # The VNF Package is in CREATED onboardingState
+${onboardingStateVnfPkgId}    788106a2-d692-44f3-a86d-384f0ce35e42    # The VNF Package is in CREATED onboardingState
 
 ${testOptionalMethods}    0
 
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
index 9631042cc3776e429e307bc2a2cfd9eb39be12f6..c1ab9f57fc8d2e7620f0415440c931abb811dd63 100644
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
+++ b/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
@@ -5,4 +5,4 @@ ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${range}          bytes=0-1023
 ${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
 ${erroneousVnfPkgId}    erroneousPkgId
-${vnfPackageOctetStreamId}    01fbfb86-0074-46e5-aa40-ef5b05f7650d
\ No newline at end of file
+${vnfPackageOctetStreamId}    octetStreamPkgId
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
index 18bad0ece115b8aff20ac332510aaf4419db5967..c775a126d8f2e4031134feb00028a2358f32d2ce 100644
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
+++ b/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
@@ -3,7 +3,7 @@ ${ACCEPT_ZIP}     application/zip
 ${CONTENT_TYPE_ZIP}    application/zip
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${erroneousVnfPkgId}    erroneousPkgId
-${vnfPkgId}       01fbfb86-0074-46e5-aa40-ef5b05f7650d
+${vnfPkgId}       788106a2-d692-44f3-a86d-384f0ce35e42
 ${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
 ${range}          bytes=0-1023
 ${length}          1024
diff --git a/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt b/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
index c0f12465d42c5b897d277ab4a23e7cc3036ef843..53981f9536954fb5ae90ce9155bb220ae681a789 100644
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
+++ b/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
@@ -1,4 +1,4 @@
 *** Variables ***
-${vnfPkgViaUriId}       788106a2-d692-44f3-a86d-384f0ce35e42		
+${vnfPkgViaUriId}       788106a2-d692-44f3-a86d-384f0ce35e42
 ${creatingVnfPkgViaUriId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
 ${vnfPkgUri}        http://localhost/content.zip