diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 685a696..2364a70 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -29,24 +29,9 @@
       tox_env: ssl
 
 - job:
-    name: openstack-ansible-ssl-galera_server-opensuse-423
+    name: openstack-ansible-ssl-galera_server-opensuse-15
     parent: openstack-ansible-galera_server
-    nodeset: opensuse-423
+    nodeset: opensuse-150
     voting: false
     vars:
       tox_env: ssl
-
-- job:
-    name: openstack-ansible-functional-galera_server-ubuntu-xenial
-    parent: openstack-ansible-galera_server
-    voting: false
-    vars:
-      tox_env: functional
-
-- job:
-    name: openstack-ansible-functional-galera_server-opensuse-423
-    parent: openstack-ansible-galera_server
-    nodeset: opensuse-423
-    voting: false
-    vars:
-      tox_env: functional
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 50ee88e..5d04a4e 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -15,13 +15,13 @@
 
 - project:
     templates:
-      - openstack-ansible-role-jobs
       - check-requirements
+      - openstack-ansible-deploy-aio_metal-jobs
+      - openstack-ansible-deploy-aio_distro_metal-jobs
+      - openstack-ansible-linters
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:
       jobs:
-        - openstack-ansible-ssl-galera_server-opensuse-423
+        - openstack-ansible-ssl-galera_server-opensuse-15
         - openstack-ansible-ssl-galera_server-ubuntu-xenial
-        - openstack-ansible-functional-galera_server-opensuse-423
-        - openstack-ansible-functional-galera_server-ubuntu-xenial