diff --git a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
index aa3b33dca1f67c5c0c892276bf635c63dd37a90b..a448be6524b212cbc402bc08060d0dbc0970fe7c 100644
--- a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
@@ -110,6 +110,6 @@ DELETE subscriptions - Method not implemented
     
 *** Keywords ***
 Create Sessions
-    Start Process  java  -jar  ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar  -serverPort  ${callback_port}  alias=mockInstance
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_schema}://${callback_uri}:${callback_port}     #The API producer is set to NFVO according to SOL003-7.3.4
diff --git a/SOL002/VNFFaultManagement-API/environment/variables.txt b/SOL002/VNFFaultManagement-API/environment/variables.txt
index b604ec26d801a0bc4dcc06193739360098c4ea3a..4035655b7a2af786fe38ec59bafc0d97e2501359 100644
--- a/SOL002/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL002/VNFFaultManagement-API/environment/variables.txt
@@ -39,5 +39,5 @@ ${managedObjectId}    007c111c-38a1-42c0-a666-7475ecb1567c
 ${invalid_alarm_filter}    badFilter
 ${notification_ep}    /notification
 ${notification_port}    9091
-
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
diff --git a/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot b/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
index 8745df345d6d2bdc298fac1e1217ae2625a23650..4545ea7d521a46bd5a4377a5589ae50c4ae2e767 100644
--- a/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
+++ b/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
@@ -85,7 +85,7 @@ DELETE VNF Indicator Notification
 
 *** Keywords ***
 Create Sessions
-    Start Process  java  -jar  ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar  -serverPort  ${callback_port}  alias=mockInstance
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
     
\ No newline at end of file
diff --git a/SOL002/VNFIndicatorNotification-API/environment/variables.txt b/SOL002/VNFIndicatorNotification-API/environment/variables.txt
index df8e5c4ac9e7d10e0e244af7d362ed1d44707262..5820ea0b376bfaec4cc9d318d91a9c588cac559d 100644
--- a/SOL002/VNFIndicatorNotification-API/environment/variables.txt
+++ b/SOL002/VNFIndicatorNotification-API/environment/variables.txt
@@ -3,4 +3,5 @@ ${callback_uri}    http://localhost
 ${callback_port}    9091
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_error}    /endpoint_404
-${sleep_interval}    20s
\ No newline at end of file
+${sleep_interval}    20s
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
index 1d8fd3f6628ff41189e2c235c9ccf2f8bb77399e..3afd29d82a9f60262b5f7545d481a68551dab2c2 100644
--- a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -84,6 +84,6 @@ DELETE subscriptions - Method not implemented
     
 *** Keywords ***
 Create Sessions
-    Start Process  java  -jar  ../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar  -serverPort  ${callback_port}  alias=mockInstance
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_schema}://${callback_uri}:${callback_port}     #The API producer is set to NFVO according to SOL003-5.3.9
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index 8bf7b3c2b3f5e71668cd84e43f697d743dc669ba..a7a1493631671ed472dff23506a49ea3357e9a2a 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -38,4 +38,5 @@ ${VnfIdentifierCreationNotification}    {}
 ${VnfIdentifierDeletionNotification}    {}
 ${callback_port}    9091
 ${callback_schema}  http
-${callback_uri}     localhost
\ No newline at end of file
+${callback_uri}     localhost
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot b/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
index 3fa52b96972bbde214cc6c0e4f3b6f0848b81d4a..bc3c9a49fb75071720fceb3339603090722713e5 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
+++ b/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
@@ -111,6 +111,6 @@ DELETE Performance Notification
 
 *** Keywords ***
 Create Sessions
