diff --git a/.github/workflows/link_startrek.yml b/.github/workflows/link_startrek.yml
index 12b54eed..b73207a9 100644
--- a/.github/workflows/link_startrek.yml
+++ b/.github/workflows/link_startrek.yml
@@ -3,22 +3,25 @@ name: Link with Startrek
 on:
   pull_request: { branches: [main] }
 
+env:
+  ISSUE_PATTERN: '[A-Z]+-[0-9]+'
+
 jobs:
-  link_with_startrek:    
-    continue-on-error: true
+  link:
     runs-on: ubuntu-latest
     steps:
-      - name: parse_branch_name
-        id: parse_branch_name
+      - name: parse_issue
+        id: parse_issue
         run: |
-          if [[ ${{ github.head_ref }} =~ ^([A-Za-z]+\-[0-9]+).*$ ]]; then
+          echo "${{ toJSON(github.event.pull_request.commits[0]) }}"
+          if [[ "${{ github.event.pull_request.head.message }}" =~ \[($ISSUE_PATTERN)\] || "${{ github.head_ref }}" =~ ^($ISSUE_PATTERN) ]]; then
               echo issue_number="${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT          
           fi
       - name: link_issue
-        if: steps.parse_branch_name.outputs.issue_number
+        if: steps.parse_issue.outputs.issue_number
         uses: fjogeleit/http-request-action@v1
         with:
-          url: 'https://st-api.yandex-team.ru/v2/issues/${{ steps.parse_branch_name.outputs.issue_number }}'
+          url: 'https://st-api.yandex-team.ru/v2/issues/${{ steps.parse_issue.outputs.issue_number }}'
           method: 'LINK'
           customHeaders: >
             {