diff --git a/.github/scripts/tests/process_muted_tests_after_merge.py b/.github/scripts/tests/process_muted_tests_after_merge.py
new file mode 100755
index 000000000000..4a514162fe7f
--- /dev/null
+++ b/.github/scripts/tests/process_muted_tests_after_merge.py
@@ -0,0 +1,128 @@
+#!/usr/bin/env python3
+"""
+Helper script for processing muted tests after PR merge:
+- Get muted_ya.txt from merge commit
+- Comment PR
+"""
+import os
+import sys
+import argparse
+import subprocess
+from github import Github
+
+
+def get_muted_ya_from_commit(merge_commit_sha, base_branch, output_path='muted_ya.txt'):
+    """Get muted_ya.txt from merge commit or base branch"""
+    try:
+        if merge_commit_sha:
+            print(f"Getting muted_ya.txt from merge commit: {merge_commit_sha}")
+            subprocess.run(
+                ['git', 'fetch', 'origin', merge_commit_sha],
+                capture_output=True,
+                text=True,
+                check=True
+            )
+            result = subprocess.run(
+                ['git', 'show', f'{merge_commit_sha}:.github/config/muted_ya.txt'],
+                capture_output=True,
+                text=True,
+                check=True
+            )
+            with open(output_path, 'w') as f:
+                f.write(result.stdout)
+            print(f"✓ Retrieved muted_ya.txt from merge commit")
+            return output_path
+        else:
+            print(f"⚠️ Merge commit SHA not available, trying to get from base branch: {base_branch}")
+            subprocess.run(
+                ['git', 'fetch', 'origin', base_branch],
+                capture_output=True,
+                text=True,
+                check=True
+            )
+            result = subprocess.run(
+                ['git', 'show', f'origin/{base_branch}:.github/config/muted_ya.txt'],
+                capture_output=True,
+                text=True,
+                check=True
+            )
+            with open(output_path, 'w') as f:
+                f.write(result.stdout)
+            print(f"✓ Retrieved muted_ya.txt from base branch")
+            return output_path
+    except subprocess.CalledProcessError as e:
+        print(f"Error getting muted_ya.txt: {e}")
+        if e.stderr:
+            print(f"stderr: {e.stderr}")
+        raise
+
+
+def comment_pr(github_token, repository, pr_number, base_branch, issues_file, run_id, run_number):
+    """Comment on PR"""
+    g = Github(github_token)
+    repo = g.get_repo(repository)
+    pr = repo.get_issue(int(pr_number))
+    
+    workflow_url = f"https://github.com/{repository}/actions/runs/{run_id}"
+    body = f"Workflow completed for branch {base_branch} in workflow [#{run_number}]({workflow_url})\n\n"
+    
+    if issues_file and os.path.exists(issues_file):
+        with open(issues_file, 'r') as f:
+            body += f.read()
+    else:
+        body += "Muted tests data updated in YDB. Issues creation and Telegram notifications are only performed for main branch."
+    
+    pr.create_comment(body)
+    print(f"✓ Comment added to PR #{pr_number}")
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Helper script for processing muted tests after PR merge")
+    subparsers = parser.add_subparsers(dest='command', help='Command to execute')
+    
+    # get-muted-file command
+    get_file_parser = subparsers.add_parser('get-muted-file', help='Get muted_ya.txt from merge commit')
+    get_file_parser.add_argument('--merge_commit_sha', help='Merge commit SHA')
+    get_file_parser.add_argument('--base_branch', required=True, help='Base branch')
+    get_file_parser.add_argument('--output', default='muted_ya.txt', help='Output file path')
+    
+    # comment-pr command
+    comment_parser = subparsers.add_parser('comment-pr', help='Comment on PR')
+    comment_parser.add_argument('--pr_number', required=True, help='PR number')
+    comment_parser.add_argument('--base_branch', required=True, help='Base branch')
+    comment_parser.add_argument('--issues_file', help='Path to issues file (optional)')
+    
+    args = parser.parse_args()
+    
+    if args.command == 'get-muted-file':
+        get_muted_ya_from_commit(args.merge_commit_sha, args.base_branch, args.output)
+        print(f"✓ File saved to {args.output}")
+    
+    elif args.command == 'comment-pr':
+        github_token = os.environ.get('GITHUB_TOKEN')
+        if not github_token:
+            raise ValueError("GITHUB_TOKEN environment variable is required")
+        
+        repository = os.environ.get('GITHUB_REPOSITORY')
+        if not repository:
+            raise ValueError("GITHUB_REPOSITORY environment variable is required")
+        
+        run_id = os.environ.get('GITHUB_RUN_ID', '')
+        run_number = os.environ.get('GITHUB_RUN_NUMBER', '')
+        
+        comment_pr(
+            github_token,
+            repository,
+            args.pr_number,
+            args.base_branch,
+            args.issues_file,
+            run_id,
+            run_number
+        )
+    else:
+        parser.print_help()
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/.github/workflows/create_issues_for_muted_tests.yml b/.github/workflows/create_issues_for_muted_tests.yml
index 5218fb496ab0..4243f2fe3d5f 100644
--- a/.github/workflows/create_issues_for_muted_tests.yml
+++ b/.github/workflows/create_issues_for_muted_tests.yml
@@ -1,93 +1,163 @@
 name: Create issues for muted tests
 
 on:
