diff --git a/aider_gitea/__init__.py b/aider_gitea/__init__.py
index b40c24d..ea79dce 100644
--- a/aider_gitea/__init__.py
+++ b/aider_gitea/__init__.py
@@ -158,8 +158,7 @@ LLM_MESSAGE_FORMAT = (
     """{issue}\nDo not wait for explicit approval before working on code changes."""
 )
 
-# CODE_MODEL = 'ollama/gemma3:4b'
-CODE_MODEL = 'o4-mini'
+CODE_MODEL = None
 EVALUATOR_MODEL = 'ollama/gemma3:27b'
 
 
@@ -178,8 +177,13 @@ def create_aider_command(issue: str) -> list[str]:
         '--auto-test',
         '--no-auto-lint',
         '--yes',
+        '--timeout', str(10_000)
     ]
 
+    if CODE_MODEL in {'ollama/qwen3:32b'}:
+        l.append('--edit-format')
+        l.append('diff')
+
     for key in secrets.llm_api_keys():
         l += ['--api-key', key]
 
diff --git a/aider_gitea/__main__.py b/aider_gitea/__main__.py
index a6f3d49..37d5dc2 100644
--- a/aider_gitea/__main__.py
+++ b/aider_gitea/__main__.py
@@ -48,7 +48,7 @@ def parse_args():
     parser.add_argument(
         '--aider-model',
         help='Model to use for generating code (overrides default)',
-        default=None,
+        required=True,
     )
     parser.add_argument(
         '--evaluator-model',
@@ -65,10 +65,8 @@ def main():
     # Override default models if provided
     import aider_gitea as core
 
-    if args.aider_model:
-        core.CODE_MODEL = args.aider_model
-    if args.evaluator_model:
-        core.EVALUATOR_MODEL = args.evaluator_model
+    core.CODE_MODEL = args.aider_model
+    core.EVALUATOR_MODEL = args.evaluator_model
 
     seen_issues_db = SeenIssuesDB()
     client = GiteaClient(args.gitea_url, secrets.gitea_token())