diff --git a/jjb/docs.yaml b/jjb/docs.yaml
index d3b6e05..17ae369 100644
--- a/jjb/docs.yaml
+++ b/jjb/docs.yaml
@@ -16,7 +16,6 @@
     # add repos that have documentation to the project list in both jobs
     jobs:
       - 'verify-documentation':
-          primary-docs-repo-regexp: '^docs$'
           other-docs-repos-regexp: '^(cord-tester|xos|xos-gui|xos-tosca)$'
           branch-regexp: '{modern-branches-regexp}'
 
@@ -76,20 +75,35 @@
     name: "verify-documentation"
 
     triggers:
-      # trigger on any change in docs repo
-      - cord-infra-gerrit-trigger-patchset:
-          gerrit-server-name: '{gerrit-server-name}'
-          project-regexp: '{primary-docs-repo-regexp}'
-          branch-regexp: '{branch-regexp}'
-          file-include-regexp: '{all-files-regexp}'
+      - gerrit:
+          server-name: '{gerrit-server-name}'
           dependency-jobs: '{dependency-jobs}'
-      # trigger on only docs/* changes in other repos
-      - cord-infra-gerrit-trigger-patchset:
-          gerrit-server-name: '{gerrit-server-name}'
-          project-regexp: '{other-docs-repos-regexp}'
-          branch-regexp: '{branch-regexp}'
-          file-include-regexp: '{doc-files-regexp}'
-          dependency-jobs: '{dependency-jobs}'
+          silent-start: true
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: true
+                exclude-trivial-rebase: false
+                exclude-no-code-change: true
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: '(?i)^.*recheck$'
+          projects:
+            - project-compare-type: PLAIN
+              project-pattern: 'docs'
+              branches:
+                - branch-compare-type: REG_EXP
+                  branch-pattern: '{branch-regexp}'
+              file-paths:
+                - compare-type: REG_EXP
+                  pattern: '{all-files-regexp}'
+            - project-compare-type: REG_EXP
+              project-pattern: '{other-docs-repos-regexp}'
+              branches:
+                - branch-compare-type: REG_EXP
+                  branch-pattern: '{branch-regexp}'
+              file-paths:
+                - compare-type: REG_EXP
+                  pattern: '{doc-files-regexp}'
 
     properties:
       - cord-infra-properties: