diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7277ff38811300e6191d462e5d8f9f281b561d9..342403408ae72c2b6e30394b81aa5b2ec87cc55f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,14 +31,19 @@ composer:
   before_script:
       - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
       - docker pull $TEST_IMAGE
+      - docker network ls -f name=rekall || docker network create rekall
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "web"'
     - if: '$CI_COMMIT_MESSAGE =~ /test/'
     - if: '$CI_COMMIT_BRANCH  =~ /test/ || $CI_COMMIT_BRANCH == "production" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
   script:
-    - docker network ls -f name=rekall || docker network create rekall
-    - docker run --rm --network rekall -e MYSQL_DATABASE=$MYSQL_DATABASE -e MYSQL_USER=$MYSQL_USER -e MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD -e $MYSQL_PASSWORD=$MYSQL_PASSWORD -v ${CI_PROJECT_DIR}/docker/mysql/init_db_d:/docker-entrypoint-initdb.d -d --name=mysql mysql:5.6
+    - docker run --rm --name rekall --network rekall -e MYSQL_DATABASE=$MYSQL_DATABASE -e MYSQL_USER=$MYSQL_USER -e MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD -e $MYSQL_PASSWORD=$MYSQL_PASSWORD -v ${CI_PROJECT_DIR}/docker/mysql/init_db_d:/docker-entrypoint-initdb.d -d --name=mysql mysql:5.6
     - docker run --rm --network rekall -v ${CI_PROJECT_DIR}:/sites/memorekall/www/web_dev -v /log:/sites/memorekall/www/web_dev/log --entrypoint /sites/memorekall/www/web_dev/tools/ci-job.sh $TEST_IMAGE
+  after_script:
+    - docker stop mysql
+    - docker rm mysql
+    - docker stop rekall
+    - docker rm rekall
     - docker network rm rekall
   artifacts:
     when: always