-    Start Process  java  -jar  ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar  -serverPort  ${callback_port}  alias=mockInstance
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagementNotification-API/environment/variables.txt b/SOL002/VNFPerformanceManagementNotification-API/environment/variables.txt
index 12a19817c09edfcaefe04a105a62e1a95995bd3a..9445631a5e0961cbcd66b4317ff26a7f4467c0c2 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/environment/variables.txt
+++ b/SOL002/VNFPerformanceManagementNotification-API/environment/variables.txt
@@ -4,3 +4,4 @@ ${callback_port}    9091
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_error}    /endpoint_404
 ${sleep_interval}    20s
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
diff --git a/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot b/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
index 23568cc9c0edf3faabf4877de1346d783a799191..0c7f8c7854c7907cb601741835cf50c4980e8f42 100644
--- a/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
+++ b/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
@@ -109,6 +109,6 @@ DELETE subscriptions - Method not implemented
     
 *** Keywords ***
 Create Sessions
-    Start Process  java  -jar  ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar  -serverPort  ${callback_port}  alias=mockInstance
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}     #The API producer is set to NFVO according to SOL003-7.3.4
diff --git a/SOL003/VNFFaultManagementNotification-API/environment/variables.txt b/SOL003/VNFFaultManagementNotification-API/environment/variables.txt
index e2296a0cdc9f5ee4c507a5b2d43e5963edbad206..515c4e77b8e53f4057c406eb7ac0ee36fcf1c339 100644
--- a/SOL003/VNFFaultManagementNotification-API/environment/variables.txt
+++ b/SOL003/VNFFaultManagementNotification-API/environment/variables.txt
@@ -3,3 +3,4 @@ ${callback_endpoint}    /notification
 ${callback_uri}    http://localhost
 ${callback_port}    9091
 ${sleep_interval}    20s
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot b/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
index 229a939b3de912f56b5b6f8900269c4d8f0f1b72..c38bbe8657c4e8a2f87ad14b03beb65bb7fc2bb0 100644
--- a/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
+++ b/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
@@ -85,7 +85,7 @@ Delete VNF Indicator Notification
 
 *** Keywords ***
 Create Sessions
-    Start Process  java  -jar  ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar  -serverPort  ${callback_port}  alias=mockInstance
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
     
\ No newline at end of file
diff --git a/SOL003/VNFIndicatorNotification-API/environment/variables.txt b/SOL003/VNFIndicatorNotification-API/environment/variables.txt
index df8e5c4ac9e7d10e0e244af7d362ed1d44707262..5820ea0b376bfaec4cc9d318d91a9c588cac559d 100644
--- a/SOL003/VNFIndicatorNotification-API/environment/variables.txt
+++ b/SOL003/VNFIndicatorNotification-API/environment/variables.txt
@@ -3,4 +3,5 @@ ${callback_uri}    http://localhost
 ${callback_port}    9091
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_error}    /endpoint_404
-${sleep_interval}    20s
\ No newline at end of file
+${sleep_interval}    20s
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
index 0d2b029edd743a20e6ec1f701ff40d5a733322bf..6263041f88767d7cc341aa6ce553391d84a28883 100644
--- a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -6,6 +6,7 @@ Resource    environment/variables.txt
 Library    MockServerLibrary
 Library    Process
 Library    OperatingSystem
+Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    spec=SOL003-VNFLifecycleManagement-API.yaml
 
 *** Variables ***
 ${sleep_interval}    20s
@@ -85,6 +86,6 @@ DELETE subscriptions - Method not implemented
     
 *** Keywords ***
 Create Sessions
-    Start Process  java  -jar  ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar  -serverPort  ${callback_port}  alias=mockInstance
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}     #The API producer is set to NFVO according to SOL003-5.3.9
diff --git a/SOL003/VNFLifecycleManagement-API/environment/configuration.txt b/SOL003/VNFLifecycleManagement-API/environment/configuration.txt
index 9a55fb7deac7d8c14f1aa8fcd1b2b6857e349862..b64dfa2f0b8cf87860494a22bc21454e1c48dd2c 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/configuration.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/configuration.txt
@@ -35,4 +35,4 @@ ${SYNC_MODE}    0
 ${sleep_interval}    20s
 ${callback_uri}    http://localhost
 ${callback_port}    9091
