diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000..5bc30ac2f2
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,5 @@
+# Code Owners for DFXswiss/api
+# These users must approve all pull requests to protected branches
+
+# Default owners for everything in the repo
+* @davidleomay @TaprootFreak
diff --git a/.github/workflows/pr-review-bot.yml b/.github/workflows/pr-review-bot.yml
index 74e72ab57c..e2573e003c 100644
--- a/.github/workflows/pr-review-bot.yml
+++ b/.github/workflows/pr-review-bot.yml
@@ -223,12 +223,7 @@ jobs:
               return;
             }
 
-            const body = `# 🤖 PR Review Bot
-
-            ${comments.join('\n\n---\n\n')}
-
-            ---
-            <sub>This is an automated review. Please address the issues above.</sub>`;
+            const body = comments.join('\n\n---\n\n');
 
             // Find existing bot comment
             const existingComments = await github.rest.issues.listComments({
@@ -238,7 +233,14 @@ jobs:
             });
 
             const botComment = existingComments.data.find(c =>
-              c.user?.type === 'Bot' && c.body?.includes('🤖 PR Review Bot')
+              c.user?.login === 'github-actions[bot]' && (
+                c.body?.includes('Unverified Commits') ||
+                c.body?.includes('Non-Conventional Commits') ||
+                c.body?.includes('ESLint:') ||
+                c.body?.includes('TypeScript:') ||
+                c.body?.includes('Security:') ||
+                c.body?.includes('TODOs/FIXMEs')
+              )
             );
 
             if (botComment) {