diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a12d9bdc7b5b0ba0849b07418013e6542f46f9d0..48228c1c657b657434217451746e29998274084e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,9 +36,9 @@ composer:
     - if: '$CI_COMMIT_MESSAGE =~ /test/'
     - if: '$CI_COMMIT_BRANCH  =~ /test/ || $CI_COMMIT_BRANCH == "production" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
   script:
-    - docker network create rekall
-    - docker run --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 --name=mysql mysql:5.6
-    - docker run --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
+    - 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 --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
     - docker network rm rekall
   artifacts:
     when: always