-  pull_request_review:
+  pull_request:
     types:
-      - submitted
-    branches:
-      - main
+      - closed
   workflow_dispatch:
     inputs:
-        pr_number: 
-            description: 'The pull request number'
-            required: true
-            type: number
+      pr_number: 
+        description: 'The pull request number'
+        required: true
+        type: number
 
 env:
   GH_TOKEN: ${{ secrets.YDBOT_TOKEN }}
-  MUTED_YA_FILE_PATH: .github/config/muted_ya.txt
+  BUILD_TYPE: relwithdebinfo
 
 jobs:
-  create-issues-for-muted-tests:
+  get-pr-base-branch:
     runs-on: ubuntu-latest
-    if: |
-      ((github.event_name == 'pull_request_review' && 
-      github.event.review.state == 'approved' && 
-      contains(github.event.pull_request.labels.*.name, 'mute-unmute') &&
-      github.event.pull_request.base.ref == 'main') || 
-      github.event_name == 'workflow_dispatch')
-
+    outputs:
+      base_branch: ${{ steps.get_base_branch.outputs.base_branch }}
     steps:
-      - name: Set environment variables for branches
+      - name: Get PR base branch
+        if: github.event_name == 'workflow_dispatch'
+        id: get_base_branch
+        env:
+          GH_TOKEN: ${{ secrets.YDBOT_TOKEN }}
         run: |
-          echo "BRANCH_FOR_PR=${{ github.event.pull_request.head.ref || github.head_ref }}" >> $GITHUB_ENV
-          echo "BASE_BRANCH=${{ github.event.pull_request.base.ref || github.base_ref }}" >> $GITHUB_ENV
+          PR_NUMBER="${{ github.event.inputs.pr_number }}"
+          BASE_BRANCH=$(gh pr view $PR_NUMBER --json baseRefName --jq -r '.baseRefName')
+          echo "base_branch=${BASE_BRANCH}" >> $GITHUB_OUTPUT
+      - name: Skip for pull_request
+        if: github.event_name == 'pull_request'
+        run: echo "Skipping - using event data"
+
+  update-ydb:
+    if: |
+      ((github.event_name == 'pull_request' && 
+      github.event.pull_request.merged == true && 
+      contains(github.event.pull_request.labels.*.name, 'mute-unmute')) || 
+      (github.event_name == 'workflow_dispatch' && needs.get-pr-base-branch.result == 'success'))
+    needs: get-pr-base-branch
+    uses: ./.github/workflows/reusable/update_ydb_for_muted_tests.yml
+    with:
+      branch: ${{ github.event.pull_request.base.ref || needs.get-pr-base-branch.outputs.base_branch }}
+      build_type: ${{ env.BUILD_TYPE }}
+    secrets:
+      CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS: ${{ secrets.CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS }}
+      GITHUB_TOKEN: ${{ secrets.YDBOT_TOKEN }}
 
+  process-muted-tests:
+    needs: [update-ydb, get-pr-base-branch]
+    if: |
+      ((github.event_name == 'pull_request' && 
+      github.event.pull_request.merged == true && 
+      contains(github.event.pull_request.labels.*.name, 'mute-unmute')) || 
+      (github.event_name == 'workflow_dispatch' && needs.get-pr-base-branch.result == 'success'))
+    runs-on: ubuntu-latest
+    steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-            ref: ${{ github.event.pull_request.head.ref || github.head_ref }}
-
+          ref: main
+          fetch-depth: 0
+      
       - name: Install dependencies
         run: |
-            python -m pip install --upgrade pip
-            pip install ydb[yc] PyGithub requests matplotlib numpy
-
+          python -m pip install --upgrade pip
+          pip install ydb[yc] PyGithub requests matplotlib numpy
+      
       - name: Setup ydb access
         uses: ./.github/actions/setup_ci_ydb_service_account_key_file_credentials
         with:
-            ci_ydb_service_account_key_file_credentials: ${{ secrets.CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS }}
+          ci_ydb_service_account_key_file_credentials: ${{ secrets.CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS }}
+      
+      - name: Get PR details for workflow_dispatch
+        if: github.event_name == 'workflow_dispatch'
+        id: get_pr_details
+        env:
+          GH_TOKEN: ${{ secrets.YDBOT_TOKEN }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+        run: |
+          PR_NUMBER="${{ github.event.inputs.pr_number }}"
+          PR_DATA=$(gh pr view $PR_NUMBER --json baseRefName,mergeCommit --jq '{base_branch: .baseRefName, merge_commit_sha: .mergeCommit.oid}')
+          BASE_BRANCH=$(echo "$PR_DATA" | jq -r '.base_branch')
+          MERGE_SHA=$(echo "$PR_DATA" | jq -r '.merge_commit_sha // empty')
+          echo "base_branch=${BASE_BRANCH}" >> $GITHUB_OUTPUT
+          echo "merge_commit_sha=${MERGE_SHA}" >> $GITHUB_OUTPUT
+          echo "pr_number=${PR_NUMBER}" >> $GITHUB_OUTPUT
+      
+      - name: Get muted_ya.txt from merge commit
+        id: get_file
+        run: |
+          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            MERGE_SHA="${{ steps.get_pr_details.outputs.merge_commit_sha }}"
+            BASE_BRANCH="${{ steps.get_pr_details.outputs.base_branch }}"
+          else
+            MERGE_SHA="${{ github.event.pull_request.merge_commit_sha || '' }}"
+            BASE_BRANCH="${{ github.event.pull_request.base.ref || 'main' }}"
+          fi
+          
+          python3 .github/scripts/tests/process_muted_tests_after_merge.py get-muted-file \
+            --merge_commit_sha="${MERGE_SHA}" \
+            --base_branch="${BASE_BRANCH}" \
+            --output="muted_ya.txt"
+          echo "muted_ya_file=muted_ya.txt" >> $GITHUB_OUTPUT
+          echo "base_branch=${BASE_BRANCH}" >> $GITHUB_OUTPUT
+          echo "is_main=$([ \"${BASE_BRANCH}\" == \"main\" ] && echo \"true\" || echo \"false\")" >> $GITHUB_OUTPUT
+
+      - name: DEBUG: Stop before create_issues
+        if: steps.get_file.outputs.is_main == 'true'
+        run: |
+          echo "DEBUG: Stopping before create_issues step"
+          echo "muted_ya.txt content preview:"
+          head -20 muted_ya.txt || echo "File not found"
+          exit 1
 
       - name: Create issues for muted tests
+        if: steps.get_file.outputs.is_main == 'true'
         id: create_issues
         env:
-          GITHUB_TOKEN: ${{ env.GH_TOKEN }}
-        run: .github/scripts/tests/create_new_muted_ya.py create_issues --file_path=${{ github.workspace }}/${{ env.MUTED_YA_FILE_PATH }} 
- 
-      - name: Add issues to PR
-        env:
-          GITHUB_TOKEN: ${{ env.GH_TOKEN }}
-        run: python .github/scripts/create_or_update_pr.py append_pr_body --pr_number=${{ github.event.pull_request.number || github.event.inputs.pr_number  }} --body=${{ steps.create_issues.outputs.created_issues_file }}
-      
-      - name: Comment PR
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ env.GH_TOKEN }}
-          script: |
-            const fs = require('fs');
-            const path = require('path');
-            
-            const workflowUrl = `https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}`;
-            const filePath = '${{ steps.create_issues.outputs.created_issues_file }}';
-            const bodyText = fs.readFileSync(filePath, 'utf8');
-            const completeBody = `Collected in workflow [#${{ github.run_number }}](${workflowUrl})\n\n${bodyText}`;
+          GITHUB_TOKEN: ${{ secrets.YDBOT_TOKEN }}
+        run: |
+          python3 .github/scripts/tests/create_new_muted_ya.py create_issues \
+            --file_path=muted_ya.txt \
+            --branch=${{ steps.get_file.outputs.base_branch }}
+          # Script creates created_issues.txt and saves path in GITHUB_OUTPUT
+          if [ -f created_issues.txt ]; then
+            echo "issues_file=created_issues.txt" >> $GITHUB_OUTPUT
+          fi
       
