diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 64eaf1a7e5..67f87a4472 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1713,8 +1713,18 @@
     jobs:
       - python-jobs
       - pypi-jobs
-      - 'check-sahara-buildimages-{plugin}':
+      - 'gate-sahara-buildimages-{plugin}':
           plugin: vanilla
+      - 'gate-sahara-buildimages-{plugin}':
+          plugin: hdp
+      - 'gate-sahara-buildimages-{plugin}':
+          plugin: cloudera
+      - 'gate-sahara-buildimages-{plugin}':
+          plugin: spark
+      - 'gate-sahara-buildimages-{plugin}':
+          plugin: storm
+      - 'gate-sahara-buildimages-{plugin}':
+          plugin: mapr
 
 - project:
     name: swift-bench
diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml
index 6be2db82c2..b2480ab0b3 100644
--- a/jenkins/jobs/sahara.yaml
+++ b/jenkins/jobs/sahara.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'check-sahara-buildimages-{plugin}'
+    name: 'gate-sahara-buildimages-{plugin}'
     node: bare-trusty
 
     wrappers:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3ecb6719cf..a853c6127c 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -804,7 +804,7 @@ jobs:
     voting: false
   - name: gate-sahara-tox-py27-scenario-unit
     voting: false
-  - name: check-sahara-buildimages-vanilla
+  - name: ^gate-sahara-buildimages.*$
     branch: ^master$
     voting: false
   - name: gate-kite-python34
@@ -3129,7 +3129,12 @@ projects:
       - name: publish-to-pypi
     check:
       - gate-sahara-image-elements-pep8
-      - check-sahara-buildimages-vanilla
+      - gate-sahara-buildimages-vanilla
+      - gate-sahara-buildimages-hdp
+      - gate-sahara-buildimages-cloudera
+      - gate-sahara-buildimages-spark
+      - gate-sahara-buildimages-storm
+      - gate-sahara-buildimages-mapr
     gate:
       - gate-sahara-image-elements-pep8
     post: