diff --git a/.github/workflows/coverity-dispatch.yml b/.github/workflows/coverity-dispatch.yml
index facdf3e85c05..2b4f1166ff92 100644
--- a/.github/workflows/coverity-dispatch.yml
+++ b/.github/workflows/coverity-dispatch.yml
@@ -16,10 +16,32 @@ permissions: # least privileges, see https://docs.github.com/en/actions/using-wo
   contents: read
 
 jobs:
-  call-coverity:
+  coverity-auth:
+    name: coverity scan of the auth
+    if: ${{ github.event.inputs.product == 'authoritative' }}
     uses: PowerDNS/pdns/.github/workflows/coverity.yml@master
     with:
       product: ${{ github.event.inputs.product }}
     secrets:
-      COVERITY_TOKEN: ${{ secrets.COVERITY_TOKEN }}
-      COVERITY_EMAIL: ${{ secrets.COVERITY_EMAIL }}
+      COVERITY_TOKEN: ${{ secrets.coverity_auth_token }}
+      COVERITY_EMAIL: ${{ secrets.coverity_email }}
+
+  coverity-dnsdist:
+    name: coverity scan of dnsdist
+    if: ${{ github.event.inputs.product == 'dnsdist' }}
+    uses: PowerDNS/pdns/.github/workflows/coverity.yml@master
+    with:
+      product: ${{ github.event.inputs.product }}
+    secrets:
+      COVERITY_TOKEN: ${{ secrets.coverity_dnsdist_token }}
+      COVERITY_EMAIL: ${{ secrets.coverity_email }}
+
+  coverity-rec:
+    name: coverity scan of the rec
+    if: ${{ github.event.inputs.product == 'recursor' }}
+    uses: PowerDNS/pdns/.github/workflows/coverity.yml@master
+    with:
+      product: ${{ github.event.inputs.product }}
+    secrets:
+      COVERITY_TOKEN: ${{ secrets.coverity_rec_token }}
+      COVERITY_EMAIL: ${{ secrets.coverity_email }}
diff --git a/.github/workflows/misc-dailies.yml b/.github/workflows/misc-dailies.yml
index e70c4309c03f..c11ebc27f70e 100644
--- a/.github/workflows/misc-dailies.yml
+++ b/.github/workflows/misc-dailies.yml
@@ -46,8 +46,8 @@ jobs:
     with:
       product: 'authoritative'
     secrets:
-      COVERITY_TOKEN: ${{ secrets.COVERITY_TOKEN }}
-      COVERITY_EMAIL: ${{ secrets.COVERITY_EMAIL }}
+      COVERITY_TOKEN: ${{ secrets.coverity_auth_token }}
+      COVERITY_EMAIL: ${{ secrets.coverity_email }}
 
   coverity-dnsdist:
     name: coverity scan of dnsdist
@@ -56,8 +56,8 @@ jobs:
     with:
       product: 'dnsdist'
     secrets:
-      COVERITY_TOKEN: ${{ secrets.COVERITY_TOKEN }}
-      COVERITY_EMAIL: ${{ secrets.COVERITY_EMAIL }}
+      COVERITY_TOKEN: ${{ secrets.coverity_dnsdist_token }}
+      COVERITY_EMAIL: ${{ secrets.coverity_email }}
 
   coverity-rec:
     name: coverity scan of the rec
@@ -66,5 +66,5 @@ jobs:
     with:
       product: 'recursor'
     secrets:
-      COVERITY_TOKEN: ${{ secrets.COVERITY_TOKEN }}
-      COVERITY_EMAIL: ${{ secrets.COVERITY_EMAIL }}
+      COVERITY_TOKEN: ${{ secrets.coverity_rec_token }}
+      COVERITY_EMAIL: ${{ secrets.coverity_email }}