diff --git a/aider_gitea/__init__.py b/aider_gitea/__init__.py
index 9fe3f23..c72ab9f 100644
--- a/aider_gitea/__init__.py
+++ b/aider_gitea/__init__.py
@@ -156,6 +156,8 @@ class RepositoryConfig:
     owner: str
     repo: str
     base_branch: str
+    assignee: str | None = None
+    reviewer: str | None = None
 
     def repo_url(self) -> str:
         return f'{self.gitea_url}:{self.owner}/{self.repo}.git'.replace(
@@ -497,7 +499,12 @@ def push_changes(
     cmd = ['git', 'push', 'origin', branch_name, '--force']
     run_cmd(cmd, cwd)
 
-    # Then create the PR with the aider label
+    # Prepare assignees list
+    assignees = []
+    if repository_config.assignee:
+        assignees.append(repository_config.assignee)
+
+    # Then create the PR with the aider label and assignees
     pr_response = gitea_client.create_pull_request(
         owner=repository_config.owner,
         repo=repository_config.repo,
@@ -506,13 +513,39 @@ def push_changes(
         head=branch_name,
         base=repository_config.base_branch,
         labels=['aider'],
+        assignees=assignees if assignees else None,
     )
 
+    # Extract PR number
+    pr_number = int(pr_response.get('number'))
+
+    # Assign reviewer if specified (must be done after PR creation)
+    if repository_config.reviewer:
+        try:
+            gitea_client.assign_reviewers(
+                owner=repository_config.owner,
+                repo=repository_config.repo,
+                pull_number=pr_number,
+                reviewers=[repository_config.reviewer],
+            )
+            logger.info(
+                'Assigned reviewer %s to PR #%s',
+                repository_config.reviewer,
+                pr_number,
+            )
+        except Exception:
+            logger.warning(
+                'Failed to assign reviewer %s to PR #%s',
+                repository_config.reviewer,
+                pr_number,
+                exc_info=True,
+            )
+
     # Extract PR number and URL if available
     return IssueResolution(
         True,
         pr_response.get('html_url'),
-        int(pr_response.get('number')),
+        pr_number,
     )
 
 
diff --git a/aider_gitea/__main__.py b/aider_gitea/__main__.py
index e9ab35e..a964322 100644
--- a/aider_gitea/__main__.py
+++ b/aider_gitea/__main__.py
@@ -55,6 +55,16 @@ def parse_args():
         help='Model to use for evaluating code (overrides default)',
         default=None,
     )
+    parser.add_argument(
+        '--assignee',
+        help='Username to assign as the assignee for created pull requests',
+        default=None,
+    )
+    parser.add_argument(
+        '--reviewer',
+        help='Username to assign as the reviewer for created pull requests',
+        default=None,
+    )
     return parser.parse_args()
 
 
@@ -84,6 +94,8 @@ def main():
                 owner=args.owner,
                 repo=repo,
                 base_branch=args.base_branch,
+                assignee=args.assignee,
+                reviewer=args.reviewer,
             )
             solve_issues_in_repository(repository_config, client, seen_issues_db)
             del repo
diff --git a/aider_gitea/gitea_client.py b/aider_gitea/gitea_client.py
index bf90768..56f4e55 100644
--- a/aider_gitea/gitea_client.py
+++ b/aider_gitea/gitea_client.py
@@ -139,8 +139,9 @@ class GiteaClient:
         head: str,
         base: str,
         labels: list[str] = None,
+        assignees: list[str] = None,
     ) -> dict:
-        """Create a pull request and optionally apply labels.
+        """Create a pull request and optionally apply labels and assignees.
 
         Args:
             owner (str): Owner of the repository.
@@ -150,6 +151,7 @@ class GiteaClient:
             head (str): The name of the branch where changes are implemented.
             base (str): The name of the branch you want the changes pulled into.
             labels (list[str], optional): List of label names to apply to the pull request.
+            assignees (list[str], optional): List of usernames to assign to the pull request.
 
         Returns:
             dict: The created pull request data.
@@ -165,6 +167,9 @@ class GiteaClient:
             'base': base,
         }
 
+        if assignees:
+            json_data['assignees'] = assignees
+
         response = self.session.post(url, json=json_data)
         # If a pull request for this head/base already exists, return it instead of crashing
         if response.status_code == 409:
@@ -185,6 +190,34 @@ class GiteaClient:
         response.raise_for_status()
         return response.json()
 
+    def assign_reviewers(
+        self,
+        owner: str,
+        repo: str,
+        pull_number: int,
+        reviewers: list[str],
+    ) -> dict:
+        """Assign reviewers to an existing pull request.
+
+        Args:
+            owner (str): Owner of the repository.
+            repo (str): Name of the repository.
+            pull_number (int): Number of the pull request.
+            reviewers (list[str]): List of usernames to assign as reviewers.
+
+        Returns:
+            dict: The response data from the API.
+
+        Raises:
+            requests.HTTPError: If the API request fails.
+        """
+        url = f'{self.gitea_url}/repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers'
+        json_data = {'reviewers': reviewers}
+
+        response = self.session.post(url, json=json_data)
+        response.raise_for_status()
+        return response.json()
+
     def get_failed_pipelines(self, owner: str, repo: str, pr_number: str) -> list[int]:
         """Fetch pipeline runs for a PR and return IDs of failed runs."""
         url = f'{self.gitea_url}/repos/{owner}/{repo}/actions/runs'
diff --git a/test/test_claude_code_integration.py b/test/test_claude_code_integration.py
index 9229225..ad83669 100644
--- a/test/test_claude_code_integration.py
+++ b/test/test_claude_code_integration.py
@@ -69,9 +69,10 @@ class TestClaudeCodeIntegration:
                 'claude',
                 '-p',
                 '--output-format',
-                'json',
-                '--max-turns',
-                '10',
+                'stream-json',
+                '--debug',
+                '--verbose',
+                '--dangerously-skip-permissions',
                 issue,
             ]
             assert cmd == expected
@@ -84,9 +85,10 @@ class TestClaudeCodeIntegration:
                 'claude',
                 '-p',
                 '--output-format',
-                'json',
-                '--max-turns',
-                '10',
+                'stream-json',
+                '--debug',
+                '--verbose',
+                '--dangerously-skip-permissions',
                 '--model',
                 'claude-3-sonnet',
                 issue,