diff --git a/README.md b/README.md
index d848596..7de3846 100644
--- a/README.md
+++ b/README.md
@@ -216,6 +216,8 @@ services:
       MATOMO_INSTALLER_READY_TIMEOUT_S: "180"
       MATOMO_INSTALLER_STEP_TIMEOUT_S: "30"
       MATOMO_INSTALLER_STEP_DEADLINE_S: "180"
+      MATOMO_INSTALLER_TABLES_CREATION_TIMEOUT_S: "180"
+      MATOMO_INSTALLER_TABLES_ERASE_TIMEOUT_S: "120"
       MATOMO_INSTALLER_DEBUG_DIR: "/tmp/matomo-bootstrap"
 
     restart: "no"
diff --git a/docker-compose.yml b/docker-compose.yml
index 3dab7e8..3f0785b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -68,6 +68,8 @@ services:
       MATOMO_INSTALLER_READY_TIMEOUT_S: "180"
       MATOMO_INSTALLER_STEP_TIMEOUT_S: "30"
       MATOMO_INSTALLER_STEP_DEADLINE_S: "180"
+      MATOMO_INSTALLER_TABLES_CREATION_TIMEOUT_S: "180"
+      MATOMO_INSTALLER_TABLES_ERASE_TIMEOUT_S: "120"
       MATOMO_INSTALLER_DEBUG_DIR: "/tmp/matomo-bootstrap"
     # bootstrap is a one-shot command that prints the token and exits
     # if you want to re-run, do: docker compose run --rm bootstrap
diff --git a/env.sample b/env.sample
index 9db1d64..836d905 100644
--- a/env.sample
+++ b/env.sample
@@ -32,4 +32,6 @@ MATOMO_TIMEZONE=Germany - Berlin
 # MATOMO_INSTALLER_READY_TIMEOUT_S=180
 # MATOMO_INSTALLER_STEP_TIMEOUT_S=30
 # MATOMO_INSTALLER_STEP_DEADLINE_S=180
+# MATOMO_INSTALLER_TABLES_CREATION_TIMEOUT_S=180
+# MATOMO_INSTALLER_TABLES_ERASE_TIMEOUT_S=120
 # MATOMO_INSTALLER_DEBUG_DIR=/tmp/matomo-bootstrap
diff --git a/tests/e2e/test_bootstrap_nix.py b/tests/e2e/test_bootstrap_nix.py
index 0661fe4..ab44171 100644
--- a/tests/e2e/test_bootstrap_nix.py
+++ b/tests/e2e/test_bootstrap_nix.py
@@ -24,6 +24,8 @@ export TERM='xterm'
 export MATOMO_INSTALLER_READY_TIMEOUT_S="${{MATOMO_INSTALLER_READY_TIMEOUT_S:-240}}"
 export MATOMO_INSTALLER_STEP_TIMEOUT_S="${{MATOMO_INSTALLER_STEP_TIMEOUT_S:-45}}"
 export MATOMO_INSTALLER_STEP_DEADLINE_S="${{MATOMO_INSTALLER_STEP_DEADLINE_S:-240}}"
+export MATOMO_INSTALLER_TABLES_CREATION_TIMEOUT_S="${{MATOMO_INSTALLER_TABLES_CREATION_TIMEOUT_S:-240}}"
+export MATOMO_INSTALLER_TABLES_ERASE_TIMEOUT_S="${{MATOMO_INSTALLER_TABLES_ERASE_TIMEOUT_S:-180}}"
 export MATOMO_INSTALLER_DEBUG_DIR="${{MATOMO_INSTALLER_DEBUG_DIR:-/tmp/matomo-bootstrap}}"
 
 # Make sure we have a writable HOME (compose already sets HOME=/tmp/home)
diff --git a/tests/e2e/test_docker_compose_stack.py b/tests/e2e/test_docker_compose_stack.py
index ce9db97..20a8fa1 100644
--- a/tests/e2e/test_docker_compose_stack.py
+++ b/tests/e2e/test_docker_compose_stack.py
@@ -173,6 +173,8 @@ class TestRootDockerComposeDefinition(unittest.TestCase):
         self.assertIn("MATOMO_INSTALLER_READY_TIMEOUT_S:", bootstrap_block)
         self.assertIn("MATOMO_INSTALLER_STEP_TIMEOUT_S:", bootstrap_block)
         self.assertIn("MATOMO_INSTALLER_STEP_DEADLINE_S:", bootstrap_block)
+        self.assertIn("MATOMO_INSTALLER_TABLES_CREATION_TIMEOUT_S:", bootstrap_block)
+        self.assertIn("MATOMO_INSTALLER_TABLES_ERASE_TIMEOUT_S:", bootstrap_block)
 
         matomo_block = _extract_service_block(cfg.stdout, "matomo")
         self.assertIn("healthcheck:", matomo_block)