diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index c4d4fe6..84908e6 100644
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -147,16 +147,33 @@
           refspec: $GERRIT_REFSPEC
 
     triggers:
-      - nordix-gerrit-trigger-patchset-created:
-          project: 'infra\/engine'
-          branch: '{branch}'
-          files: '**'
-          custom-url: '* $JOB_NAME $BUILD_URL'
+      - gerrit:
+          server-name: 'Nordix Gerrit'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'REG_EXP'
+              project-pattern: 'infra\/engine'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: 'ANT'
+                  pattern: '**'
           skip-vote:
             successful: '{obj:successful}'
             failed: '{obj:failed}'
             unstable: '{obj:unstable}'
             notbuilt: '{obj:notbuilt}'
+          custom-url: '* $JOB_NAME $BUILD_URL'
 
     builders:
       - 'cloud-infra-determine-scenario-macro'