diff --git a/jenkins/jobs/macros.yaml b/jenkins/jobs/macros.yaml
index 9974c2fe60..2e7c82ac6f 100644
--- a/jenkins/jobs/macros.yaml
+++ b/jenkins/jobs/macros.yaml
@@ -418,15 +418,6 @@
     builders:
       - shell: sudo pip install "pip<8" "virtualenv<14"
 
-# note that this job uses an in-repo script for execution
-# in order to cater for differing requirements per branch
-- builder:
-    name: ansible-check-commit
-    builders:
-      - shell: |
-          #!/bin/bash -xe
-          sudo scripts/gate-check-commit.sh
-
 - builder:
     name: ansible-prep
     builders:
diff --git a/jenkins/jobs/openstack-ansible-jobs.yaml b/jenkins/jobs/openstack-ansible-jobs.yaml
index bd4b3fc8af..38b08adf72 100644
--- a/jenkins/jobs/openstack-ansible-jobs.yaml
+++ b/jenkins/jobs/openstack-ansible-jobs.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'gate-{name}-dsvm-commit'
+    name: 'gate-{name}-openstack-ansible-{scenario}-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -11,7 +11,10 @@
       - print-template-name:
           template-name: "{template-name}"
       - gerrit-git-prep
-      - ansible-check-commit
+      - shell: |
+          #!/bin/bash -xe
+          export SCENARIO="{scenario}"
+          sudo scripts/gate-check-commit.sh
 
     publishers:
       - devstack-logs
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index ef1fbf6598..25ca76dafd 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -5353,8 +5353,19 @@
       - gate-{name}-requirements
       - openstack-publish-jobs
       - openstack-releasenotes-jobs
-      - 'gate-{name}-dsvm-commit':
-          node: ubuntu-trusty
+      - 'gate-{name}-openstack-ansible-{scenario}-{node}{job-suffix}':
+          job-suffix: ''
+          node:
+            - centos-7
+            - ubuntu-trusty
+            - ubuntu-xenial
+          scenario: aio
+      - 'gate-{name}-openstack-ansible-{scenario}-{node}{job-suffix}':
+          job-suffix: '-nv'
+          node:
+            - centos-7
+            - ubuntu-xenial
+          scenario: aio
 
 - project:
     name: openstack-ansible-apt_package_pinning
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3cdbddc01f..e86c57dd4a 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -9557,17 +9557,19 @@ projects:
       - gate-openstack-ansible-docs-ubuntu-xenial
       - gate-openstack-ansible-linters-ubuntu-trusty
       - gate-openstack-ansible-linters-ubuntu-xenial
-      - gate-openstack-ansible-dsvm-commit
+      - gate-openstack-ansible-openstack-ansible-aio-ubuntu-trusty
     gate:
       - gate-openstack-ansible-docs-ubuntu-trusty
       - gate-openstack-ansible-docs-ubuntu-xenial
       - gate-openstack-ansible-linters-ubuntu-trusty
       - gate-openstack-ansible-linters-ubuntu-xenial
-      - gate-openstack-ansible-dsvm-commit
+      - gate-openstack-ansible-openstack-ansible-aio-ubuntu-trusty
     experimental:
       - gate-openstack-ansible-ansible-func-centos-7-nv
       - gate-openstack-ansible-ansible-func-ubuntu-trusty-nv
       - gate-openstack-ansible-ansible-func-ubuntu-xenial-nv
+      - gate-openstack-ansible-openstack-ansible-aio-centos-7
+      - gate-openstack-ansible-openstack-ansible-aio-ubuntu-xenial
     release:
       - openstack-ansible-announce-release