-            github.rest.issues.createComment({
-              issue_number: ${{ github.event.pull_request.number || github.event.inputs.pr_number }},
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: completeBody
-            });
-
-      - name: Send team-specific messages to Telegram
+      - name: Send Telegram notifications
+        if: steps.get_file.outputs.is_main == 'true' && steps.create_issues.outputs.issues_file != ''
         env:
           TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_YDBOT_TOKEN }}
           TEAM_CHANNELS: ${{ vars.TG_TEAM_CHANNELS }}
         run: |
-          python .github/scripts/telegram/parse_and_send_team_issues.py \
+          python3 .github/scripts/telegram/parse_and_send_team_issues.py \
             --on-mute-change-update \
-            --file "${{ steps.create_issues.outputs.created_issues_file }}" \
+            --file "created_issues.txt" \
             --bot-token "$TELEGRAM_BOT_TOKEN" \
             --team-channels "$TEAM_CHANNELS" \
             --include-plots \
             --delay 2
+      
+      - name: Comment PR
+        env:
+          GITHUB_TOKEN: ${{ secrets.YDBOT_TOKEN }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+          GITHUB_RUN_ID: ${{ github.run_id }}
+          GITHUB_RUN_NUMBER: ${{ github.run_number }}
+        run: |
+          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            PR_NUMBER="${{ steps.get_pr_details.outputs.pr_number }}"
+          else
+            PR_NUMBER="${{ github.event.pull_request.number }}"
+          fi
+          
+          python3 .github/scripts/tests/process_muted_tests_after_merge.py comment-pr \
+            --pr_number="${PR_NUMBER}" \
+            --base_branch="${{ steps.get_file.outputs.base_branch }}" \
+            --issues_file="${{ steps.create_issues.outputs.issues_file || '' }}"
diff --git a/.github/workflows/reusable/update_ydb_for_muted_tests.yml b/.github/workflows/reusable/update_ydb_for_muted_tests.yml
new file mode 100644
index 000000000000..72ee1e08ccf4
--- /dev/null
+++ b/.github/workflows/reusable/update_ydb_for_muted_tests.yml
@@ -0,0 +1,58 @@
+name: Update YDB for muted tests
+
+on:
+  workflow_call:
+    inputs:
+      branch:
+        required: true
+        type: string
+      build_type:
+        required: true
+        type: string
+        default: 'relwithdebinfo'
+    secrets:
+      CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS:
+        required: true
+      GITHUB_TOKEN:
+        required: true
+
+jobs:
+  update-ydb:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          fetch-depth: 0
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install ydb[yc] codeowners pandas
+
+      - name: Setup ydb access
+        uses: ./.github/actions/setup_ci_ydb_service_account_key_file_credentials
+        with:
+          ci_ydb_service_account_key_file_credentials: ${{ secrets.CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS }}
+
+      - name: Collect test history data
+        run: python3 .github/scripts/analytics/flaky_tests_history.py --branch=${{ inputs.branch }} --build_type=${{ inputs.build_type }}
+
+      - name: Update muted tests in DB
+        run: python3 .github/scripts/tests/get_muted_tests.py upload_muted_tests --branch=${{ inputs.branch }} --build_type=${{ inputs.build_type }}
+
+      - name: Update test monitor
+        run: python3 .github/scripts/analytics/tests_monitor.py --branch=${{ inputs.branch }} --build_type=${{ inputs.build_type }}
+
+      - name: Export GitHub issues
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: python3 .github/scripts/analytics/export_issues_to_ydb.py
+
+      - name: Update GitHub issue mapping table
+        run: python3 .github/scripts/analytics/github_issue_mapping.py
+
+      - name: Update test_muted_monitor_mart
+        run: python3 .github/scripts/analytics/data_mart_executor.py --query_path .github/scripts/analytics/data_mart_queries/test_muted_monitor_mart_with_issue.sql --table_path test_results/analytics/test_muted_monitor_mart --store_type column --partition_keys date_window branch build_type owner_team suite_folder --primary_keys date_window owner_team branch build_type suite_folder full_name --ttl_min 43200 --ttl_key date_window
+
diff --git a/.github/workflows/update_muted_ya.yml b/.github/workflows/update_muted_ya.yml
index 554e98225f40..31b711cd0427 100644
--- a/.github/workflows/update_muted_ya.yml
+++ b/.github/workflows/update_muted_ya.yml
@@ -53,8 +53,22 @@ jobs:
       - name: Collect testowners
         run: python3 .github/scripts/analytics/upload_testowners.py
 
-  update-muted-tests:
+  update-ydb:
     needs: [setup, collect-testowners]
+    uses: ./.github/workflows/reusable/update_ydb_for_muted_tests.yml
+    secrets:
+      CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS: ${{ secrets.CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS }}
+      GITHUB_TOKEN: ${{ secrets.YDBOT_TOKEN }}
+    strategy:
+      fail-fast: false
+      matrix:
+        BASE_BRANCH: ${{ fromJson(needs.setup.outputs.matrix_branches) }}
+    with:
+      branch: ${{ matrix.BASE_BRANCH }}
+      build_type: ${{ env.BUILD_TYPE }}
+
+  update-muted-tests:
+    needs: [setup, update-ydb]
     runs-on: [ self-hosted, auto-provisioned, build-preset-analytic-node]
     strategy:
       fail-fast: false
@@ -71,7 +85,7 @@ jobs:
       - name: Checkout main branch
         uses: actions/checkout@v4
         with:
-          ref: main
+          ref: muted_ya_new_iteration
           fetch-depth: 0
 
       - name: Install dependencies
@@ -91,15 +105,6 @@ jobs:
           git fetch origin ${{ env.BASE_BRANCH }}:refs/remotes/origin/${{ env.BASE_BRANCH }}
           git show origin/${{ env.BASE_BRANCH }}:.github/config/muted_ya.txt > base_muted_ya.txt
           echo "✓ Retrieved base muted_ya.txt from ${{ env.BASE_BRANCH }}"
-    
-      - name: Collect test history data
-        run: python3 .github/scripts/analytics/flaky_tests_history.py --branch=${{ env.BASE_BRANCH }} --build_type=${{ env.BUILD_TYPE }}
-      
-      - name: Update muted tests in DB
-        run: python3 .github/scripts/tests/get_muted_tests.py upload_muted_tests --branch=${{ env.BASE_BRANCH }} --build_type=${{ env.BUILD_TYPE }} 
-      
-      - name: Update test monitor
-        run: python3 .github/scripts/analytics/tests_monitor.py --branch=${{ env.BASE_BRANCH }} --build_type=${{ env.BUILD_TYPE }}
 
       - name: Generate new muted_ya.txt
         run: |