diff --git a/aider_gitea/__main__.py b/aider_gitea/__main__.py
index c8a97dc..24d7914 100644
--- a/aider_gitea/__main__.py
+++ b/aider_gitea/__main__.py
@@ -50,6 +50,18 @@ AIDER_LINT=bash_cmd(
 
 MODEL = 'o3-mini'
 
+LLM_MESSAGE_FORMAT = """
+{issue}
+
+# Solution Details
+
+For code tasks:
+
+1. Create a plan for how to solve the issue.
+2. Write unit tests that proves that your solution works.
+3. Then, solve the issue by writing the required code.
+"""
+
 def create_aider_command(issue: str) -> list[str]:
     return [
         'aider',
@@ -61,7 +73,7 @@ def create_aider_command(issue: str) -> list[str]:
           '--no-auto-lint',
           '--api-key', secrets.llm_api_key(),
           '--read', 'CONVENTIONS.md',
-          '--message', issue + "\n\n# Solution Details\nFirst, write unit tests that validate your changes. Then, solve the issue.",
+          '--message', LLM_MESSAGE_FORMAT.format(issue=issue),
           '--yes-always',
           '--architect',
     ]