diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 14f95b742..aab20d8e0 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -129,6 +129,7 @@ jobs:
 
       - run: make acceptance-tests-up
       - run: make acceptance-tests-run
+      - run: make acceptance-tests-down
       - run: c2cciutils-docker-logs || true
         if: always()
 
diff --git a/Makefile b/Makefile
index 922699f9b..99cbfa4c3 100644
--- a/Makefile
+++ b/Makefile
@@ -64,9 +64,6 @@ acceptance-tests-run: .env
 .PHONY: acceptance-tests-down
 acceptance-tests-down: .env
 	docker compose down || true
-	docker run --rm --volume=/tmp/geoserver-data:/mnt/geoserver_datadir camptocamp/geoserver \
-		bash -c 'rm -rf /mnt/geoserver_datadir/*'
-	rmdir /tmp/geoserver-data
 
 .PHONY: dist
 dist: build-builder