diff --git a/modules/openstack_project/files/zuul/layout-dev.yaml b/modules/openstack_project/files/zuul/layout-dev.yaml
index b418261603..cc87872ad9 100644
--- a/modules/openstack_project/files/zuul/layout-dev.yaml
+++ b/modules/openstack_project/files/zuul/layout-dev.yaml
@@ -6,9 +6,10 @@ pipelines:
     description: This pipeline is used for silently testing new jobs.
     manager: IndependentPipelineManager
     trigger:
-      - event: patchset-created
-      - event: comment-added
-        comment_filter: (?i)^\s*recheck(( (?:bug|lp)[\s#:]*(\d+))|( no bug))\s*$
+      gerrit:
+        - event: patchset-created
+        - event: comment-added
+          comment_filter: (?i)^\s*recheck(( (?:bug|lp)[\s#:]*(\d+))|( no bug))\s*$
 
 
 jobs:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 13b167c709..8498ef8769 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -8,9 +8,10 @@ pipelines:
     manager: IndependentPipelineManager
     precedence: low
     trigger:
-      - event: patchset-created
-      - event: comment-added
-        comment_filter: (?i)^\s*recheck(( (?:bug|lp)[\s#:]*(\d+))|( no bug))\s*$
+      gerrit:
+        - event: patchset-created
+        - event: comment-added
+          comment_filter: (?i)^\s*recheck(( (?:bug|lp)[\s#:]*(\d+))|( no bug))\s*$
     success:
       verified: 1
     failure:
@@ -22,11 +23,12 @@ pipelines:
     manager: DependentPipelineManager
     precedence: high
     trigger:
-      - event: comment-added
-        approval:
-          - approved: 1
-      - event: comment-added
-        comment_filter: (?i)^\s*reverify(( (?:bug|lp)[\s#:]*(\d+))|( no bug))\s*$
+      gerrit:
+        - event: comment-added
+          approval:
+            - approved: 1
+        - event: comment-added
+          comment_filter: (?i)^\s*reverify(( (?:bug|lp)[\s#:]*(\d+))|( no bug))\s*$
     start:
       verified: 0
     success:
@@ -39,33 +41,37 @@ pipelines:
     description: This pipeline runs jobs that operate after each change is merged.
     manager: IndependentPipelineManager
     trigger:
-      - event: ref-updated
-        ref: ^(?!(devnull|refs/.*)).*$
+      gerrit:
+        - event: ref-updated
+          ref: ^(?!(devnull|refs/.*)).*$
 
   - name: pre-release
     description: This pipeline runs jobs on projects in response to pre-release tags.
     manager: IndependentPipelineManager
     precedence: high
     trigger:
-      - event: ref-updated
-        ref: ^refs/tags/([0-9]+\.)+[0-9]*(alpha|beta|candidate|rc|a|b|c|r|g)[0-9]*$
+      gerrit:
+        - event: ref-updated
+          ref: ^refs/tags/([0-9]+\.)+[0-9]*(alpha|beta|candidate|rc|a|b|c|r|g)[0-9]*$
 
   - name: release
     description: When a commit is tagged as a release, this pipeline runs jobs that publish archives and documentation.
     manager: IndependentPipelineManager
     precedence: high
     trigger:
-      - event: ref-updated
-        ref: ^refs/tags/([0-9]+\.)+[0-9]+$
+      gerrit:
+        - event: ref-updated
+          ref: ^refs/tags/([0-9]+\.)+[0-9]+$
 
   - name: silent
     description: This pipeline is used for silently testing new jobs.
     manager: IndependentPipelineManager
     precedence: low
     trigger:
-      - event: patchset-created
-      - event: comment-added
-        comment_filter: (?i)^\s*recheck(( (?:bug|lp)[\s#:]*(\d+))|( no bug))\s*$
+      gerrit:
+        - event: patchset-created
+        - event: comment-added
+          comment_filter: (?i)^\s*recheck(( (?:bug|lp)[\s#:]*(\d+))|( no bug))\s*$
 
 
 jobs: