diff --git a/.github/actions/code_coverage/action.yml b/.github/actions/code_coverage/action.yml
index f6c58742..f4cef94f 100644
--- a/.github/actions/code_coverage/action.yml
+++ b/.github/actions/code_coverage/action.yml
@@ -21,9 +21,13 @@ runs:
         retention-days: 30
 
     - name: Upload coverage report
-      uses: codecov/codecov-action@v3
+      uses: wandalen/wretry.action@v1.3.0
       with:
-        files: build/coverage_report.xml
-        fail_ci_if_error: true
-        verbose: true
-        token: ${{ env.CODECOV_TOKEN }}
+        action: codecov/codecov-action@v3
+        with: |
+          files: build/coverage_report.xml 
+          fail_ci_if_error: true
+          verbose: true
+          token: ${{ env.CODECOV_TOKEN }}
+        attempt_limit: 5
+        attempt_delay: 10000
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index 9c3d4593..356db0e6 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -1,13 +1,14 @@
 name: Clang-tidy check
 on:
   schedule:
-    - cron:  '0 6 * * 1-5'
+    - cron: "0 6 * * 1-5"
   workflow_dispatch:
   pull_request:
     branches: [develop]
     paths:
       - .clang_tidy
       - .github/workflows/clang-tidy.yml
+  workflow_call:
 
 jobs:
   clang_tidy:
@@ -22,12 +23,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-            fetch-depth: 0
+          fetch-depth: 0
 
       - name: Prepare runner
         uses: ./.github/actions/prepare_runner
         with:
-            disable_ccache: true
+          disable_ccache: true
 
       - name: Setup conan
         uses: ./.github/actions/setup_conan
@@ -100,14 +101,14 @@ jobs:
           GH_REPO: ${{ github.repository }}
           GH_TOKEN: ${{ github.token }}
         with:
-          commit-message: '[CI] clang-tidy auto fixes'
+          commit-message: "[CI] clang-tidy auto fixes"
           committer: Clio CI <skuznetsov@ripple.com>
-          branch: 'clang_tidy/autofix'
+          branch: "clang_tidy/autofix"
           branch-suffix: timestamp
           delete-branch: true
-          title: '[CI] clang-tidy auto fixes'
-          body: 'Fixes #${{ steps.create_issue.outputs.created_issue }}. Please review and commit clang-tidy fixes.'
-          reviewers: 'cindyyan317,godexsoft,kuznetsss'
+          title: "[CI] clang-tidy auto fixes"
+          body: "Fixes #${{ steps.create_issue.outputs.created_issue }}. Please review and commit clang-tidy fixes."
+          reviewers: "cindyyan317,godexsoft,kuznetsss"
 
       - name: Fail the job
         if: ${{ steps.run_clang_tidy.outcome != 'success' }}
diff --git a/.github/workflows/clang-tidy_on_fix_merged.yml b/.github/workflows/clang-tidy_on_fix_merged.yml
new file mode 100644
index 00000000..3f1bf093
--- /dev/null
+++ b/.github/workflows/clang-tidy_on_fix_merged.yml
@@ -0,0 +1,11 @@
+name: On clang-tidy auto fixes merged
+on:
+  pull_request:
+    types: [closed]
+    branches: [develop]
+
+jobs:
+  on_fix_merge:
+    if: ${{ github.event.pull_request.merged == true && github.event.pull_request.labels.*.name == '[CI] clang-tidy auto fixes' }}
+    uses: ./.github/workflows/clang-tidy.yml
+    secrets: inherit