diff --git a/src/etos_lib/kubernetes/schemas/environment.py b/src/etos_lib/kubernetes/schemas/environment.py
index 9e86b30..cfc1c92 100644
--- a/src/etos_lib/kubernetes/schemas/environment.py
+++ b/src/etos_lib/kubernetes/schemas/environment.py
@@ -24,9 +24,9 @@ class EnvironmentSpec(BaseModel):
     """EnvironmentSpec is the specification of a Environment Kubernetes resource."""
 
     name: str
-    suite_id: str
-    sub_suite_id: str
-    test_suite_started_id: str
+    suite_id: Optional[str]
+    sub_suite_id: Optional[str]
+    test_suite_started_id: Optional[str]
     artifact: str
     context: str
     priority: int = 1
diff --git a/src/etos_lib/kubernetes/schemas/environment_request.py b/src/etos_lib/kubernetes/schemas/environment_request.py
index 22c610f..724587e 100644
--- a/src/etos_lib/kubernetes/schemas/environment_request.py
+++ b/src/etos_lib/kubernetes/schemas/environment_request.py
@@ -58,7 +58,7 @@ class EnvironmentRequestSpec(BaseModel):
 
     id: str
     name: Optional[str] = None
-    identifier: str
+    identifier: Optional[str] = None
     image: str
     imagePullPolicy: str
     artifact: str