diff --git a/jenkins/jobs/ansible-role-jobs.yaml b/jenkins/jobs/ansible-role-jobs.yaml
index 35270e29fd..2ac65db692 100644
--- a/jenkins/jobs/ansible-role-jobs.yaml
+++ b/jenkins/jobs/ansible-role-jobs.yaml
@@ -14,7 +14,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ansible-dsvm-functional-{ostype}{job-suffix}'
+    name: '{pipeline}-{name}-dsvm-functional-{ostype}{job-suffix}'
     node: 'devstack-{ostype}'
 
     builders:
@@ -26,6 +26,21 @@
       - zuul-swift-upload-console-log
 
 - job-group:
+    # TODO(pabelanger): Remove in favor of ansible-role-jobs
     name: 'ansible-lint-jobs'
     jobs:
       - 'gate-{name}-ansible-lint'
+
+- job-group:
+    name: 'ansible-role-jobs'
+    jobs:
+      - 'gate-{name}-docs'
+      - 'gate-{name}-pep8'
+      - 'gate-{name}-tox-{envlist}':
+          envlist: ansible-lint
+      - '{pipeline}-{name}-dsvm-functional-{ostype}{job-suffix}':
+          job-suffix: '-nv'
+          ostype:
+            - centos7
+            - trusty
+          pipeline: gate
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 8068fbb967..1a6776aa17 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -38,17 +38,7 @@
     tarball-site: tarballs.openstack.org
 
     jobs:
-      - '{pipeline}-ansible-dsvm-functional-{ostype}{job-suffix}':
-          job-suffix: '-nv'
-          ostype:
-            - centos7
-            - trusty
-          pipeline: gate
-      # NOTE(pabelanger): We should talk to other ansible project and see about
-      # migrating gate-{project}-ansible-lint to use tox. Then we can drop this
-      # gate in favor for that.
-      - 'gate-{name}-tox-{envlist}':
-          envlist: ansible-lint
+      - ansible-role-jobs
 
 - project:
     name: anvil
@@ -3451,10 +3441,8 @@
     doc-publisher-site: docs.openstack.org
 
     jobs:
+      - ansible-role-jobs
       - openstack-publish-jobs
-      - 'gate-{name}-ansible-lint'
-      - 'gate-{name}-docs'
-      - 'gate-{name}-pep8'
       - 'gate-{name}-tox-{envlist}':
           envlist: ansible-functional
 
@@ -3464,10 +3452,8 @@
     doc-publisher-site: docs.openstack.org
 
     jobs:
+      - ansible-role-jobs
       - openstack-publish-jobs
-      - 'gate-{name}-ansible-lint'
-      - 'gate-{name}-docs'
-      - 'gate-{name}-pep8'
       - 'gate-{name}-tox-{envlist}':
           envlist: ansible-functional
 
@@ -3477,10 +3463,8 @@
     doc-publisher-site: docs.openstack.org
 
     jobs:
+      - ansible-role-jobs
       - openstack-publish-jobs
-      - 'gate-{name}-ansible-lint'
-      - 'gate-{name}-docs'
-      - 'gate-{name}-pep8'
       - 'gate-{name}-tox-{envlist}':
           envlist: ansible-functional
 
@@ -3490,10 +3474,8 @@
     doc-publisher-site: docs.openstack.org
 
     jobs:
+      - ansible-role-jobs
       - openstack-publish-jobs
-      - 'gate-{name}-ansible-lint'
-      - 'gate-{name}-docs'
-      - 'gate-{name}-pep8'
       - 'gate-{name}-tox-{envlist}':
           envlist: ansible-functional
 
@@ -3503,10 +3485,8 @@
     doc-publisher-site: docs.openstack.org
 
     jobs:
+      - ansible-role-jobs
       - openstack-publish-jobs
-      - 'gate-{name}-ansible-lint'
-      - 'gate-{name}-docs'
-      - 'gate-{name}-pep8'
       - 'gate-{name}-tox-{envlist}':
           envlist: ansible-functional
 
@@ -3516,10 +3496,8 @@
     doc-publisher-site: docs.openstack.org
 
     jobs:
+      - ansible-role-jobs
       - openstack-publish-jobs
-      - 'gate-{name}-ansible-lint'
-      - 'gate-{name}-docs'
-      - 'gate-{name}-pep8'
       - 'gate-{name}-tox-{envlist}':
           envlist: ansible-functional
 
@@ -3529,10 +3507,8 @@
     doc-publisher-site: docs.openstack.org
 
     jobs:
+      - ansible-role-jobs
       - openstack-publish-jobs
-      - 'gate-{name}-ansible-lint'
-      - 'gate-{name}-docs'
-      - 'gate-{name}-pep8'
       - 'gate-{name}-tox-{envlist}':
           envlist: ansible-functional
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8f915086ea..d307e22002 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -245,6 +245,16 @@ project-templates:
     merge-check:
       - noop
 
+  - name: ansible-role-jobs
+    check:
+      - 'gate-{name}-docs'
+      - 'gate-{name}-pep8'
+      - 'gate-{name}-tox-ansible-lint'
+    gate:
+      - 'gate-{name}-docs'
+      - 'gate-{name}-pep8'
+      - 'gate-{name}-tox-ansible-lint'
+
   - name: python-jobs
     check:
       - 'gate-{name}-pep8'
@@ -3585,12 +3595,10 @@ projects:
   - name: openstack/ansible-role-nodepool
     template:
       - name: merge-check
