diff --git a/aider_gitea/__main__.py b/aider_gitea/__main__.py
index d2e1185..fb5b3db 100644
--- a/aider_gitea/__main__.py
+++ b/aider_gitea/__main__.py
@@ -8,7 +8,7 @@ import argparse
 import logging
 import time
 
-from . import RepositoryConfig, secrets, solve_issues_in_repository
+from . import RepositoryConfig, secrets, solve_issues_in_repository, CODE_MODEL, EVALUATOR_MODEL
 from .gitea_client import GiteaClient
 from .seen_issues_db import SeenIssuesDB
 
@@ -45,12 +45,27 @@ def parse_args():
         default=300,
         help='Interval in seconds between checks in daemon mode (default: 300)',
     )
+    parser.add_argument(
+        '--aider-model',
+        default=CODE_MODEL,
+        help='Aider model to use (default: %(default)s)',
+    )
+    parser.add_argument(
+        '--evaluator-model',
+        default=EVALUATOR_MODEL,
+        help='Evaluator model to use (default: %(default)s)',
+    )
     return parser.parse_args()
 
 
 def main():
     logging.basicConfig(level='INFO')
     args = parse_args()
+    # Override default models based on CLI flags
+    import importlib
+    pkg = importlib.import_module(__package__)
+    pkg.CODE_MODEL = args.aider_model
+    pkg.EVALUATOR_MODEL = args.evaluator_model
 
     seen_issues_db = SeenIssuesDB()
     client = GiteaClient(args.gitea_url, secrets.gitea_token())