diff --git a/Dockerfile b/Dockerfile
index 19381d68..3d68e819 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,11 @@
-FROM python:3.9-buster
+FROM python:3.9-slim-trixie
 
-COPY pyproject.toml .
-COPY uv.lock .
+COPY --from=ghcr.io/astral-sh/uv:0.11.19 /uv /uvx /bin/
 
-RUN apt-get update -y
+WORKDIR /home/package
 
-# Install uv
-COPY --from=ghcr.io/astral-sh/uv:0.11.16 /uv /uvx /bin/
+COPY pyproject.toml .
+COPY uv.lock .
 
 # Install dependencies
 RUN uv sync --frozen --no-install-project
diff --git a/tests/conftest.py b/tests/conftest.py
index cc61935a..7897f80d 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -11,6 +11,8 @@
 from meilisearch.models.embedders import OpenAiEmbedder, UserProvidedEmbedder
 from tests import common
 
+TEST_TASK_TIMEOUT_MS = 30_000
+
 
 @fixture(scope="session")
 def client():
@@ -30,7 +32,7 @@ def _clear_indexes(meilisearch_client):
     indexes = meilisearch_client.get_indexes()
     for index in indexes["results"]:
         task = meilisearch_client.index(index.uid).delete()
-        meilisearch_client.wait_for_task(task.task_uid)
+        meilisearch_client.wait_for_task(task.task_uid, timeout_in_ms=TEST_TASK_TIMEOUT_MS)
 
 
 @fixture(autouse=True)
@@ -143,7 +145,7 @@ def empty_index(client, index_uid: Optional[str] = None):
 
     def index_maker(index_uid=index_uid):
         task = client.create_index(uid=index_uid)
-        client.wait_for_task(task.task_uid)
+        client.wait_for_task(task.task_uid, timeout_in_ms=TEST_TASK_TIMEOUT_MS)
         return client.get_index(uid=index_uid)
 
     return index_maker
diff --git a/tests/settings/test_settings_embedders.py b/tests/settings/test_settings_embedders.py
index 0265d6c3..d7137dfb 100644
--- a/tests/settings/test_settings_embedders.py
+++ b/tests/settings/test_settings_embedders.py
@@ -211,7 +211,7 @@ def test_composite_embedder_format(empty_index):
     }
 
     response = index.update_embedders(composite_embedder)
-    update = index.wait_for_task(response.task_uid)
+    update = index.wait_for_task(response.task_uid, timeout_in_ms=60000)
     embedders = index.get_embedders()
     assert update.status == "succeeded"
 
diff --git a/tests/settings/test_settings_facet_search.py b/tests/settings/test_settings_facet_search.py
index 00ab6040..680da502 100644
--- a/tests/settings/test_settings_facet_search.py
+++ b/tests/settings/test_settings_facet_search.py
@@ -1,6 +1,7 @@
 DEFAULT_FACET_SEARCH_SETTINGS_STATUS = True
 ENABLED_FACET_SEARCH_SETTINGS_STATUS = True
 DISABLED_FACET_SEARCH_SETTINGS_STATUS = False
+TEST_TASK_TIMEOUT_MS = 30_000
 
 
 def test_get_facet_search_settings(empty_index):
@@ -13,12 +14,12 @@ def test_update_facet_search_settings(empty_index):
     index = empty_index()
 
     response = index.update_facet_search_settings(DISABLED_FACET_SEARCH_SETTINGS_STATUS)
-    index.wait_for_task(response.task_uid)
+    index.wait_for_task(response.task_uid, timeout_in_ms=TEST_TASK_TIMEOUT_MS)
     response = index.get_facet_search_settings()
     assert DISABLED_FACET_SEARCH_SETTINGS_STATUS == response
 
     response = index.update_facet_search_settings(ENABLED_FACET_SEARCH_SETTINGS_STATUS)
-    index.wait_for_task(response.task_uid)
+    index.wait_for_task(response.task_uid, timeout_in_ms=TEST_TASK_TIMEOUT_MS)
     response = index.get_facet_search_settings()
     assert ENABLED_FACET_SEARCH_SETTINGS_STATUS == response
 
@@ -27,12 +28,12 @@ def test_reset_facet_search_settings(empty_index):
     index = empty_index()
 
     response = index.update_facet_search_settings(DISABLED_FACET_SEARCH_SETTINGS_STATUS)
-    index.wait_for_task(response.task_uid)
+    index.wait_for_task(response.task_uid, timeout_in_ms=TEST_TASK_TIMEOUT_MS)
     response = index.get_facet_search_settings()
     assert DISABLED_FACET_SEARCH_SETTINGS_STATUS == response
     assert DEFAULT_FACET_SEARCH_SETTINGS_STATUS != response
 
     response = index.reset_facet_search_settings()
-    index.wait_for_task(response.task_uid)
+    index.wait_for_task(response.task_uid, timeout_in_ms=TEST_TASK_TIMEOUT_MS)
     response = index.get_facet_search_settings()
     assert DEFAULT_FACET_SEARCH_SETTINGS_STATUS == response