diff --git a/SRV/RNIS/RnisQuery_BI_BO.robot b/SRV/RNIS/RnisQuery_BI_BO.robot
index efd22f109e30e9eabef6ab2f2cbb62c7615912ea..9b0ede398e57dacb89acc9cfd63cfb3f7e36178a 100644
--- a/SRV/RNIS/RnisQuery_BI_BO.robot
+++ b/SRV/RNIS/RnisQuery_BI_BO.robot
@@ -28,8 +28,7 @@ Request RabInfo info using non existing cell id
     ...  Reference https://forge.etsi.org/gitlab/mec/gs012-rnis-api/blob/master/RniAPI.yaml#/definitions/RabInfo
     Get RabInfo info using non existing cell id
     Check HTTP Response Status Code Is    404
-    Check ProblemDetails    404
-
+    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_404} == 1    Check ProblemDetails    404
 
 Request Plmn info using wrong parameters
     [Documentation]   TC_MEC_SRV_RNIS_017_BR
@@ -48,7 +47,7 @@ Request Plmn info using non existing application id
     ...  Reference https://forge.etsi.org/gitlab/mec/gs012-rnis-api/blob/master/RniAPI.yaml#/definitions/PlmnInfo
     Get PLMN info using non existing application id
     Check HTTP Response Status Code Is    404
-    Check ProblemDetails    404
+    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_404} == 1    Check ProblemDetails    404
 
 
 Request S1Bearer info using wrong parameters
@@ -68,7 +67,7 @@ Request S1Bearer info using non existing cell id
     ...  Reference https://forge.etsi.org/gitlab/mec/gs012-rnis-api/blob/master/RniAPI.yaml#/definitions/S1BearerInfo
     Get S1Bearer info using non existing cell id
     Check HTTP Response Status Code Is    404
-    Check ProblemDetails    404
+    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_404} == 1    Check ProblemDetails    404
 
 
 Request L2Meas info using wrong parameters
@@ -88,8 +87,7 @@ Request L2Meas info using non existing cell id
     ...  Reference https://forge.etsi.org/gitlab/mec/gs012-rnis-api/blob/master/RniAPI.yaml#/definitions/S1BearerInfo
     Get L2Meas info using non existing cell id
     Check HTTP Response Status Code Is    404
-    Check ProblemDetails    404
-
+    Run Keyword If    ${PIC_PROBLEM_DETAILS_ON_404} == 1    Check ProblemDetails    404
 
 *** Keywords ***
 Get RabInfo info using wrong parameters
diff --git a/SRV/RNIS/environment/variables.txt b/SRV/RNIS/environment/variables.txt
index d66fb53e73cde544bff20a4aaa1c3de23e89b297..16ec08498965ae2f8a048328250a91ebf0464808 100644
--- a/SRV/RNIS/environment/variables.txt
+++ b/SRV/RNIS/environment/variables.txt
@@ -1,36 +1,36 @@
 *** Variables ***
-${MEC-APP_SCHEMA}                   http
-#${MEC-APP_HOST}                     172.28.4.87
-#${MEC-APP_HOST}                     127.0.0.1
-${MEC-APP_HOST}                     192.168.56.1
-${MEC-APP_PORT}                     8081
+${MEC-APP_SCHEMA}                   https
+#${MEC-APP_HOST}                    172.28.4.87
+${MEC-APP_HOST}                     try-mec.etsi.org
+${MEC-APP_PORT}                     443
 ${SUBSCRIPTION_ID}                  7777
 ${NON_EXISTENT_SUBSCRIPTION_ID}     6666
 ${LINKS_SELF}                       http://example.com/exampleAPI/rni/v2/subscriptions
 ${SUBSCRIPTION_HREF_VALUE}          cell_changed
 ${SUBSCRIPTION_TYPE}                CELL_CHANGE
-${HREF}                             http://meAppClient.example.com/rni/v1/notifications/cell_change/77777
-${SUBSCRIPTION_VALUE}               {'href': '${HREF}', 'subscriptionType': '${SUBSCRIPTION_TYPE}'}
-${CELL_ID}                          0x800000A
-${C_ID}                             0xFFFFFFF
+${HREF}                             http://tapqa.plugtests.net:8111/michele/endpoint
+${SUBSCRIPTION_VALUE}               {'href': 'http://tapqa.plugtests.net:8111/michele/endpoint', 'subscriptionType': 'CELL_CHANGE'}
+${CELL_ID}                          6060606
+${C_ID}                             6060606
 ${NOT_EXISTENT_CELL_ID}             0x8000099
-${APP_INS_ID}                       01
+${APP_INS_ID}                       
 ${APP_ID}                           10
 ${NOT_EXISTENT_APP_INS_ID}          99
 ${response}                         {}
 ${TOKEN}                            Basic YWxhZGRpbjpvcGVuc2VzYW1l
 
 
-${apiRoot}
+${apiRoot}      /sbx3l3thqw
 ${apiVersion}    v2
 
+${PIC_PROBLEM_DETAILS_ON_404}    0
 
 # Notifications variables
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
-${callback_port}                    9091
-${callback_uri}                     http://192.168.56.103:${callback_port}
-${callback_endpoint}                /subscriptions
+${callback_port}                    8111
+${callback_uri}                     http://tapqa.plugtests.net:8111
+${callback_endpoint}                /michele/endpoint
 ${callback_endpoint_error}          /subs_404
 ${total_polling_time}               2 min
 ${polling_interval}                 10 sec