diff --git a/tests_e2e/docker/docker-compose-acme-e2e.yml b/tests_e2e/docker/docker-compose-acme-e2e.yml
index 557d469..1dcd147 100644
--- a/tests_e2e/docker/docker-compose-acme-e2e.yml
+++ b/tests_e2e/docker/docker-compose-acme-e2e.yml
@@ -94,6 +94,7 @@ services:
 
   # EasyHAProxy with Certbot
   haproxy:
+    image: byjg/easy-haproxy:local
     build:
       context: ../..
       dockerfile: deploy/docker/Dockerfile
@@ -111,6 +112,9 @@ services:
     environment:
       EASYHAPROXY_DISCOVER: docker
       HAPROXY_CUSTOMERRORS: "true"
+      HAPROXY_USERNAME: admin
+      HAPROXY_PASSWORD: password
+      HAPROXY_STATS_PORT: 1936
 
       # Certbot configuration pointing to Pebble
       EASYHAPROXY_CERTBOT_EMAIL: test@example.com
diff --git a/tests_e2e/test_docker_compose.py b/tests_e2e/test_docker_compose.py
index 3d287a4..5e9b419 100644
--- a/tests_e2e/test_docker_compose.py
+++ b/tests_e2e/test_docker_compose.py
@@ -842,16 +842,21 @@ def docker_compose_acme() -> Generator[None, None, None]:
     )
 
     fixture = DockerComposeFixture(str(DOCKER_DIR / "docker-compose-acme-e2e.yml"), startup_wait=0)
-    fixture.up()
-    yield
-    fixture.down()
-
-    # Clean up volume after test
-    subprocess.run(
-        ["docker", "volume", "rm", volume_name],
-        stdout=subprocess.DEVNULL,
-        stderr=subprocess.DEVNULL
-    )
+    try:
+        fixture.up()
+    except Exception:
+        fixture.down()
+        raise
+    try:
+        yield
+    finally:
+        fixture.down()
+        # Clean up volume after test
+        subprocess.run(
+            ["docker", "volume", "rm", volume_name],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL
+        )
 
 
 @pytest.mark.acme