diff --git a/config/zuul/layout.yaml b/config/zuul/layout.yaml
index a4d79d73..a34b6fa7 100644
--- a/config/zuul/layout.yaml
+++ b/config/zuul/layout.yaml
@@ -105,7 +105,6 @@ projects:
 
     nightly:
       - nightly-sahara_tests-vanilla_2.7.1-u14
-      - nightly-sahara_tests-spark_1.3.1-u14
       - nightly-sahara_tests-spark_1.6.0-u14
       - nightly-sahara_tests-cdh_5.5.0-u14
       - nightly-sahara_tests-cdh_5.5.0-c7
@@ -172,6 +171,8 @@ jobs:
       - ^sahara_tests/scenario/defaults/edp-examples/.*$
       - ^sahara/.*$
       - ^sahara_tests/.*.py$
+      - ^diskimage-create/.*$
+      - ^elements/.*$
   - name: ^(?!nightly).*-mapr_5.2.*$
     skip-if:
       - branch: ^(stable/liberty|stable/mitaka)$
@@ -181,6 +182,8 @@ jobs:
       - ^sahara_tests/scenario/defaults/edp-examples/.*$
       - ^sahara/.*$
       - ^sahara_tests/.*.py$
+      - ^diskimage-create/.*$
+      - ^elements/.*$
   - name: ^(?!nightly).*-spark_1.6.0-.*$
     skip-if:
       - branch: stable/liberty
@@ -191,6 +194,8 @@ jobs:
       - ^sahara_tests/scenario/defaults/edp-examples/.*$
       - ^sahara/.*$
       - ^sahara_tests/.*.py$
+      - ^diskimage-create/.*$
+      - ^elements/.*$
   - name: ^(?!nightly).*-cdh_5.5.0-.*$
     skip-if:
       - branch: ^(stable/liberty|stable/newton|master)$
@@ -201,6 +206,8 @@ jobs:
       - ^sahara_tests/scenario/defaults/edp-examples/.*$
       - ^sahara/.*$
       - ^sahara_tests/.*.py$
+      - ^diskimage-create/.*$
+      - ^elements/.*$
   - name: ^(?!nightly).*-cdh_5.7.0-.*$
     skip-if:
       - branch: ^(stable/liberty|stable/mitaka)$
@@ -210,6 +217,8 @@ jobs:
       - ^sahara_tests/scenario/defaults/edp-examples/.*$
       - ^sahara/.*$
       - ^sahara_tests/.*.py$
+      - ^diskimage-create/.*$
+      - ^elements/.*$
   - name: ^(?!nightly|weekly).*-vanilla_2.7.1-.*$
     skip-if:
        - branch: stable/liberty
@@ -221,6 +230,8 @@ jobs:
       - ^sahara_tests/scenario/defaults/edp-examples/.*$
       - ^sahara/.*$
       - ^sahara_tests/.*.py$
+      - ^diskimage-create/.*$
+      - ^elements/.*$
   - name: ^(?!nightly).*-ambari_2.3-.*$
     skip-if:
       - branch: ^(stable/liberty|stable/newton|master)$
@@ -232,6 +243,8 @@ jobs:
       - ^sahara_tests/scenario/defaults/edp-examples/.*$
       - ^sahara/.*$
       - ^sahara_tests/.*.py$
+      - ^diskimage-create/.*$
+      - ^elements/.*$
   - name: ^(?!nightly).*-ambari_2.4-.*$
     skip-if:
       - branch: ^(stable/liberty|stable/mitaka)$
@@ -242,6 +255,8 @@ jobs:
       - ^sahara_tests/scenario/defaults/edp-examples/.*$
       - ^sahara/.*$
       - ^sahara_tests/.*.py$
+      - ^diskimage-create/.*$
+      - ^elements/.*$
   - name: ^(?!nightly).*-storm_1.0.1-.*$
     skip-if:
       - branch: ^(stable/liberty|stable/mitaka)$
@@ -251,34 +266,8 @@ jobs:
       - ^sahara_tests/scenario/defaults/edp-examples/.*$
       - ^sahara/.*$
       - ^sahara_tests/.*.py$
-  - name: dib-vanilla_2.7.1-c7
-    skip-if:
-      - branch: stable/liberty
-    voting: false
-  - name: dib-cdh_5.5.0-c7-aio
-    skip-if:
-      - branch: ^(stable/liberty|stable/mitaka)$
-    voting: false
-  - name: ^(?!nightly).*-cdh_5.7.0-c7-aio$
-    files:
-      - ^sahara_tests/scenario/defaults/cdh-5.7.0.*$
-      - ^sahara_tests/scenario/defaults/edp.yaml.mako$
-      - ^sahara_tests/scenario/defaults/edp-examples/.*$
-      - ^sahara/.*$
-      - ^sahara_tests/.*.py$
-    skip-if:
-      - branch: ^(stable/liberty|stable/mitaka)$
-    voting: false
+      - ^diskimage-create/.*$
+      - ^elements/.*$
   - name: gate-sahara-pep8-trunk
     voting: false
-  - name: ^(?!nightly).*-ambari_2.1-.*$
-    skip-if:
-      - branch: stable/liberty
-    files:
-      - ^sahara_tests/scenario/defaults/ambari-2.1.*$
-      - ^sahara_tests/scenario/defaults/mitaka/ambari-2.1.*$
-      - ^sahara_tests/scenario/defaults/edp.yaml.mako$
-      - ^sahara_tests/scenario/defaults/edp-examples/.*$
-      - ^sahara/.*$
-      - ^sahara_tests/.*.py$
   - name: ^(?!nightly|weekly).*-sahara_tests-.*$