diff --git a/modules/jenkins_jobs/files/projects/openstack/gerrit.yml b/modules/jenkins_jobs/files/projects/openstack/gerrit.yml
index 5d1c228c46..bf5fe6fae4 100644
--- a/modules/jenkins_jobs/files/projects/openstack/gerrit.yml
+++ b/modules/jenkins_jobs/files/projects/openstack/gerrit.yml
@@ -1,9 +1,9 @@
 ---
+# gate-gerrit-merge
 modules:
   - properties
   - scm
   - assignednode
-  - trigger_gerrit
   - builders
   - publisher_none
 
@@ -14,61 +14,25 @@ main:
   project: 'gerrit'
   authenticatedBuild: 'true'
   disabled: 'false'
+  concurrent: 'true'
 
-trigger:
-  triggerOnPatchsetUploadedEvent: 'false'
-  triggerOnChangeMergedEvent: 'false'
-  triggerOnCommentAddedEvent: 'true'
-  triggerOnRefUpdatedEvent: 'false'
-  triggerApprovalCategory: 'APRV'
-  triggerApprovalValue: 1
-  failureMessage: 'This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.'
-  projects:
-    - projectCompareType: 'PLAIN'
-      projectPattern: 'openstack-ci/gerrit'
-      branchCompareType: 'ANT'
-      branchPattern: '**'
+parameters:
+  - name: UUID
+    type: string
+    description: Zuul provided key to link builds with Gerrit events
+  - name: GERRIT_PROJECT
+    type: string
+    description: Zuul provided project name
+  - name: GERRIT_BRANCH
+    type: string
+    description: Zuul provided branch name
+  - name: GERRIT_CHANGES
+    type: string
+    description: Zuul provided list of dependent changes to merge
 
-builders:
-  - gerrit_git_prep
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: 'oneiric'
-
----
-modules:
-  - properties
-  - scm
-  - assignednode
-  - trigger_gerrit
-  - builders
-  - publisher_none
-
-main:
-  name: 'check-gerrit-merge'
-  github_org: 'openstack-ci'
-  review_site: 'review.openstack.org'
-  project: 'gerrit'
-  authenticatedBuild: 'true'
-  disabled: 'false'
-
-trigger:
-  triggerOnPatchsetUploadedEvent: 'true'
-  triggerOnChangeMergedEvent: 'false'
-  triggerOnCommentAddedEvent: 'false'
-  triggerOnRefUpdatedEvent: 'false'
-  overrideVotes: 'true'
-  gerritBuildSuccessfulVerifiedValue: 1
-  gerritBuildFailedVerifiedValue: -1
-  failureMessage: 'This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.'
-  projects:
-    - projectCompareType: 'PLAIN'
-      projectPattern: 'openstack-ci/gerrit'
-      branchCompareType: 'ANT'
-      branchPattern: '**'
+notification_endpoints:
+  - protocol: HTTP
+    URL: http://127.0.0.1:8001/jenkins_endpoint
 
 builders:
   - gerrit_git_prep
@@ -86,7 +50,6 @@ modules:
   - properties
   - scm
   - assignednode
-  - trigger_gerrit
   - builders:prebuilders
   - publisher_war
 
@@ -97,21 +60,25 @@ main:
   project: 'gerrit'
   authenticatedBuild: 'true'
   disabled: 'false'
+  concurrent: 'true'
 
-trigger:
-  triggerOnPatchsetUploadedEvent: 'true'
-  triggerOnChangeMergedEvent: 'false'
-  triggerOnCommentAddedEvent: 'false'
-  triggerOnRefUpdatedEvent: 'false'
-  overrideVotes: 'true'
-  gerritBuildSuccessfulVerifiedValue: 1
-  gerritBuildFailedVerifiedValue: -1
-  failureMessage: ''
-  projects:
-    - projectCompareType: 'PLAIN'
-      projectPattern: 'openstack-ci/gerrit'
-      branchCompareType: 'ANT'
-      branchPattern: '**'
+parameters:
+  - name: UUID
+    type: string
+    description: Zuul provided key to link builds with Gerrit events
+  - name: GERRIT_PROJECT
+    type: string
+    description: Zuul provided project name
+  - name: GERRIT_BRANCH
+    type: string
+    description: Zuul provided branch name
+  - name: GERRIT_CHANGES
+    type: string
+    description: Zuul provided list of dependent changes to merge
+
+notification_endpoints:
+  - protocol: HTTP
+    URL: http://127.0.0.1:8001/jenkins_endpoint
 
 prebuilders:
   - gerrit_git_prep
@@ -127,7 +94,7 @@ postbuilders:
   - gerrit_postrun
 
 scm:
-  scm: 'true'
+  scm: 'false'
 
 assignednode:
   node: 'oneiric'
@@ -144,7 +111,6 @@ modules:
   - properties
   - scm
   - assignednode
-  - trigger_gerrit
   - builders:prebuilders
   - builders:postbuilders
   - publisher_none
@@ -156,20 +122,25 @@ main:
   project: 'gerrit'
   authenticatedBuild: 'true'
   disabled: 'false'
+  concurrent: 'true'
 
-trigger:
-  triggerOnPatchsetUploadedEvent: 'false'
-  triggerOnChangeMergedEvent: 'false'
-  triggerOnCommentAddedEvent: 'true'
-  triggerOnRefUpdatedEvent: 'false'
-  triggerApprovalCategory: 'APRV'
-  triggerApprovalValue: 1
-  failureMessage: ''
-  projects:
-    - projectCompareType: 'PLAIN'
-      projectPattern: 'openstack-ci/gerrit'
-      branchCompareType: 'ANT'
-      branchPattern: '**'
+parameters:
+  - name: UUID
+    type: string
+    description: Zuul provided key to link builds with Gerrit events
+  - name: GERRIT_PROJECT
+    type: string
+    description: Zuul provided project name
+  - name: GERRIT_BRANCH
+    type: string
+    description: Zuul provided branch name
+  - name: GERRIT_CHANGES
+    type: string
+    description: Zuul provided list of dependent changes to merge
+
+notification_endpoints:
+  - protocol: HTTP
+    URL: http://127.0.0.1:8001/jenkins_endpoint
 
 prebuilders:
   - gerrit_git_prep
@@ -185,7 +156,7 @@ postbuilders:
   - gerrit_postrun
 
 scm:
-  scm: 'true'
+  scm: 'false'
 
 assignednode:
   node: 'oneiric'
@@ -238,7 +209,7 @@ postbuilders:
   - gerrit_postrun
 
 scm:
-  scm: 'true'
+  scm: 'false'
 
 assignednode:
   node: 'oneiric'
diff --git a/modules/openstack-ci-config/files/zuul/layout.yaml b/modules/openstack-ci-config/files/zuul/layout.yaml
index 660ac9f348..69098d5c76 100644
--- a/modules/openstack-ci-config/files/zuul/layout.yaml
+++ b/modules/openstack-ci-config/files/zuul/layout.yaml
@@ -24,6 +24,8 @@ jobs:
     failure-message: This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
   - name: gate-pypi-mirror-merge
     failure-message: This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
+  - name: gate-gerrit-merge
+    failure-message: This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
 
 projects:
   - name: openstack-ci/zuul
@@ -42,3 +44,10 @@ projects:
     gate:
       - gate-pypi-mirror-merge:
         - gate-pypi-mirror-pyflakes
+  - name: openstack-ci/gerrit
+    check:
+      - gate-gerrit-merge:
+        - check-gerrit-unittests
+    gate:
+      - gate-gerrit-merge:
+        - gate-gerrit-unittests