-${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar
\ No newline at end of file
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagementNotification-API/PackageManagementNotification.robot b/SOL003/VNFPackageManagementNotification-API/PackageManagementNotification.robot
index 420c3c6106c80c55d745c98e6207cb30a313d1e1..49127b6eb248597b93bc3a6b5c999ac9deac26f7 100644
--- a/SOL003/VNFPackageManagementNotification-API/PackageManagementNotification.robot
+++ b/SOL003/VNFPackageManagementNotification-API/PackageManagementNotification.robot
@@ -111,6 +111,6 @@ DELETE VNF Package Management Notification
 
 *** Keywords ***
 Create Sessions
-    Start Process  java  -jar  ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar  -serverPort  ${callback_port}  alias=mockInstance
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL003/VNFPackageManagementNotification-API/environment/variables.txt b/SOL003/VNFPackageManagementNotification-API/environment/variables.txt
index c758145e5c52572eed2049b66bc603171bce9385..2918a25449e0ee662fa65fcd39dc779b8dd97665 100644
--- a/SOL003/VNFPackageManagementNotification-API/environment/variables.txt
+++ b/SOL003/VNFPackageManagementNotification-API/environment/variables.txt
@@ -4,4 +4,6 @@ ${callback_uri}    http://localhost
 ${callback_port}    9091
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_error}    /endpoint_404
-${sleep_interval}    20s
\ No newline at end of file
+${sleep_interval}    20s
+
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot b/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
index fff93f0b781a55e6dbaa187dc70d9fe2a71f5974..7f4b0a00e8b284a1c4402dc314bdd0a196edbd07 100644
--- a/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
+++ b/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
@@ -112,6 +112,6 @@ DELETE Performance Notification
 
 *** Keywords ***
 Create Sessions
-    Start Process  java  -jar  ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar  -serverPort  ${callback_port}  alias=mockInstance
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagementNotification-API/environment/variables.txt b/SOL003/VNFPerformanceManagementNotification-API/environment/variables.txt
index cb38e69460f6197eb5f21945b9daa67433f0c7d5..3d24134ebd622d14cecb4d46622e625690a06f86 100644
--- a/SOL003/VNFPerformanceManagementNotification-API/environment/variables.txt
+++ b/SOL003/VNFPerformanceManagementNotification-API/environment/variables.txt
@@ -4,3 +4,5 @@ ${callback_port}    9091
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_error}    /endpoint_404
 ${sleep_interval}    20s
+
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
index 9ca89be72becb11849b62b7d35be27c4ebd76157..df45001b5450e27fb48e3bd6455addbd9401e181 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
@@ -60,7 +60,7 @@ DELETE subscriptions - Method not implemented
 
 *** Keywords ***
 Create Sessions
-    Start Process  java  -jar  ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar  -serverPort  ${callback_port}  alias=mockInstance
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}     #The API producer is set to NFVO according to SOL003-5.3.9
 
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
index 8725649e6bd56b7af902e4cb3a75acf537efbee5..37fd830e25120c4d88c25756e0b683985ed24406 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
@@ -24,4 +24,5 @@ ${apiName}        vrqan
 ${apiVersion}     v1
 
 ${VrQuotaAvailNotification}    {}
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
diff --git a/SOL005/NSDManagement-API/NSDManagementNotification.robot b/SOL005/NSDManagement-API/NSDManagementNotification.robot
index 3ce71af2b0a0eb4c244fff1dbd63ff4aeee9ac92..9197a43f95f55c664edb3f3f5cc3a494e6152ff3 100644
--- a/SOL005/NSDManagement-API/NSDManagementNotification.robot
+++ b/SOL005/NSDManagement-API/NSDManagementNotification.robot
@@ -1,5 +1,6 @@
 *** Setting ***
 Resource	environment/variables.txt
+Resource	environment/generic.txt
 Suite Setup    Create Sessions
 Suite Teardown    Terminate All Processes    kill=true
 Library    MockServerLibrary
@@ -165,6 +166,6 @@ DELETE VNF Package Management Notification
 
 *** Keywords ***
 Create Sessions
