diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index 7885715f05cc50ad1f5a7c13329b7cd952af8a52..df7d5d84d7628725fa1a981e40162566bcd0d617 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -320,7 +320,7 @@ Post Create subscription
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
diff --git a/SOL002/VNFIndicator-API/Subscriptions.robot b/SOL002/VNFIndicator-API/Subscriptions.robot
index d0f7f89dd0874ca8687174d21bcf723619fc39ba..b12f6693f5a045ae43aff0a6b715344c17729dd8 100644
--- a/SOL002/VNFIndicator-API/Subscriptions.robot
+++ b/SOL002/VNFIndicator-API/Subscriptions.robot
@@ -207,7 +207,7 @@ Get VNF Indicators Subscriptions with invalid filter
     Set Suite Variable    ${response}    ${output}   
     
 Get VNF Indicators Subscriptions with invalid resource endpoint
-        Log    Trying to perform a request on a Uri which doesn't exist
+    Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
@@ -219,7 +219,7 @@ Send Post Request for VNF Indicator Subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String    ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String    ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index f4dd79745682f6d9dc17ab18f6c8325bd365652b..83832de65491e5aec19f6e4b249b3f8d347dbcb9 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -789,7 +789,7 @@ Post Create subscription
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
@@ -800,7 +800,7 @@ Post Create subscription - DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
@@ -811,7 +811,7 @@ Post Create subscription - NO-DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 160d126427f6888df05b0e05783fd2d9133eeb12..1c7dc8e97141fa336dd300e33108f817da233b99 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -285,7 +285,7 @@ Send Post Request Create new VNF Performance Monitoring Job
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/CreatePmJobRequest.json
-    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}
+    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}:${callback_port}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index 5ed05061c0359e241c71fa503a81cd0bc016b168..7505e15f2c3d31ba138dd298bbe8e22636954a7e 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -176,7 +176,7 @@ Send Post Request Create new Performance Threshold
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/CreateThresholdRequest.json
-    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}
+    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${callback_uri}:${callback_port}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
index cbf26efb883a5b4200e3eec968f70b02eae4d24d..b833c935478b792b47eae18e374d2b4511b96b15 100644
--- a/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
+++ b/SOL003/VNFFaultManagement-API/FaultManagement-APIKeyword.robot
@@ -256,7 +256,7 @@ POST Subscription
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}      callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}      callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -268,7 +268,7 @@ Send POST Request for duplicated subscription
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -280,7 +280,7 @@ Send POST Request for duplicated subscription not permitted
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}    vnfdIds=${vnfdIds}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL003/VNFFaultManagement-API/environment/variables.txt b/SOL003/VNFFaultManagement-API/environment/variables.txt
index 5908e8e4a19fb2377454a78baa408d4fddc85d0b..8f264481e50b8ab3ffd3d6fc692e449baf259078 100644
--- a/SOL003/VNFFaultManagement-API/environment/variables.txt
+++ b/SOL003/VNFFaultManagement-API/environment/variables.txt
@@ -52,6 +52,7 @@ ${invalidAlarmId}    invalidIdAlarm
 ${fields}         criteria,objectInstanceIds
 
 ${callback_uri}  http://127.0.0.1
+${callback_port}    9091
 ${callback_endpoint}    /subscribe
 
 ${vnfdIds}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index f01d3b2d942b2fb8a20fba412bf67faa43e0983b..0ef1ebdeb8463fc3eda4388ceaee36593bbaad84 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -974,7 +974,7 @@ Post Create subscription
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_notification=${callback_notification}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_notification=${callback_notification}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}				
@@ -985,7 +985,7 @@ Post Create subscription - DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_notification=${callback_notification}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_notification=${callback_notification}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}			
@@ -996,7 +996,7 @@ Post Create subscription - NO-DUPLICATION
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/lccnSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_notification=${callback_notification}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_notification=${callback_notification}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}		
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
index 8aab471ed51513f33230ddeb1bd34d14a7507d48..237409f6437f11a58d98526ce520b19026b4490d 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot
@@ -95,7 +95,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
-    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}
+    ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}    
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -107,7 +107,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
-    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}
+    ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
@@ -119,7 +119,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub
     Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json
-    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}
+    ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response 
     Set Global Variable    ${response}    ${outputResponse}
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest .json b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest.json
similarity index 100%
rename from SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest .json
rename to SOL003/VirtualisedResourcesQuotaAvailableNotification-API/jsons/vrQuotaAvailSubscriptionRequest.json
diff --git a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
index 20e4d62acb3d95f1631abe3aae9d084c30c82412..d67a251d2d18a501781683dcea5c3c4e36c1cf19 100644
--- a/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
+++ b/SOL005/NSFaultManagement-API/NSFMOperationKeywords.robot
@@ -214,7 +214,7 @@ POST Subscription
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${outputResponse}=    Output    response
     Set Global Variable    ${response}    ${outputResponse}
@@ -226,7 +226,7 @@ POST Subscription
     # Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     # ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    # ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    # ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     # Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}		
     # ${outputResponse}=    Output    response
 	# Set Global Variable    ${response}    ${outputResponse}	
@@ -238,7 +238,7 @@ POST Subscription
     # Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
     # Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     # ${template}=    Get File    jsons/fmSubscriptionRequest.json
-    # ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
+    # ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}
     # Post    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     # ${outputResponse}=    Output    response
 	# Set Global Variable    ${response}    ${outputResponse}	
diff --git a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
index 3da49c3c07ba132095dab83f43b06472737372e8..d70330ae18223957ebb3c394d5905e552fc4ab74 100644
--- a/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
+++ b/SOL005/NSPerformanceManagement-API/NSPerformanceManagementKeywords.robot
@@ -508,7 +508,7 @@ Create Sessions
     Pass Execution If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 0    MockServer not started as NFVO is not checking the notification endpoint
     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}
+    Create Mock Session  ${callback_uri}:${callback_port}
        
 Check Notification Endpoint
     &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}
diff --git a/SOL005/NSPerformanceManagement-API/environment/variables.txt b/SOL005/NSPerformanceManagement-API/environment/variables.txt
index b2e1aacbd399ad3a594207e9a5e8b921bb1d10d4..ff91e29637d04f79c5554602e32e378838eeaca7 100644
--- a/SOL005/NSPerformanceManagement-API/environment/variables.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/variables.txt
@@ -18,7 +18,7 @@ ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.
 ${testOptionalMethods}    0
 
 ${callback_port}    9091
-${callback_uri}    http://172.22.1.7:${callback_port}
+${callback_uri}    http://172.22.1.7
 ${callback_endpoint}    /nspm/subscriptions
 ${callback_endpoint_error}    /subs_404
 ${sleep_interval}    20s
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index e32dacda4b41d56ed8f56040f044fb5c1633415d..aaecf440d22bb4a37a931d713528a0d16347961c 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -674,7 +674,7 @@ Send Post Request for VNF Package Subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -687,7 +687,7 @@ Send Post Request for Duplicated VNF Package Subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
@@ -720,7 +720,7 @@ Send Delete Request for VNF Package Subscriptions
 Check HTTP Response Body PkgmSubscription Attributes Values Match the Issued Subscription
     Log    Check Response matches subscription
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     ${subscription}=    evaluate    json.loads('''${body}''')    json
     Should Be Equal    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
 
@@ -751,7 +751,7 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
     Validate Json    PkgmSubscription.schema.json    ${result}
     Log    Validated PkgmSubscription schema
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     ${subscription}=    evaluate    json.loads('''${body}''')    json
     Should Be Equal    ${result['callbackUri']}    ${subscription['callbackUri']}
     Log    Validated Issued subscription is same as original
@@ -873,7 +873,7 @@ Check Notification Endpoint
 Check HTTP Response Body Matches the Subscription
     Log    Check Response matches subscription
     ${template}=    Get File    jsons/subscriptions.json
-    ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
+    ${body}=        Format String   ${template}     callback_uri=${callback_uri}:${callback_port}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     ${subscription}=    evaluate    json.loads('''${body}''')    json
     Should Be Equal As Strings    ${response['body']['callbackUri']}    ${subscription['callbackUri']}