diff --git a/substra/sdk/models.py b/substra/sdk/models.py
index dfa94e8d..17b3c2e1 100644
--- a/substra/sdk/models.py
+++ b/substra/sdk/models.py
@@ -34,11 +34,12 @@ class Status(str, enum.Enum):
     """Status of the task"""
 
     unknown = "STATUS_UNKNOWN"
-    doing = "STATUS_DOING"
+    building = "STATUS_BUILDING"
     done = "STATUS_DONE"
     failed = "STATUS_FAILED"
-    todo = "STATUS_TODO"
-    waiting = "STATUS_WAITING"
+    waiting_for_executor_slot = "STATUS_WAITING_FOR_EXECUTOR_SLOT"
+    waiting_for_parent_tasks = "STATUS_WAITING_FOR_PARENT_TASKS"
+    waiting_for_builder_slot = "STATUS_WAITING_FOR_BUILDER_SLOT"
     canceled = "STATUS_CANCELED"
 
 
diff --git a/tests/sdk/test_wait.py b/tests/sdk/test_wait.py
index e55fe08c..58c14ecf 100644
--- a/tests/sdk/test_wait.py
+++ b/tests/sdk/test_wait.py
@@ -58,7 +58,9 @@ def test_wait_task_failed(client, mocker):
 @pytest.mark.parametrize(
     ("asset_dict", "function_name", "status"),
     [
-        (datastore.TRAINTASK, "wait_task", Status.todo),
+        (datastore.TRAINTASK, "wait_task", Status.waiting_for_parent_tasks),
+        (datastore.TRAINTASK, "wait_task", Status.waiting_for_builder_slot),
+        (datastore.TRAINTASK, "wait_task", Status.waiting_for_executor_slot),
         (datastore.COMPUTE_PLAN, "wait_compute_plan", ComputePlanStatus.todo),
     ],
     ids=_param_name_maker,