diff --git a/ci/Makefile b/ci/Makefile
index f027dd42..2945a13d 100644
--- a/ci/Makefile
+++ b/ci/Makefile
@@ -1,40 +1,42 @@
 PWD=$(shell pwd)
 
 
 configure:
 	cd .. ; \
 	bin/configure.sh config.demo ;
 
 setup:
+	docker kill kolab-tests || : ; \
+	docker rm kolab-tests || : ; \
 	cd .. && bin/quickstart.sh --nodev
 
 build:
 	cd .. && DOCKER_BUILDKIT=0 docker compose -f docker-compose.yml -f docker-compose.build.yml build swoole && DOCKER_BUILDKIT=0 docker compose -f docker-compose.yml -f docker-compose.build.yml build tests && cd ci
 
 lint:
 	docker kill kolab-tests || : ; \
 	docker rm kolab-tests || : ; \
-	docker run -v ${PWD}/../:/src/kolab.orig -t kolab-tests /lint.sh
+	docker run -v ${PWD}/../:/src/kolab.orig --name kolab-tests -t kolab-tests /lint.sh
 
 test:
 	docker kill kolab-tests || : ; \
 	docker rm kolab-tests || : ; \
-	docker run --network=kolab_kolab -v ${PWD}/../src:/src/kolabsrc.orig -t kolab-tests /init.sh testsuite
+	docker run --network=kolab_kolab -v ${PWD}/../src:/src/kolabsrc.orig --name kolab-tests -t kolab-tests /init.sh testsuite
 
 quicktest:
 	docker kill kolab-tests || : ; \
 	docker rm kolab-tests || : ; \
-	docker run --network=kolab_kolab -v ${PWD}/../src:/src/kolabsrc.orig -t kolab-tests /init.sh quicktest
+	docker run --network=kolab_kolab -v ${PWD}/../src:/src/kolabsrc.orig --name kolab-tests -t kolab-tests /init.sh quicktest
 
 browser:
 	docker kill kolab-tests || : ; \
 	docker rm kolab-tests || : ; \
-	docker run --network=kolab_kolab -v ${PWD}/../src:/src/kolabsrc.orig -t kolab-tests /init.sh suite-Browser
+	docker run --network=kolab_kolab -v ${PWD}/../src:/src/kolabsrc.orig --name kolab-tests -t kolab-tests /init.sh suite-Browser
 
 shell:
 	docker kill kolab-tests || : ; \
 	docker rm kolab-tests || : ; \
-	docker run --network=kolab_kolab -v ${PWD}/../src:/src/kolabsrc.orig -ti kolab-tests /init.sh shell
+	docker run --network=kolab_kolab -v ${PWD}/../src:/src/kolabsrc.orig --name kolab-tests -ti kolab-tests /init.sh shell
 
 all: configure build setup lint test