diff --git a/src/monitoring/.gitlab-ci.yml b/src/monitoring/.gitlab-ci.yml
index 0fd5e860286b1ccf6ef845eff3417da99e9c88b9..f652234129c375dc36f9c14bac1632af86d89097 100644
--- a/src/monitoring/.gitlab-ci.yml
+++ b/src/monitoring/.gitlab-ci.yml
@@ -79,9 +79,11 @@ test monitoring pytest:
   before_script:
     - if docker network list | grep teraflowbridge; then echo "teraflowbridge is already created"; else docker network create -d bridge teraflowbridge; fi
   script:
-    - docker run -d -p 7070:7070 --name monitoring-test --network=teraflowbridge --rm "$IMAGE_NAME:$IMAGE_TAG"
-    - docker exec monitoring-test bash
+    - docker run -d -p 7070:7070 --name monitoring-tests --network=teraflowbridge --rm "$IMAGE_NAME:$IMAGE_TAG"
+    - docker exec monitoring-tests bash
     - docker exec pytest --junitxml=report.xml
+  after_script:
+    - docker stop monitoring-test
   artifacts:
     when: always
     reports:
diff --git a/src/monitoring/build.sh b/src/monitoring/build.sh
index 41bf3f32c9e4328ba57e5c4a2fc537a9c9f54319..fc3b40506563ccbf84949526e4701e10af30185b 100755
--- a/src/monitoring/build.sh
+++ b/src/monitoring/build.sh
@@ -2,6 +2,3 @@
 
 echo "BUILD monitoring server"
 docker build -t "monitoring:dockerfile" -f Dockerfile .
-
-echo "BUILD monitoring client"
-docker build -t "monitoring_client:dockerfile" -f tests/Dockerfile .
diff --git a/src/monitoring/clean.sh b/src/monitoring/clean.sh
index 58667a9e6c127181e243c7b29e9c7bf0891cebff..9c96b6e12be0818bdc8a5d21ec7d37c5b1356115 100755
--- a/src/monitoring/clean.sh
+++ b/src/monitoring/clean.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
 docker rm --force monitoring
-docker rm --force monitoring_client
 docker network remove teraflowbridge
 
diff --git a/src/monitoring/start.sh b/src/monitoring/start.sh
index dd12fc87cc7b75ebf61e59e3a00fe269fc3af60b..da0e7789d92a37f4bd0f429a1d01c7bac468deec 100755
--- a/src/monitoring/start.sh
+++ b/src/monitoring/start.sh
@@ -2,4 +2,3 @@
 docker network create -d bridge teraflowbridge
 
 docker run -d -p 7070:7070 --name monitoring --network=teraflowbridge monitoring:dockerfile
-docker run -d -p --name monitoring_client --network=teraflowbridge monitoring_client:dockerfile