diff --git a/doc/testing/robotframework/README.md b/doc/testing/robotframework/README.md
index fad7717ec1ca73ee5e8d77eb3f1a799372f37de8..825881f430f041068e63932ee909ad9441b497f1 100644
--- a/doc/testing/robotframework/README.md
+++ b/doc/testing/robotframework/README.md
@@ -28,6 +28,9 @@ To run Mock Server locally you can just execute the next script:
 ```
 cd services
 ./run_mock_server.sh
+
+or
+./run.sh -s
 ```
 
 If you want to launch only tests that not needed mockserver, just add "--exclude mockserver" parameter to robot execution:
@@ -35,6 +38,14 @@ If you want to launch only tests that not needed mockserver, just add "--exclude
 ./run_capif_tests.sh --include <TAG> --exclude mockserver
 ```
 
+After run tests the Mock Server can be removed from local deployment:
+```
+./clean_mock_server.sh
+
+or
+./clean_capif_docker_services.sh -s
+```
+
 ## Manual Build And Test Execution
 
 * **Build Robot docker image**:
@@ -64,7 +75,7 @@ docker run -ti --rm --network="host" \
     --add-host host.docker.internal:host-gateway \
     --add-host vault:host-gateway \
     --add-host register:host-gateway \
-    --add-host mockserver:host-gateway \
+    --add-host mock-server:host-gateway \
     -v <PATH_TO_REPOSITORY>/tests:/opt/robot-tests/tests \
     -v <PATH_RESULT_FOLDER>:/opt/robot-tests/results capif-robot-test:latest  \
     --variable CAPIF_HOSTNAME:$CAPIF_HOSTNAME \
@@ -98,7 +109,7 @@ docker run -ti --rm --network="host" \
     --add-host host.docker.internal:host-gateway \
     --add-host vault:host-gateway \
     --add-host register:host-gateway \
-    --add-host mockserver:host-gateway \
+    --add-host mock-server:host-gateway \
     -v <PATH_TO_REPOSITORY>/tests:/opt/robot-tests/tests \
     -v <PATH_RESULT_FOLDER>:/opt/robot-tests/results capif-robot-test:latest  \
     --variable CAPIF_HOSTNAME:$CAPIF_HOSTNAME \