diff --git a/aider_gitea/__init__.py b/aider_gitea/__init__.py
index d966ff8..95c55dc 100644
--- a/aider_gitea/__init__.py
+++ b/aider_gitea/__init__.py
@@ -161,7 +161,7 @@ def create_aider_command(issue: str) -> list[str]:
         'CONVENTIONS.md',
         '--message',
         LLM_MESSAGE_FORMAT.format(issue=issue),
-        '--yes-always',
+        '--yes',
     ]
 
     if True:
@@ -282,6 +282,7 @@ def run_cmd(cmd: list[str], cwd: Path | None = None, check=True) -> bool:
     result = subprocess.run(cmd, check=check, cwd=cwd)
     return result.returncode == 0
 
+SKIP_AIDER = True
 
 def solve_issue_in_repository(
     args,
@@ -320,11 +321,15 @@ def solve_issue_in_repository(
 
     # Run aider
     issue_content = f'# {issue_title}\n{issue_description}'
-    succeeded = run_cmd(
-        create_aider_command(issue_content),
-        tmpdirname,
-        check=False,
-    )
+    if not SKIP_AIDER:
+        succeeded = run_cmd(
+            create_aider_command(issue_content),
+            tmpdirname,
+            check=False,
+        )
+    else:
+        logger.warning("Skipping aider command (for testing)")
+        succeeded = True
     if not succeeded:
         logger.error('Aider invocation failed for issue #%s', issue_number)
         return False
diff --git a/aider_gitea/gitea_client.py b/aider_gitea/gitea_client.py
index 267c3c7..d392cab 100644
--- a/aider_gitea/gitea_client.py
+++ b/aider_gitea/gitea_client.py
@@ -163,7 +163,6 @@ class GiteaClient:
             'body': body,
             'head': head,
             'base': base,
-            'labels': labels,
         }
 
         response = self.session.post(url, json=json_data)