diff --git a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplBaseIT.java b/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplBaseIT.java
index 0d45968..c036693 100644
--- a/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplBaseIT.java
+++ b/feasibility-dsf-process/src/test/java/de/medizininformatik_initiative/feasibility_dsf_process/client/flare/FlareWebserviceClientImplBaseIT.java
@@ -2,7 +2,6 @@
 
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
-import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.utility.DockerImageName;
 
 import java.net.URL;
@@ -13,26 +12,27 @@ public abstract class FlareWebserviceClientImplBaseIT {
 
     protected static final Network DEFAULT_CONTAINER_NETWORK = Network.newNetwork();
 
-    @Container
-    public static GenericContainer<?> fhirServer = new GenericContainer<>(
-            DockerImageName.parse("samply/blaze:0.23.0"))
+    public static GenericContainer<?> fhirServer = new GenericContainer<>(DockerImageName.parse("samply/blaze:0.23.0"))
             .withExposedPorts(8080)
             .withNetwork(DEFAULT_CONTAINER_NETWORK)
             .withNetworkAliases("fhir-server")
             .withEnv("LOG_LEVEL", "debug");
 
-    @Container
-    public static GenericContainer<?> flare = new GenericContainer<>(
-            DockerImageName.parse("ghcr.io/medizininformatik-initiative/flare:2.1.0"))
+    public static GenericContainer<?> flare = new GenericContainer<>(DockerImageName.parse("ghcr.io/medizininformatik-initiative/flare:2.1.0"))
             .withExposedPorts(8080)
             .withNetwork(DEFAULT_CONTAINER_NETWORK)
             .withNetworkAliases("flare")
-            .withEnv(Map.of(
-                    "FLARE_FHIR_SERVER", "http://fhir-server:8080/fhir/"
-            ))
+            .withEnv(Map.of("FLARE_FHIR_SERVER", "http://fhir-server:8080/fhir/"))
             .withStartupTimeout(Duration.ofMinutes(5))
             .dependsOn(fhirServer);
 
+    static {
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            flare.stop();
+            fhirServer.stop();
+        }));
+    }
+
     protected static URL getResource(final String name) {
         return FlareWebserviceClientImplBaseIT.class.getResource(name);
     }