diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index daa1ac7a9e..8d4dca1fad 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3556,10 +3556,8 @@
     doc-publisher-site: docs.openstack.org
 
     jobs:
+      - ansible-role-jobs
       - openstack-publish-jobs
-      - 'gate-{name}-ansible-lint'
-      - 'gate-{name}-docs'
-      - 'gate-{name}-pep8'
 
 - project:
     name: openstack-ansible-specs
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index bc664de32a..f5f71990f1 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6928,15 +6928,12 @@ projects:
   - name: openstack/openstack-ansible-security
     template:
       - name: merge-check
+      - name: ansible-role-jobs
       - name: openstack-server-publish-jobs
     check:
-      - gate-openstack-ansible-security-docs
-      - gate-openstack-ansible-security-pep8
-      - gate-openstack-ansible-security-ansible-lint
+      - gate-openstack-ansible-security-dsvm-functional-trusty
     gate:
-      - gate-openstack-ansible-security-docs
-      - gate-openstack-ansible-security-pep8
-      - gate-openstack-ansible-security-ansible-lint
+      - gate-openstack-ansible-security-dsvm-functional-trusty
 
   - name: openstack/openstack-ansible-specs
     template: