diff --git a/config/zuul/layout.yaml b/config/zuul/layout.yaml
index 65651686..47d28a24 100644
--- a/config/zuul/layout.yaml
+++ b/config/zuul/layout.yaml
@@ -29,7 +29,7 @@ pipelines:
       gerrit:
         - event: comment-added
           comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*(sahara-ci-)?recheck
-  - name: periodic
+  - name: nightly
     description: Jobs in this queue are triggered on a timer.
     manager: IndependentPipelineManager
     source: gerrit
@@ -47,6 +47,24 @@ pipelines:
         to: esikachev@mirantis.com, vgridnev@mirantis.com
         from: zuul@sahara.mirantis.com
         subject: '[sahara-nightly][failed]Silent check of sahara failed'
+  - name: weekly
+    description: Jobs in this queue are triggered on a timer once at week.
+    manager: IndependentPipelineManager
+    source: gerrit
+    precedence: low
+    trigger:
+      timer:
+        - time: '* * * * 6'
+    success:
+      smtp:
+        to: esikachev@mirantis.com, vgridnev@mirantis.com
+        from: zuul@sahara.mirantis.com
+        subject: '[sahara-weekly][passed]Silent check of sahara passed'
+    failure:
+      smtp:
+        to: esikachev@mirantis.com, vgridnev@mirantis.com
+        from: zuul@sahara.mirantis.com
+        subject: '[sahara-weekly][failed]Silent check of sahara failed'
 
 projects:
   - name: openstack/sahara
@@ -86,25 +104,28 @@ projects:
       - gate-sahara_tests-ambari_2.3-c6.6-mitaka
       - gate-sahara_tests-storm.1.0.1-u14-aio
 
-    periodic:
+    nightly:
       - nightly-sahara_tests-vanilla_2.7.1-u14
       - nightly-sahara_tests-spark_1.3.1-u14-aio
       - nightly-sahara_tests-spark_1.6.0-u14-aio
       - nightly-sahara_tests-transient-u14
-      - nightly-sahara_tests-cdh_5.4.0-u12-aio
-      - nightly-sahara_tests-cdh_5.4.0-c6.6-aio
       - nightly-sahara_tests-cdh_5.5.0-u14-aio
       - nightly-sahara_tests-cdh_5.5.0-c6.6-aio
       - nightly-sahara_tests-ambari_2.3-c6.6
       - nightly-sahara_tests-ambari_2.4-c6.6
       - nightly-sahara_tests-cdh_5.5.0-u14-mitaka
       - nightly-sahara_tests-cdh_5.5.0-c6.6-mitaka
-      - nightly-sahara_tests-spark_1.3.1-u14-mitaka
       - nightly-sahara_tests-spark_1.6.0-u14-mitaka
       - nightly-sahara_tests-vanilla_2.7.1-u14-mitaka
       - nightly-sahara_tests-ambari_2.3-c6.6-mitaka
       - nightly-sahara_tests-storm_1.0.1-u14-aio
 
+    weekly:
+      - weekly-sahara_tests-cdh_5.4.0-u12-liberty
+      - weekly-sahara_tests-cdh_5.4.0-c6.6-liberty
+      - weekly-sahara_tests-spark_1.3.1-u14-liberty
+      - weekly-sahara_tests-vanilla_2.7.1-u14-liberty
+
   - name: openstack/python-saharaclient
     check:
       - gate-saharaclient-fake
@@ -175,7 +196,7 @@ jobs:
       - ^sahara_tests/.*.py$
       - ^diskimage-create/.*$
       - ^elements/.*$
-  - name: ^(?!nightly).*-cdh_5.4.0-.*$
+  - name: ^(?!nightly|weekly).*-cdh_5.4.0-.*$
     branch: stable/liberty
     files:
       - ^sahara_tests/scenario/defaults/liberty/cdh-5.4.*$
@@ -183,7 +204,7 @@ jobs:
       - ^sahara_tests/.*.py$
       - ^diskimage-create/.*$
       - ^elements/.*$
-  - name: ^(?!nightly).*-spark_1.3.1-.*$
+  - name: ^(?!nightly|weekly).*-spark_1.3.1-.*$
     branch: ^(master|stable/liberty|stable/mitaka)$
     files:
       - ^sahara_tests/scenario/defaults/spark-1.3.1.*$
@@ -211,7 +232,7 @@ jobs:
       - ^sahara_tests/.*.py$
       - ^diskimage-create/.*$
       - ^elements/.*$
-  - name: ^(?!nightly).*-vanilla_2.7.1-.*$
+  - name: ^(?!nightly|weekly).*-vanilla_2.7.1-.*$
     branch: ^(master|stable/liberty|stable/mitaka)$
     files:
       - ^sahara_tests/scenario/defaults/vanilla-2.7.1.*$
@@ -271,5 +292,5 @@ jobs:
       - ^sahara_tests/.*.py$
       - ^diskimage-create/.*$
       - ^elements/.*$
-  - name: ^(?!nightly).*-sahara_tests-.*$
+  - name: ^(?!nightly|weekly).*-sahara_tests-.*$
     branch: ^(master|stable/liberty|stable/mitaka)$
diff --git a/jenkins_job_builder/sahara.yaml b/jenkins_job_builder/sahara.yaml
index 07f602c5..2685f365 100644
--- a/jenkins_job_builder/sahara.yaml
+++ b/jenkins_job_builder/sahara.yaml
@@ -119,17 +119,12 @@
             - ambari_2.4
           os: c6.6
      - 'tempest-{name}-tests'
-     - '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
-          plugin:
-            - cdh_5.4.0
-          release: liberty
      - '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
           plugin:
             - vanilla_2.7.1
             - spark_1.3.1
           os: u14
           release:
-            - liberty
             - mitaka
      - '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
           plugin:
@@ -150,7 +145,7 @@
           release: mitaka
 
 - project:
-    name: sahara-nightly
+    name: sahara-periodic
     pipeline:
       - nightly
     project_name:
@@ -189,14 +184,14 @@
           plugin:
             - cdh_5.4.0
           release: liberty
+          pipeline: weekly
      - '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
           plugin:
             - vanilla_2.7.1
             - spark_1.3.1
           os: u14
-          release:
-            - liberty
-            - mitaka
+          release: liberty
+          pipeline: weekly
      - '{pipeline}-sahara_tests-{plugin}-{os}-{release}':
           plugin:
             - cdh_5.5.0