diff --git a/playbooks/tripleo/pre.yaml b/playbooks/tripleo/pre.yaml
index b7a1fc66a..c80d70b24 100644
--- a/playbooks/tripleo/pre.yaml
+++ b/playbooks/tripleo/pre.yaml
@@ -6,7 +6,7 @@
     - tobiko-configure
 
     - name: "import tripleo-ci common role"
-      role: common
+      role: ci-common-vars
 
     - name: "install tripleo"
       role: run-test
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 51b7adf29..aed146606 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -22,21 +22,10 @@
       - publish-to-pypi
       - tobiko-docker
       - tobiko-infrared
+      - tobiko-tripleo
     vars:
         rtd_webhook_id: '84947'
     periodic:
       jobs:
         - requirements-check:
             voting: true
-        - tripleo-ci-centos-8-content-provider
-        - tobiko-tripleo-functional:
-            vars: &consumer_vars
-              consumer_job: true
-              build_container_images: false
-              remove_tags:
-                - build
-            dependencies: &deps_cprovider
-              - tripleo-ci-centos-8-content-provider
-        - tobiko-tripleo-faults:
-            vars: *consumer_vars
-            dependencies: *deps_cprovider
diff --git a/zuul.d/tripleo.yaml b/zuul.d/tripleo.yaml
index cf4446d96..302c4e826 100644
--- a/zuul.d/tripleo.yaml
+++ b/zuul.d/tripleo.yaml
@@ -1,3 +1,18 @@
+---
+
+- project-template:
+    name: tobiko-tripleo
+    description: |
+      TripleO jobs intended to gate Tobiko changes
+    periodic:
+      jobs: &PERIODIC_JOBS
+        - tripleo-ci-centos-8-content-provider
+        - tobiko-tripleo-functional
+        - tobiko-tripleo-faults
+    experimental:
+      jobs: *PERIODIC_JOBS
+
+
 - job:
     name: tobiko-tripleo
     abstract: true
@@ -9,7 +24,12 @@
     pre-run: playbooks/tripleo/pre.yaml
     run: playbooks/tripleo/run.yaml
     post-run: playbooks/tripleo/post.yaml
+    dependencies: tripleo-ci-centos-8-content-provider
     vars:
+      consumer_job: true
+      build_container_images: false
+      remove_tags:
+        - build
       test_conf:
         keystone:
           cloud_name: standalone