diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan-develop.yml
similarity index 80%
rename from .github/workflows/coverity-scan.yml
rename to .github/workflows/coverity-scan-develop.yml
index 27310bd7..0ef60c83 100644
--- a/.github/workflows/coverity-scan.yml
+++ b/.github/workflows/coverity-scan-develop.yml
@@ -1,4 +1,4 @@
-name: Coverity Scan fixes and develop branches on a weekly basis
+name: Coverity Scan develop branch on a weekly basis
 
 on:
   workflow_dispatch:
@@ -9,7 +9,9 @@ jobs:
   coverity:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+      with:
+        ref: develop
 
     - name: Dependencies
       run: sudo apt-get install -y libcjson-dev libsqlite3-dev libssl-dev uthash-dev
diff --git a/.github/workflows/coverity-scan-fixes.yml b/.github/workflows/coverity-scan-fixes.yml
new file mode 100644
index 00000000..2f11d013
--- /dev/null
+++ b/.github/workflows/coverity-scan-fixes.yml
@@ -0,0 +1,26 @@
+name: Coverity Scan fixes branch on a weekly basis
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "7 3 * * 3"
+
+jobs:
+  coverity:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        ref: fixes
+
+    - name: Dependencies
+      run: sudo apt-get install -y libcjson-dev libsqlite3-dev libssl-dev uthash-dev
+
+    - uses: vapier/coverity-scan-action@v1
+      with:
+        build_language: 'cxx'
+        project: "eclipse/mosquitto"
+        token: ${{ secrets.COVERITY_SCAN_TOKEN }}
+        email: ${{ secrets.COVERITY_SCAN_EMAIL }}
+        command: "make binary"
+
diff --git a/.github/workflows/covsync.yml b/.github/workflows/covsync.yml
deleted file mode 100644
index 233b009e..00000000
--- a/.github/workflows/covsync.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: "Synchronise Coverity Scan branches on a weekly basis"
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "7 3 * * 0"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - run: |
-          git checkout coverity-fixes
-          git reset --hard origin/fixes
-          git push origin coverity-fixes
-          git checkout coverity-develop
-          git reset --hard origin/develop
-          git push origin coverity-develop