diff --git a/src/organisation/schemas.py b/src/organisation/schemas.py
index b98247b..b4f5019 100644
--- a/src/organisation/schemas.py
+++ b/src/organisation/schemas.py
@@ -5,23 +5,28 @@ Models:
  - List: Description
  - Models: Description
 """
-from typing import Optional, Any
-from pydantic import Json
+from typing import Optional
 
 from src.schemas import CustomBaseModel
 from src.organisation.constants import Status, ContactType
 
 
+class OrgQuestionnaire(CustomBaseModel):
+	question_one: str
+	question_two: str
+	question_three: str
+
+
 class OrgOrgPostRequest(CustomBaseModel):
 	name: str
-	intake_questionnaire: Optional[Json[Any]] = None
+	intake_questionnaire: Optional[OrgQuestionnaire] = None
 
 	billing_contact_id: Optional[int] = None
 	security_contact_id: Optional[int] = None
 	owner_contact_id: Optional[int] = None
 
 class OrgQuestionnairePatchRequest(CustomBaseModel):
-	intake_questionnaire: Json[Any]
+	intake_questionnaire: OrgQuestionnaire
 	partial: bool
 
 class OrgStatusPatchRequest(CustomBaseModel):