diff --git a/skyvern/forge/agent.py b/skyvern/forge/agent.py
index 8730d0a1..2ea08384 100644
--- a/skyvern/forge/agent.py
+++ b/skyvern/forge/agent.py
@@ -210,7 +210,7 @@ class ForgeAgent:
         )
         return task, step
 
-    async def create_task(self, task_request: TaskRequest, organization_id: str | None = None) -> Task:
+    async def create_task(self, task_request: TaskRequest, organization_id: str) -> Task:
         webhook_callback_url = str(task_request.webhook_callback_url) if task_request.webhook_callback_url else None
         totp_verification_url = str(task_request.totp_verification_url) if task_request.totp_verification_url else None
         task = await app.DATABASE.create_task(
diff --git a/skyvern/forge/agent_functions.py b/skyvern/forge/agent_functions.py
index 9524590c..6e0e3664 100644
--- a/skyvern/forge/agent_functions.py
+++ b/skyvern/forge/agent_functions.py
@@ -463,7 +463,7 @@ class AgentFunction:
         return
 
     async def validate_task_execution(
-        self, organization_id: str | None = None, task_id: str | None = None, task_version: str | None = None
+        self, organization_id: str, task_id: str | None = None, task_version: str | None = None
     ) -> None:
         return
 
diff --git a/skyvern/forge/sdk/db/client.py b/skyvern/forge/sdk/db/client.py
index 5b693f6a..63d01be2 100644
--- a/skyvern/forge/sdk/db/client.py
+++ b/skyvern/forge/sdk/db/client.py
@@ -312,7 +312,7 @@ class AgentDB:
             LOG.error("UnexpectedError", exc_info=True)
             raise
 
-    async def get_task_steps(self, task_id: str, organization_id: str | None = None) -> list[Step]:
+    async def get_task_steps(self, task_id: str, organization_id: str) -> list[Step]:
         try:
             async with self.Session() as session:
                 if steps := (
diff --git a/skyvern/forge/sdk/models.py b/skyvern/forge/sdk/models.py
index 8043ffb5..f8057eb1 100644
--- a/skyvern/forge/sdk/models.py
+++ b/skyvern/forge/sdk/models.py
@@ -49,7 +49,7 @@ class Step(BaseModel):
     order: int
     is_last: bool
     retry_index: int = 0
-    organization_id: str | None = None
+    organization_id: str
     input_token_count: int = 0
     output_token_count: int = 0
     reasoning_token_count: int | None = None
diff --git a/skyvern/forge/sdk/schemas/tasks.py b/skyvern/forge/sdk/schemas/tasks.py
index e09f5b0c..63c84d13 100644
--- a/skyvern/forge/sdk/schemas/tasks.py
+++ b/skyvern/forge/sdk/schemas/tasks.py
@@ -231,7 +231,7 @@ class Task(TaskBase):
         None,
         description="The reason for the task failure.",
     )
-    organization_id: str | None = None
+    organization_id: str
     workflow_run_id: str | None = None
     workflow_permanent_id: str | None = None
     order: int | None = None