diff --git a/src/Container/GenericContainer.php b/src/Container/GenericContainer.php
index ec63f99..5a9d113 100644
--- a/src/Container/GenericContainer.php
+++ b/src/Container/GenericContainer.php
@@ -47,6 +47,8 @@ class GenericContainer implements TestContainer
     /** @var list<string> */
     protected array $command = [];
 
+    protected bool $autoRemove = false;
+
     protected ?string $entryPoint = null;
 
     protected ?HealthConfig $healthConfig = null;
@@ -120,6 +122,13 @@ public function withCommand(array $command): static
         return $this;
     }
 
+    public function withAutoRemove(bool $autoRemove): static
+    {
+        $this->autoRemove = $autoRemove;
+
+        return $this;
+    }
+
     /**
      * @param array<array{source: string, target: string, mode?: int}> $files
      */
@@ -455,6 +464,8 @@ protected function createHostConfig(): ?HostConfig
 
         $hostConfig = new HostConfig();
 
+        $hostConfig->setAutoRemove($this->autoRemove);
+
         if ($this->exposedPorts !== []) {
             $portBindings = $this->createPortBindings();
             $hostConfig->setPortBindings($portBindings);