-    Start Process  java  -jar  ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar  -serverPort  ${callback_port}  alias=mockInstance
+    Start Process  java  -jar ${MOCK_SERVER_JAR} -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL005/NSDManagement-API/environment/generic.txt b/SOL005/NSDManagement-API/environment/generic.txt
index 89c166cbf68beb3029b15ea6d846722bc0d34cb1..81b2ec62d8c63018d38c0a667abe11d6df7ec95a 100644
--- a/SOL005/NSDManagement-API/environment/generic.txt
+++ b/SOL005/NSDManagement-API/environment/generic.txt
@@ -13,3 +13,5 @@ ${apiName}        nsd
 ${FIELD_USAGE}    1
 ${NFVO_AUTHENTICATION}    Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9
 ${NFVO_AUTH_USAGE}    1
+
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
diff --git a/SOL005/VNFPackageManagement-API/Notifications.robot b/SOL005/VNFPackageManagement-API/Notifications.robot
index 420c3c6106c80c55d745c98e6207cb30a313d1e1..2a0e5a9ac2727b6df2e00a048291bd5776249ac1 100644
--- a/SOL005/VNFPackageManagement-API/Notifications.robot
+++ b/SOL005/VNFPackageManagement-API/Notifications.robot
@@ -1,5 +1,6 @@
 *** Setting ***
 Resource	environment/variables.txt
+Resource	environment/generic.txt
 Suite Setup    Create Sessions
 Suite Teardown    Terminate All Processes    kill=true
 Library    MockServerLibrary
@@ -111,6 +112,6 @@ DELETE VNF Package Management Notification
 
 *** Keywords ***
 Create Sessions
-    Start Process  java  -jar  ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar  -serverPort  ${callback_port}  alias=mockInstance
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}    -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL005/VNFPackageManagement-API/environment/generic.txt b/SOL005/VNFPackageManagement-API/environment/generic.txt
index db080ad3f1b7dcc420c1ce673dd46c953bc4f035..60457280d7f72afcff648f93ff54d9169d3a8c12 100644
--- a/SOL005/VNFPackageManagement-API/environment/generic.txt
+++ b/SOL005/VNFPackageManagement-API/environment/generic.txt
@@ -18,3 +18,5 @@ ${NFVO_PLAIN}     1
 ${NFVO_FIELDS}    1
 ${vnfPackageId}  788106a2-d692-44f3-a86d-384f0ce35e42
 
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
diff --git a/SOL005/VNFPerformanceManagement-API/Notifications.robot b/SOL005/VNFPerformanceManagement-API/Notifications.robot
index 711bca03f7850e5fbec1525b8f17e3b7f2da57e0..676cecc6c29c781fe252ca15fb6f7875aa22ef9d 100644
--- a/SOL005/VNFPerformanceManagement-API/Notifications.robot
+++ b/SOL005/VNFPerformanceManagement-API/Notifications.robot
@@ -1,5 +1,6 @@
 *** Setting ***
 Resource	environment/notifications.txt
+Resource	environment/generic.txt
 Suite Setup    Create Sessions
 Suite Teardown    Terminate All Processes    kill=true
 Library    MockServerLibrary
@@ -112,6 +113,6 @@ DELETE Performance Notification
 
 *** Keywords ***
 Create Sessions
-    Start Process  java  -jar  ../../bin/mockserver-netty-5.3.0-jar-with-dependencies.jar  -serverPort  ${callback_port}  alias=mockInstance
+    Start Process  java  -jar  ${MOCK_SERVER_JAR}  -serverPort  ${callback_port}  alias=mockInstance
     Wait For Process  handle=mockInstance  timeout=5s  on_timeout=continue
     Create Mock Session  ${callback_uri}:${callback_port}
\ No newline at end of file
diff --git a/SOL005/VNFPerformanceManagement-API/environment/generic.txt b/SOL005/VNFPerformanceManagement-API/environment/generic.txt
index 66638f2fef4b15eebd046edaa1230a9af0f818dd..51879755eed41015962c40e95ac08c02b7c21c44 100644
--- a/SOL005/VNFPerformanceManagement-API/environment/generic.txt
+++ b/SOL005/VNFPerformanceManagement-API/environment/generic.txt
@@ -19,3 +19,5 @@ ${VNFM_AUTH_USAGE}    1
 ${VNFM_DUPLICATION}    1
 ${NFVO_DUPLICATION}    1
 
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+