diff --git a/joj3_config_generator/models/repo.py b/joj3_config_generator/models/repo.py
index 85a1662..3a3d5dd 100644
--- a/joj3_config_generator/models/repo.py
+++ b/joj3_config_generator/models/repo.py
@@ -1,6 +1,6 @@
 import os
 from pathlib import Path
-from typing import List, Optional
+from typing import List
 
 from pydantic import AliasChoices, BaseModel, Field, model_validator
 
@@ -32,8 +32,8 @@ class Config(BaseModel):
         "", validation_alias=AliasChoices("gitea-token", "gitea_token")
     )
     gitea_org: str = Field("", validation_alias=AliasChoices("gitea-org", "gitea_org"))
-    max_total_score: Optional[int] = Field(
-        None, validation_alias=AliasChoices("max-total-score", "max_total_score")
+    max_total_score: int = Field(
+        100, validation_alias=AliasChoices("max-total-score", "max_total_score")
     )
     force_skip_health_check_on_test: bool = Field(
         False,
diff --git a/joj3_config_generator/models/task.py b/joj3_config_generator/models/task.py
index 266c40e..450e7b6 100644
--- a/joj3_config_generator/models/task.py
+++ b/joj3_config_generator/models/task.py
@@ -1,7 +1,7 @@
 from datetime import datetime, timezone
 from enum import Enum
 from pathlib import Path
-from typing import Any, Dict, List, Type
+from typing import Any, Dict, List, Optional, Type
 
 from pydantic import (
     AliasChoices,
@@ -222,6 +222,6 @@ class Config(BaseModel):
     release: Release = Release()  # Release configuration
     stages: List[Stage] = []  # list of stage configurations
     groups: Groups = Groups()
-    max_total_score: int = Field(
-        100, validation_alias=AliasChoices("max-total-score", "max_total_score")
+    max_total_score: Optional[int] = Field(
+        None, validation_alias=AliasChoices("max-total-score", "max_total_score")
     )
diff --git a/joj3_config_generator/transformers/repo.py b/joj3_config_generator/transformers/repo.py
index a2ecf90..2fde0ad 100644
--- a/joj3_config_generator/transformers/repo.py
+++ b/joj3_config_generator/transformers/repo.py
@@ -33,9 +33,9 @@ def get_teapot_post_stage(
         repo_conf.grading_repo_name,
         "--max-total-score",
         (
-            str(repo_conf.max_total_score)
-            if repo_conf.max_total_score is not None
-            else str(task_conf.max_total_score)
+            str(task_conf.max_total_score)
+            if task_conf.max_total_score is not None
+            else str(repo_conf.max_total_score)
         ),
     ]
     if not repo_conf.submitter_in_issue_title:
diff --git a/tests/convert/basic/task.json b/tests/convert/basic/task.json
index 8c0cb3e..9e1ef2e 100644
--- a/tests/convert/basic/task.json
+++ b/tests/convert/basic/task.json
@@ -806,7 +806,7 @@
                                 "--grading-repo-name",
                                 "ece280-joj",
                                 "--max-total-score",
-                                "1000"
+                                "10245871"
                             ],
                             "env": [
                                 "REPOS_DIR=/home/tt/.cache",