diff --git a/ci/Makefile b/ci/Makefile
index 2a1da6b..98a5a20 100644
--- a/ci/Makefile
+++ b/ci/Makefile
@@ -1,121 +1,121 @@
 all:
 	for dist in $$(find . -mindepth 1 -maxdepth 1 -type f -exec basename {} \; | sort | grep -E '^[a-z]+$$'); do \
-		docker build -t kolab/ci-$$dist - < $$dist ; \
+		docker build --rm=true --force-rm=true -t kolab/ci-$$dist - < $$dist ; \
 	done
 
 run:
-	docker run -t -i \
+	docker run --rm=true --force-rm=true -t -i -h kolab.example.org \
 		-e "ID=$(id)" \
 		-e "COMMIT=$(commit)" \
 		-e "DIFFERENTIAL=$(differential)" \
 		-e "PHAB_CERT=$(PHAB_CERT)" \
 		-e "PHAB_USER=$(PHAB_USER)" \
 		-e "URI=$(uri)" \
 		-e "VCS=$(vcs)" \
 		-e "TEST_BUILD=$(test_build)" \
 		-e "TEST_FUNCTIONAL=$(test_functional)" \
 		-e "TEST_INTEGRATION=$(test_integration)" \
 		-e "TEST_PERFORMANCE=$(test_performance)" \
 		-e "TEST_UNIT=$(test_unit)" \
 		--rm=true kolab/ci-$(DIST) 2>&1 | tee $(DIST).log
 
 list:
 	@for dist in $$(find . -mindepth 1 -maxdepth 1 -type f -exec basename {} \; | sort | grep -E '^[a-z]+$$'); do \
 		echo $$dist ; \
 	done
 
 clean:
 	for container in $$(docker ps -a | grep Exited | awk '{print $$1}'); do \
 		docker rm -f $$container ; \
 	done
 	for image in $$(docker images -aq --filter dangling=true); do \
 		docker rmi -f $$image ; \
 	done
 
 really-clean:
 	for dist in $$(find . -mindepth 1 -maxdepth 1 -type f -exec basename {} \; | sort | grep -E '^[a-z]+$$'); do \
 		docker rmi kolab/ci-$$dist || : ; \
 		docker rmi $$dist || : ; \
 	done
 
 centos: rhel
 
 debian: squeeze wheezy jessie sid
 
 fedora: heisenbug twentyone rawhide
 
 opensuse: bottle harlequin tumbleweed
 
 rhel: santiago maipo
 
 ubuntu: precise trusty utopic vivid
 
 bottle:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 harlequin:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 heisenbug:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 jessie:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 maipo:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 precise:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 rawhide:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 santiago:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 sid:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 squeeze:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 trusty:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 tumbleweed:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 twentyone:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 utopic:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 vivid:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 wheezy:
-	docker build -t $@ - < $@
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < $@
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 tikanga:
-	docker build -t $@ - < tikanga.obsolete
-	docker run -it --entrypoint="/bin/bash" $@ -s
+	docker build --rm=true --force-rm=true -t $@ - < tikanga.obsolete
+	docker run -it -h "kolab.example.org" --entrypoint="/bin/bash" $@ -s
 
 .PHONY: bottle harlequin heisenbug jessie maipo precise rawhide santiago sid squeeze tikanga trusty tumbleweed twentyone utopic vivid wheezy