diff --git a/jenkins/jobs/ansible-role-jobs.yaml b/jenkins/jobs/ansible-role-jobs.yaml
index 2ac65db692..a1b033f4df 100644
--- a/jenkins/jobs/ansible-role-jobs.yaml
+++ b/jenkins/jobs/ansible-role-jobs.yaml
@@ -44,3 +44,9 @@
             - centos7
             - trusty
           pipeline: gate
+      - '{pipeline}-{name}-dsvm-functional-{ostype}{job-suffix}':
+          job-suffix: ''
+          ostype:
+            - centos7
+            - trusty
+          pipeline: gate
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index bb690167e1..738894f011 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3445,8 +3445,6 @@
     jobs:
       - ansible-role-jobs
       - openstack-publish-jobs
-      - 'gate-{name}-tox-{envlist}':
-          envlist: ansible-functional
 
 - project:
     name: openstack-ansible-lxc_container_create
@@ -3456,8 +3454,6 @@
     jobs:
       - ansible-role-jobs
       - openstack-publish-jobs
-      - 'gate-{name}-tox-{envlist}':
-          envlist: ansible-functional
 
 - project:
     name: openstack-ansible-lxc_hosts
@@ -3467,8 +3463,6 @@
     jobs:
       - ansible-role-jobs
       - openstack-publish-jobs
-      - 'gate-{name}-tox-{envlist}':
-          envlist: ansible-functional
 
 - project:
     name: openstack-ansible-openstack_hosts
@@ -3478,8 +3472,6 @@
     jobs:
       - ansible-role-jobs
       - openstack-publish-jobs
-      - 'gate-{name}-tox-{envlist}':
-          envlist: ansible-functional
 
 - project:
     name: openstack-ansible-pip_install
@@ -3489,8 +3481,6 @@
     jobs:
       - ansible-role-jobs
       - openstack-publish-jobs
-      - 'gate-{name}-tox-{envlist}':
-          envlist: ansible-functional
 
 - project:
     name: openstack-ansible-py_from_git
@@ -3500,8 +3490,6 @@
     jobs:
       - ansible-role-jobs
       - openstack-publish-jobs
-      - 'gate-{name}-tox-{envlist}':
-          envlist: ansible-functional
 
 - project:
     name: openstack-ansible-rsyslog_client
@@ -3511,8 +3499,6 @@
     jobs:
       - ansible-role-jobs
       - openstack-publish-jobs
-      - 'gate-{name}-tox-{envlist}':
-          envlist: ansible-functional
 
 - project:
     name: openstack-ansible-security
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 14e4dac9b2..164ebecaaf 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6777,9 +6777,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
     check:
-      - gate-openstack-ansible-apt_package_pinning-tox-ansible-functional
+      - gate-openstack-ansible-apt_package_pinning-dsvm-functional-trusty
     gate:
-      - gate-openstack-ansible-apt_package_pinning-tox-ansible-functional
+      - gate-openstack-ansible-apt_package_pinning-dsvm-functional-trusty
 
   - name: openstack/openstack-ansible-lxc_container_create
     template:
@@ -6787,9 +6787,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
     check:
-      - gate-openstack-ansible-lxc_container_create-tox-ansible-functional
+      - gate-openstack-ansible-lxc_container_create-dsvm-functional-trusty
     gate:
-      - gate-openstack-ansible-lxc_container_create-tox-ansible-functional
+      - gate-openstack-ansible-lxc_container_create-dsvm-functional-trusty
 
   - name: openstack/openstack-ansible-lxc_hosts
     template:
@@ -6797,9 +6797,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
     check:
-      - gate-openstack-ansible-lxc_hosts-tox-ansible-functional
+      - gate-openstack-ansible-lxc_hosts-dsvm-functional-trusty
     gate:
-      - gate-openstack-ansible-lxc_hosts-tox-ansible-functional
+      - gate-openstack-ansible-lxc_hosts-dsvm-functional-trusty
 
   - name: openstack/openstack-ansible-openstack_hosts
     template:
@@ -6807,9 +6807,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
     check:
-      - gate-openstack-ansible-openstack_hosts-tox-ansible-functional
+      - gate-openstack-ansible-openstack_hosts-dsvm-functional-trusty
     gate:
-      - gate-openstack-ansible-openstack_hosts-tox-ansible-functional
+      - gate-openstack-ansible-openstack_hosts-dsvm-functional-trusty
 
   - name: openstack/openstack-ansible-pip_install
     template:
@@ -6817,9 +6817,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
     check:
-      - gate-openstack-ansible-pip_install-tox-ansible-functional
+      - gate-openstack-ansible-pip_install-dsvm-functional-trusty
     gate:
-      - gate-openstack-ansible-pip_install-tox-ansible-functional
+      - gate-openstack-ansible-pip_install-dsvm-functional-trusty
 
   - name: openstack/openstack-ansible-py_from_git
     template:
@@ -6827,9 +6827,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
     check:
-      - gate-openstack-ansible-py_from_git-tox-ansible-functional
+      - gate-openstack-ansible-py_from_git-dsvm-functional-trusty
     gate:
-      - gate-openstack-ansible-py_from_git-tox-ansible-functional
+      - gate-openstack-ansible-py_from_git-dsvm-functional-trusty
 
   - name: openstack/openstack-ansible-rsyslog_client
     template:
@@ -6837,9 +6837,9 @@ projects:
       - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
     check:
-      - gate-openstack-ansible-rsyslog_client-tox-ansible-functional
+      - gate-openstack-ansible-rsyslog_client-dsvm-functional-trusty
     gate:
-      - gate-openstack-ansible-rsyslog_client-tox-ansible-functional
+      - gate-openstack-ansible-rsyslog_client-dsvm-functional-trusty
 
   - name: openstack/openstack-ansible-security
     template: