diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f19ad2e6b4675ef795c2f64fcde08262428e86bd..f06b24a178ab6243a15f0ea2b8f202afe7aa5a15 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,15 +35,14 @@ test-image:
   services:
     - name: docker:${DOCKER_VERSION}-dind
   script:
-    - export MONGO_CONTAINER_NAME=mongo-container
-    - docker run -p 27017:27017 -d --name $MONGO_CONTAINER_NAME mongo:${MONGO_VERSION}
+    - docker run -p 27017:27017 -d --name mongo-container --rm mongo:${MONGO_VERSION}
     - docker build
       --tag "${CONTAINER_TAG}-test"
       --target=test
       "./app"
   after_script:
-    - docker stop $MONGO_CONTAINER_NAME | xargs docker rm
-    - docker image rm --force mongo:${MONGO_VERSION}
+    - docker stop mongo-container
+    - docker images -a | grep "mongo" | awk '{print $3}' | xargs docker rmi --force
     - docker image rm --force "${CONTAINER_TAG}-test"
 
 build-image: