diff --git a/Makefile b/Makefile
index 120f5307db..752b5221be 100644
--- a/Makefile
+++ b/Makefile
@@ -49,8 +49,8 @@ fuzz:
 
 
 test-integration:
-	docker image build --pull -f Dockerfile -t mox_integration_moxmail .
-	docker image build --pull -f testdata/integration/Dockerfile.test -t mox_integration_test testdata/integration
+	docker image build --pull --no-cache -f Dockerfile -t mox_integration_moxmail .
+	docker image build --pull --no-cache -f testdata/integration/Dockerfile.test -t mox_integration_test testdata/integration
 	-rm -rf testdata/integration/moxacmepebble/data
 	-rm -rf testdata/integration/moxmail2/data
 	-rm -f testdata/integration/tmp-pebble-ca.pem
diff --git a/docker-compose-integration.yml b/docker-compose-integration.yml
index 7309126dd1..91e6e1ca78 100644
--- a/docker-compose-integration.yml
+++ b/docker-compose-integration.yml
@@ -1,6 +1,6 @@
 version: '3.7'
 services:
-  # We run integration_test.go from this container, it connects to both mox instances.
+  # We run integration_test.go from this container, it connects to the other mox instances.
   test:
     hostname: test.mox1.example
     image: mox_integration_test
@@ -86,10 +86,8 @@ services:
   localserve:
     hostname: localserve.mox1.example
     domainname: mox1.example
-    build:
-      dockerfile: Dockerfile.moxmail
-      context: testdata/integration
-    command: ["sh", "-c", "set -e; chmod o+r /etc/resolv.conf; go run . -- localserve -ip 172.28.1.60"]
+    image: mox_integration_moxmail
+    command: ["sh", "-c", "set -e; chmod o+r /etc/resolv.conf; mox localserve -ip 172.28.1.60"]
     volumes:
       - ./.go:/.go
       - ./testdata/integration/resolv.conf:/etc/resolv.conf