diff --git a/.github/workflows/assign-author.yml b/.github/workflows/assign-author.yml
index 294999e895d3..a099e130fe82 100644
--- a/.github/workflows/assign-author.yml
+++ b/.github/workflows/assign-author.yml
@@ -1,6 +1,7 @@
 name: 🤖 PR author as an assignee
 on:
   pull_request:
+    types: [opened]
 
 jobs:
   assign:
@@ -9,9 +10,7 @@ jobs:
       - uses: actions/checkout@v4.2.0
       - uses: taiga-family/ci/actions/setup/variables@v1.87.8
       - uses: toshimaru/auto-author-assign@v2.1.1
-        if: env.IS_OWNER_MODE == 'true'
-        with:
-          repo-token: ${{ secrets.TAIGA_FAMILY_BOT_PAT }}
+        continue-on-error: true
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 62cd17f59803..4df98c754c21 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -43,10 +43,12 @@ jobs:
       - uses: actions/checkout@v4.2.0
       - uses: taiga-family/ci/actions/setup/variables@v1.87.8
       - uses: taiga-family/ci/actions/auto/approve/double@v1.87.8
+        if: env.IS_TAIGA_FAMILY_BOT_PR_AUTHOR == 'true'
         with:
           token1: ${{ secrets.GITHUB_TOKEN }}
           token2: ${{ secrets.TAIGA_FAMILY_APPROVE_BOT_PAT }}
       - uses: taiga-family/ci/actions/run/merge@v1.87.8
+        if: env.IS_TAIGA_FAMILY_BOT_PR_AUTHOR == 'true'
         with:
           token: ${{ secrets.TAIGA_FAMILY_BOT_PAT }}