+      - name: ansible-role-jobs
     check:
-      - gate-ansible-role-nodepool-tox-ansible-lint
-      - gate-ansible-dsvm-functional-centos7-nv
-      - gate-ansible-dsvm-functional-trusty-nv
-    gate:
-      - gate-ansible-role-nodepool-tox-ansible-lint
+      - gate-ansible-role-nodepool-dsvm-functional-centos7-nv
+      - gate-ansible-role-nodepool-dsvm-functional-trusty-nv
 
   - name: openstack/anvil
     template:
@@ -6746,106 +6754,71 @@ projects:
   - name: openstack/openstack-ansible-apt_package_pinning
     template:
       - name: merge-check
+      - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
     check:
-      - gate-openstack-ansible-apt_package_pinning-docs
-      - gate-openstack-ansible-apt_package_pinning-pep8
-      - gate-openstack-ansible-apt_package_pinning-ansible-lint
       - gate-openstack-ansible-apt_package_pinning-tox-ansible-functional
     gate:
-      - gate-openstack-ansible-apt_package_pinning-docs
-      - gate-openstack-ansible-apt_package_pinning-pep8
-      - gate-openstack-ansible-apt_package_pinning-ansible-lint
       - gate-openstack-ansible-apt_package_pinning-tox-ansible-functional
 
   - name: openstack/openstack-ansible-lxc_container_create
     template:
       - name: merge-check
+      - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
     check:
-      - gate-openstack-ansible-lxc_container_create-docs
-      - gate-openstack-ansible-lxc_container_create-pep8
-      - gate-openstack-ansible-lxc_container_create-ansible-lint
       - gate-openstack-ansible-lxc_container_create-tox-ansible-functional
     gate:
-      - gate-openstack-ansible-lxc_container_create-docs
-      - gate-openstack-ansible-lxc_container_create-pep8
-      - gate-openstack-ansible-lxc_container_create-ansible-lint
       - gate-openstack-ansible-lxc_container_create-tox-ansible-functional
 
   - name: openstack/openstack-ansible-lxc_hosts
     template:
       - name: merge-check
+      - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
     check:
-      - gate-openstack-ansible-lxc_hosts-docs
-      - gate-openstack-ansible-lxc_hosts-pep8
-      - gate-openstack-ansible-lxc_hosts-ansible-lint
       - gate-openstack-ansible-lxc_hosts-tox-ansible-functional
     gate:
-      - gate-openstack-ansible-lxc_hosts-docs
-      - gate-openstack-ansible-lxc_hosts-pep8
-      - gate-openstack-ansible-lxc_hosts-ansible-lint
       - gate-openstack-ansible-lxc_hosts-tox-ansible-functional
 
   - name: openstack/openstack-ansible-openstack_hosts
     template:
       - name: merge-check
+      - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
     check:
-      - gate-openstack-ansible-openstack_hosts-docs
-      - gate-openstack-ansible-openstack_hosts-pep8
-      - gate-openstack-ansible-openstack_hosts-ansible-lint
       - gate-openstack-ansible-openstack_hosts-tox-ansible-functional
     gate:
-      - gate-openstack-ansible-openstack_hosts-docs
-      - gate-openstack-ansible-openstack_hosts-pep8
-      - gate-openstack-ansible-openstack_hosts-ansible-lint
       - gate-openstack-ansible-openstack_hosts-tox-ansible-functional
 
   - name: openstack/openstack-ansible-pip_install
     template:
       - name: merge-check
+      - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
     check:
-      - gate-openstack-ansible-pip_install-docs
-      - gate-openstack-ansible-pip_install-pep8
-      - gate-openstack-ansible-pip_install-ansible-lint
       - gate-openstack-ansible-pip_install-tox-ansible-functional
     gate:
-      - gate-openstack-ansible-pip_install-docs
-      - gate-openstack-ansible-pip_install-pep8
-      - gate-openstack-ansible-pip_install-ansible-lint
       - gate-openstack-ansible-pip_install-tox-ansible-functional
 
   - name: openstack/openstack-ansible-py_from_git
     template:
       - name: merge-check
+      - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
     check:
-      - gate-openstack-ansible-py_from_git-docs
-      - gate-openstack-ansible-py_from_git-pep8
-      - gate-openstack-ansible-py_from_git-ansible-lint
       - gate-openstack-ansible-py_from_git-tox-ansible-functional
     gate:
-      - gate-openstack-ansible-py_from_git-docs
-      - gate-openstack-ansible-py_from_git-pep8
-      - gate-openstack-ansible-py_from_git-ansible-lint
       - gate-openstack-ansible-py_from_git-tox-ansible-functional
 
   - name: openstack/openstack-ansible-rsyslog_client
     template:
       - name: merge-check
+      - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
     check:
-      - gate-openstack-ansible-rsyslog_client-docs
-      - gate-openstack-ansible-rsyslog_client-pep8
-      - gate-openstack-ansible-rsyslog_client-ansible-lint
       - gate-openstack-ansible-rsyslog_client-tox-ansible-functional
     gate:
-      - gate-openstack-ansible-rsyslog_client-docs
-      - gate-openstack-ansible-rsyslog_client-pep8
-      - gate-openstack-ansible-rsyslog_client-ansible-lint
       - gate-openstack-ansible-rsyslog_client-tox-ansible-functional
 
   - name: openstack/openstack-ansible-security