diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54b8aa1ddf97644939b6711a4acdf0c2803f7590..9cab8396fcff347b9f27a375b5a0c99ad6e7686d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,7 @@ build:
   script:
     - docker-compose -f docker-compose.yml -f docker-compose.ci.yml build
     - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
+    - test $FORCE_RECREATE && docker rm -f $(docker ps -q) || true
     - docker-compose -f docker-compose.yml -f docker-compose.ci.yml push
 
 .deploy: &deploy_template