diff --git a/config/zuul/layout.yaml b/config/zuul/layout.yaml
index e9153294..bd4a4287 100644
--- a/config/zuul/layout.yaml
+++ b/config/zuul/layout.yaml
@@ -145,7 +145,7 @@ projects:
       - dib-storm_1.0.1-u14-aio
       - dib-ambari_2.2-c7
       - dib-ambari_2.2-u14
- 
+
   - name: openstack/sahara-ci-config
     check:
       - sahara-ci-syntax-check
diff --git a/jenkins_job_builder/sahara.yaml b/jenkins_job_builder/sahara.yaml
index 82a2f8da..1646f2df 100644
--- a/jenkins_job_builder/sahara.yaml
+++ b/jenkins_job_builder/sahara.yaml
@@ -50,13 +50,20 @@
     project_name:
       - sahara
       - sahara_tests
-    plugin:
-      - cdh_5.4.0
     os:
       - c7
       - u14
     jobs:
-     - '{pipeline}-{project_name}-{plugin}-{os}-aio'
+     - '{pipeline}-{project_name}-{plugin}-{os}':
+          plugin:
+             - ambari_2.3
+          os:
+             - c7
+     - '{pipeline}-{project_name}-{plugin}-{os}-aio':
+          plugin:
+             - cdh_5.4.0
+          os:
+             - c6.6
      - '{pipeline}-{project_name}-{plugin}-{os}':
           plugin:
              - vanilla_2.7.1