diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml
index 41f7e0c..57c669f 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml
@@ -1,12 +1,14 @@
 parameters:
   _param:
     apt_mk_version: stable
-    mirror_mirantis_openstack_trusty_cassandra_source: http://apt.mirantis.com/trusty/cassandra/
-    mirror_mirantis_openstack_trusty_cassandra_distribution: ${_param:apt_mk_version}
-    mirror_mirantis_openstack_trusty_cassandra_components: 21x
-    mirror_mirantis_openstack_trusty_cassandra_key_url: "http://apt.mirantis.com/public.gpg"
+    mirror_mirantis_openstack_trusty_cassandra_source: http://mirror.mirantis.com/${_param:apt_mk_version}/cassandra/trusty/
+    mirror_mirantis_openstack_trusty_cassandra_distribution: 21x
+    mirror_mirantis_openstack_trusty_cassandra_components: main
     mirror_mirantis_openstack_trusty_cassandra_gpgkeys:
-      - A76882D3
+      - A278B781FE4B2BDA
+      - F758CE318D77295D
+      - 2B5C1B00
+      - 0353B12C
   aptly:
     server:
       mirror:
@@ -15,9 +17,8 @@
           distribution: ${_param:mirror_mirantis_openstack_trusty_cassandra_distribution}
           components: ${_param:mirror_mirantis_openstack_trusty_cassandra_components}
           architectures: amd64
-          key_url: ${_param:mirror_mirantis_openstack_trusty_cassandra_key_url}
           gpgkeys: ${_param:mirror_mirantis_openstack_trusty_cassandra_gpgkeys}
           publisher:
-            component: ${_param:mirror_mirantis_openstack_trusty_cassandra_components}
+            component: 21x
             distributions:
               - ubuntu-trusty/cassandra/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml
index 197e58c..7e6fa70 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml
@@ -1,12 +1,11 @@
 parameters:
   _param:
     apt_mk_version: stable
-    mirror_mirantis_openstack_trusty_grafana_source: http://apt.mirantis.com/trusty/grafana/
-    mirror_mirantis_openstack_trusty_grafana_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_trusty_grafana_source: http://mirror.mirantis.com/${_param:apt_mk_version}/grafana/trusty/
+    mirror_mirantis_openstack_trusty_grafana_distribution: jessie
     mirror_mirantis_openstack_trusty_grafana_components: main
-    mirror_mirantis_openstack_trusty_grafana_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_trusty_grafana_gpgkeys:
-      - A76882D3
+      - D59097AB
   aptly:
     server:
       mirror:
@@ -15,9 +14,8 @@
           distribution: ${_param:mirror_mirantis_openstack_trusty_grafana_distribution}
           components: ${_param:mirror_mirantis_openstack_trusty_grafana_components}
           architectures: amd64
-          key_url: ${_param:mirror_mirantis_openstack_trusty_grafana_key_url}
           gpgkeys: ${_param:mirror_mirantis_openstack_trusty_grafana_gpgkeys}
           publisher:
-            component: ${_param:mirror_mirantis_openstack_trusty_grafana_components}
+            component: main
             distributions:
               - ubuntu-trusty/grafana/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml
index 19b002a..62972a2 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml
@@ -1,12 +1,11 @@
 parameters:
   _param:
     apt_mk_version: stable
-    mirror_mirantis_openstack_trusty_saltstack_2016_3_source: http://apt.mirantis.com/trusty/salt/2016.3/
-    mirror_mirantis_openstack_trusty_saltstack_2016_3_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_trusty_saltstack_2016_3_source: http://mirror.mirantis.com/${_param:apt_mk_version}/saltstack-2016.3/trusty/
+    mirror_mirantis_openstack_trusty_saltstack_2016_3_distribution: trusty
     mirror_mirantis_openstack_trusty_saltstack_2016_3_components: main
-    mirror_mirantis_openstack_trusty_saltstack_2016_3_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_trusty_saltstack_2016_3_gpgkeys:
-      - A76882D3
+      - DE57BFBE
   aptly:
     server:
       mirror:
@@ -15,9 +14,8 @@
           distribution: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_distribution}
           components: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_components}
           architectures: amd64
-          key_url: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_key_url}
           gpgkeys: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_gpgkeys}
           publisher:
-            component: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_components}
+            component: main
             distributions:
               - ubuntu-trusty/salt/2016.3/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml
index 703d0bf..ad1ffcf 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml
@@ -1,12 +1,11 @@
 parameters:
   _param:
     apt_mk_version: stable
-    mirror_mirantis_openstack_trusty_saltstack_2017_7_source: http://apt.mirantis.com/trusty/salt/2017.7/
-    mirror_mirantis_openstack_trusty_saltstack_2017_7_distribution: ${_param:apt_mk_version}
+    mirror_mirantis_openstack_trusty_saltstack_2017_7_source: http://mirror.mirantis.com/${_param:apt_mk_version}/saltstack-2017.7/trusty/
+    mirror_mirantis_openstack_trusty_saltstack_2017_7_distribution: trusty
     mirror_mirantis_openstack_trusty_saltstack_2017_7_components: main
-    mirror_mirantis_openstack_trusty_saltstack_2017_7_key_url: "http://apt.mirantis.com/public.gpg"
     mirror_mirantis_openstack_trusty_saltstack_2017_7_gpgkeys:
-      - A76882D3
+      - DE57BFBE
   aptly:
     server:
       mirror:
@@ -15,9 +14,8 @@
           distribution: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_distribution}
           components: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_components}
           architectures: amd64
-          key_url: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_key_url}
           gpgkeys: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_gpgkeys}
           publisher:
-            component: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_components}
+            component: main
             distributions:
-              - ubuntu-trusty/salt/2017.7/${_param:apt_mk_version}
\ No newline at end of file
+              - ubuntu-trusty/salt/2017.7/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/aptly.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/aptly.yml
index 72c20cb..2278543 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/aptly.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/aptly.yml
@@ -6,6 +6,7 @@
     mirror_mirantis_openstack_xenial_aptly_components: main
     mirror_mirantis_openstack_xenial_aptly_gpgkeys:
       - 9C7DE460
+      - ED75B5A4483DA07C
   aptly:
     server:
       mirror:
diff --git a/gerrit/client/project/vnf_onboarding.yml b/gerrit/client/project/vnf_onboarding.yml
deleted file mode 100644
index 1e7d238..0000000
--- a/gerrit/client/project/vnf_onboarding.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-parameters:
-  gerrit:
-    client:
-      project:
-        vnf-onboarding/avi-loadbalancer:
-          enabled: true
-          description: AVI VNF
-          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/avi-loadbalancer
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: false
-          merge_content: true
-        vnf-onboarding/metaswitch-vsbc:
-          enabled: true
-          description: Metaswitch vSBC VNF
-          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/metaswitch-vsbc
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: false
-          merge_content: true
-        vnf-onboarding/nfv-platform:
-          enabled: true
-          description: Onboarding platform blueprints and tools
-          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/nfv-platform
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: false
-          merge_content: true
-        vnf-onboarding/nginx-vnf:
-          enabled: true
-          description: NGINX VNF
-          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/nginx-vnf
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: false
-          merge_content: true
-        vnf-onboarding/pipelines:
-          enabled: true
-          description: VNF onboarding pipelines
-          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/pipelines
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: false
-          merge_content: true
-        vnf-onboarding/platform-tests:
-          enabled: true
-          description: VNF onboarding platform tests
-          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/platform-tests
-          access: ${gerrit:client:default_access}
-          require_change_id: true
-          require_agreement: false
-          merge_content: true
diff --git a/gerrit/client/project/vnf_onboarding/avi_loadbalancer.yml b/gerrit/client/project/vnf_onboarding/avi_loadbalancer.yml
new file mode 100644
index 0000000..1bb17b6
--- /dev/null
+++ b/gerrit/client/project/vnf_onboarding/avi_loadbalancer.yml
@@ -0,0 +1,12 @@
+parameters:
+  gerrit:
+    client:
+      project:
+        vnf-onboarding/avi-loadbalancer:
+          enabled: true
+          description: AVI VNF
+          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/avi-loadbalancer
+          access: ${gerrit:client:default_access}
+          require_change_id: true
+          require_agreement: false
+          merge_content: true
\ No newline at end of file
diff --git a/gerrit/client/project/vnf_onboarding/init.yml b/gerrit/client/project/vnf_onboarding/init.yml
new file mode 100644
index 0000000..a1e616e
--- /dev/null
+++ b/gerrit/client/project/vnf_onboarding/init.yml
@@ -0,0 +1,20 @@
+parameters:
+  gerrit:
+    client:
+      project:
+        vnf-onboarding/nfv-platform:
+          enabled: true
+          description: Onboarding platform blueprints and tools
+          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/nfv-platform
+          access: ${gerrit:client:default_access}
+          require_change_id: true
+          require_agreement: false
+          merge_content: true
+        vnf-onboarding/pipelines:
+          enabled: true
+          description: VNF onboarding pipelines
+          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/pipelines
+          access: ${gerrit:client:default_access}
+          require_change_id: true
+          require_agreement: false
+          merge_content: true
diff --git a/gerrit/client/project/vnf_onboarding/metaswitch_vsbc.yml b/gerrit/client/project/vnf_onboarding/metaswitch_vsbc.yml
new file mode 100644
index 0000000..9bbd891
--- /dev/null
+++ b/gerrit/client/project/vnf_onboarding/metaswitch_vsbc.yml
@@ -0,0 +1,20 @@
+parameters:
+  gerrit:
+    client:
+      project:
+        vnf-onboarding/metaswitch-vsbc:
+          enabled: true
+          description: Metaswitch vSBC VNF
+          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/metaswitch-vsbc
+          access: ${gerrit:client:default_access}
+          require_change_id: true
+          require_agreement: false
+          merge_content: true
+        vnf-onboarding/platform-tests:
+          enabled: true
+          description: VNF onboarding platform tests
+          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/platform-tests
+          access: ${gerrit:client:default_access}
+          require_change_id: true
+          require_agreement: false
+          merge_content: true
diff --git a/gerrit/client/project/vnf_onboarding/nginx_vnf.yml b/gerrit/client/project/vnf_onboarding/nginx_vnf.yml
new file mode 100644
index 0000000..3549fe7
--- /dev/null
+++ b/gerrit/client/project/vnf_onboarding/nginx_vnf.yml
@@ -0,0 +1,12 @@
+parameters:
+  gerrit:
+    client:
+      project:
+        vnf-onboarding/nginx-vnf:
+          enabled: true
+          description: NGINX VNF
+          upstream: https://gerrit.mcp.mirantis.net/vnf-onboarding/nginx-vnf
+          access: ${gerrit:client:default_access}
+          require_change_id: true
+          require_agreement: false
+          merge_content: true
\ No newline at end of file
diff --git a/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/avi_loadbalancer.yml b/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/avi_loadbalancer.yml
new file mode 100644
index 0000000..c74bda3
--- /dev/null
+++ b/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/avi_loadbalancer.yml
@@ -0,0 +1,10 @@
+classes:
+  - system.jenkins.client.job.git-mirrors.downstream
+parameters:
+  _param:
+    gerrit_vnf_onboaring_avi_repo: "https://gerrit.mcp.mirantis.net/vnf-onboarding/avi-loadbalancer"
+    jenkins_git_mirror_downstream_jobs:
+      - name: avi-loadbalancer
+        downstream: vnf-onboarding/avi-loadbalancer
+        upstream: ${_param:gerrit_vnf_onboaring_avi_repo}
+        branches: master
\ No newline at end of file
diff --git a/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/init.yml b/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/init.yml
new file mode 100644
index 0000000..83d11c0
--- /dev/null
+++ b/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/init.yml
@@ -0,0 +1,15 @@
+classes:
+  - system.jenkins.client.job.git-mirrors.downstream
+parameters:
+  _param:
+    gerrit_vnf_onboaring_pipelines_repo: "https://gerrit.mcp.mirantis.net/vnf-onboarding/pipelines"
+    gerrit_vnf_onboaring_nfv_platform_repo: "https://gerrit.mcp.mirantis.net/vnf-onboarding/nfv-platform"
+    jenkins_git_mirror_downstream_jobs:
+      - name: vnf-pipelines
+        downstream: vnf-onboarding/pipelines
+        upstream: ${_param:gerrit_vnf_onboaring_pipelines_repo}
+        branches: master
+      - name: nfv-platform
+        downstream: vnf-onboarding/nfv-platform
+        upstream: ${_param:gerrit_vnf_onboaring_nfv_platform_repo}
+        branches: master
\ No newline at end of file
diff --git a/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/metaswitch_vsbc.yml b/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/metaswitch_vsbc.yml
new file mode 100644
index 0000000..0a0c300
--- /dev/null
+++ b/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/metaswitch_vsbc.yml
@@ -0,0 +1,15 @@
+classes:
+  - system.jenkins.client.job.git-mirrors.downstream
+parameters:
+  _param:
+    gerrit_vnf_onboaring_metaswitch_repo: "https://gerrit.mcp.mirantis.net/vnf-onboarding/metaswitch-vsbc"
+    gerrit_vnf_onboaring_platform_tests_repo: "https://gerrit.mcp.mirantis.net/vnf-onboarding/platform-tests"
+    jenkins_git_mirror_downstream_jobs:
+      - name: metaswitch-vsbc
+        downstream: vnf-onboarding/metaswitch-vsbc
+        upstream: ${_param:gerrit_vnf_onboaring_metaswitch_repo}
+        branches: master
+      - name: platform-tests
+        downstream: vnf-onboarding/platform-tests
+        upstream: ${_param:gerrit_vnf_onboaring_platform_tests_repo}
+        branches: master
\ No newline at end of file
diff --git a/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/nginx_vnf.yml b/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/nginx_vnf.yml
new file mode 100644
index 0000000..6aff50c
--- /dev/null
+++ b/jenkins/client/job/git-mirrors/downstream/vnf_onboarding/nginx_vnf.yml
@@ -0,0 +1,10 @@
+classes:
+  - system.jenkins.client.job.git-mirrors.downstream
+parameters:
+  _param:
+    gerrit_vnf_onboaring_nginx_repo: "https://gerrit.mcp.mirantis.net/vnf-onboarding/nginx-vnf"
+    jenkins_git_mirror_downstream_jobs:
+      - name: nginx-vnf
+        downstream: vnf-onboarding/nginx-vnf
+        upstream: ${_param:gerrit_vnf_onboaring_nginx_repo}
+        branches: master
\ No newline at end of file
diff --git a/jenkins/client/job/git-mirrors/downstream/vnf_ondoarding.yml b/jenkins/client/job/git-mirrors/downstream/vnf_ondoarding.yml
deleted file mode 100644
index bb53937..0000000
--- a/jenkins/client/job/git-mirrors/downstream/vnf_ondoarding.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-classes:
-  - system.jenkins.client.job.git-mirrors.downstream
-parameters:
-  _param:
-    gerrit_vnf_onboaring_pipelines_repo: "https://gerrit.mcp.mirantis.net/vnf-onboarding/pipelines"
-    gerrit_vnf_onboaring_nginx_repo: "https://gerrit.mcp.mirantis.net/vnf-onboarding/nginx-vnf"
-    gerrit_vnf_onboaring_avi_repo: "https://gerrit.mcp.mirantis.net/vnf-onboarding/avi-loadbalancer"
-    gerrit_vnf_onboaring_metaswitch_repo: "https://gerrit.mcp.mirantis.net/vnf-onboarding/metaswitch-vsbc"
-    gerrit_vnf_onboaring_platform_tests_repo: "https://gerrit.mcp.mirantis.net/vnf-onboarding/platform-tests"
-    gerrit_vnf_onboaring_nfv_platform_repo: "https://gerrit.mcp.mirantis.net/vnf-onboarding/nfv-platform"
-    jenkins_git_mirror_downstream_jobs:
-      - name: vnf-pipelines
-        downstream: vnf-onboarding/pipelines
-        upstream: ${_param:gerrit_vnf_onboaring_pipelines_repo}
-        branches: master
-      - name: nginx-vnf
-        downstream: vnf-onboarding/nginx-vnf
-        upstream: ${_param:gerrit_vnf_onboaring_nginx_repo}
-        branches: master
-      - name: avi-loadbalancer
-        downstream: vnf-onboarding/avi-loadbalancer
-        upstream: ${_param:gerrit_vnf_onboaring_avi_repo}
-        branches: master
-      - name: metaswitch-vsbc
-        downstream: vnf-onboarding/metaswitch-vsbc
-        upstream: ${_param:gerrit_vnf_onboaring_metaswitch_repo}
-        branches: master
-      - name: platform-tests
-        downstream: vnf-onboarding/platform-tests
-        upstream: ${_param:gerrit_vnf_onboaring_platform_tests_repo}
-        branches: master
-      - name: nfv-platform
-        downstream: vnf-onboarding/nfv-platform
-        upstream: ${_param:gerrit_vnf_onboaring_nfv_platform_repo}
-        branches: master
\ No newline at end of file
diff --git a/jenkins/client/job/oscore/salt_virtual_models.yml b/jenkins/client/job/oscore/salt_virtual_models.yml
index 9f79cf1..4377a7f 100644
--- a/jenkins/client/job/oscore/salt_virtual_models.yml
+++ b/jenkins/client/job/oscore/salt_virtual_models.yml
@@ -101,6 +101,10 @@
               type: boolean
               default: "false"
               description: Enabling of running smoke tests
+            USE_RALLY:
+              type: boolean
+              description: Whether to use container with rally
+              default: "false"
           scm:
             script: test-virtual-model-pipeline.groovy
             type: git
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index cdc2b35..ba44bc0 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -144,6 +144,10 @@
                 type: string
                 default: "salt-qa-credentials"
                 description: Jenkins credential ID for Salt master
+              USE_RALLY:
+                type: boolean
+                description: Whether to use container with rally
+                default: "{{use_rally}}"
         test-openstack-component-periodic:
           name: "{{job_prefix}}-{{milestone}}-{{model}}-{{openstack_version}}-{{formula_pkg_revision}}"
           template:
@@ -287,6 +291,10 @@
                 type: string
                 default: "salt-qa-credentials"
                 description: Jenkins credential ID for Salt master
+              USE_RALLY:
+                type: boolean
+                description: Whether to use container with rally
+                default: "{{use_rally}}"
         test-runner-template:
           name: "{{job_prefix}}-{{test_type}}-runner"
           template:
@@ -793,6 +801,7 @@
                     compare_type: 'REG_EXP'
                     branches:
                       - master
+                      - stable/queens
                       - stable/pike
                       - stable/ocata
                       - stable/newton
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 73d9083..07a8fb4 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -115,6 +115,7 @@
             - name: salt
             - name: sensu
             - name: sentry
+            - name: shibboleth
             - name: sphinx
             - name: spinnaker
             - name: statsd
diff --git a/jenkins/client/job/vnf-onboarding/deploy_cloudify.yml b/jenkins/client/job/vnf-onboarding/deploy_cloudify.yml
new file mode 100644
index 0000000..234178e
--- /dev/null
+++ b/jenkins/client/job/vnf-onboarding/deploy_cloudify.yml
@@ -0,0 +1,63 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        deploy_cloudify:
+          type: workflow-scm
+          name: deploy-cloudify
+          display_name: "Deploy Cloudify"
+          discard:
+            build:
+              keep_num: 20
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/vnf-onboarding/pipelines"
+            credentials: "${_param:vnf_gerrit_credentials}"
+            script: deploy_cloudify.groovy
+          param:
+            OPENSTACK_API_URL:
+              type: string
+              default: "${_param:vnf_openstack_api_url}"
+            OPENSTACK_API_CREDENTIALS:
+              type: string
+              default: "${_param:vnf_openstack_api_admin_credentials}"
+            OPENSTACK_API_TENANT:
+              type: string
+              default: "test-cloudify"
+            NFV_PLATFORM_REPO:
+              type: string
+              description: "Take Cloudify blueprints, Dockerfile and CI scripts from this repo"
+              default: "${_param:jenkins_gerrit_url}/vnf-onboarding/nfv-platform"
+            NFV_PLATFORM_REPO_BRANCH:
+              type: string
+              default: "master"
+            NFV_PLATFORM_REPO_CREDENTIALS:
+              type: string
+              default: "${_param:vnf_gerrit_credentials}"
+            CFM_IMAGE:
+              type: string
+              default: "cloudify-enterprise"
+            CFM_FLAVOR:
+              type: string
+              default: "large"
+            CFM_DISK_SIZE:
+              type: string
+              default: "80"
+            CFM_NET_NAME:
+              type: string
+              default: "cfm-net-shared"
+            SHARE_CFM_NET:
+              type: boolean
+              default: true
+            CFM_SUBNET_CIDR:
+              type: string
+              default: "10.10.1.1/24"
+            CFM_SUBNET_DNS:
+              type: string
+              default: "${_param:dns_server01}"
+            CFM_SSH_KEY_ID:
+              type: string
+              default: "openstack_key"
+            EXTERNAL_NET:
+              type: string
+              default: "public"
\ No newline at end of file
diff --git a/jenkins/client/job/vnf-onboarding/init.yml b/jenkins/client/job/vnf-onboarding/init.yml
index 0e0a847..69b4f4d 100644
--- a/jenkins/client/job/vnf-onboarding/init.yml
+++ b/jenkins/client/job/vnf-onboarding/init.yml
@@ -1,7 +1,5 @@
 classes:
-  - system.jenkins.client.job.vnf-onboarding.test_avi_loadbalancer
-  - system.jenkins.client.job.vnf-onboarding.test_nginx_vnf
-  - system.jenkins.client.job.vnf-onboarding.test_platform
+  - system.jenkins.client.job.vnf-onboarding.deploy_cloudify
 
 parameters:
   _param:
@@ -9,6 +7,8 @@
     vnf_gerrit_credentials: "gerrit"
     vnf_openstack_api_url: "${_param:cluster_public_protocol}://${_param:cluster_public_host}:5000/v2.0"
     vnf_openstack_api_credentials: "test-openstack"
+    vnf_openstack_api_admin_credentials: "admin-openstack"
+    vnf_openstack_ssh_key_credentials: "openstack_key"
     vnf_elastic_url: "${_param:stacklight_log_address}:${_param:cluster_elasticsearch_port}"
     vnf_docker_registry_path: "docker-dev-local.docker.mirantis.net/mirantis/vnf-onboarding"
     vnf_artifactory_url: "https://artifactory.mcp.mirantis.net/artifactory/vnf-onboarding-sandbox"
diff --git a/jenkins/client/job/vnf-onboarding/test_avi_loadbalancer.yml b/jenkins/client/job/vnf-onboarding/test_avi_loadbalancer.yml
index 2bc206b..7caf52c 100644
--- a/jenkins/client/job/vnf-onboarding/test_avi_loadbalancer.yml
+++ b/jenkins/client/job/vnf-onboarding/test_avi_loadbalancer.yml
@@ -79,9 +79,28 @@
             CONTRAIL_API_URL:
               type: string
               default: "${_param:contrail_api_url}"
-            CI_OPTIONS:
+            SETUP_OWN_CLOUDIFY:
+              type: boolean
+              description: "Use temporary private Cloudify instance"
+              default: false
+            CLOUDIFY_MANAGER_IP:
               type: string
-              default: "CFY_AGENT_NET=cfm-net CFY_AGENT_FLAVOR=cfy.agent CFY_AGENT_IMAGE=ubuntu1 CFY_AGENT_USER=cfyuser CFY_SG=cfm-sg CFY_SSH_KEY_ID=openstack_key"
+              description: "IP address of extrenal Cloudify. \"auto\" refers to address of deploy_cloudify job Cloudify instance"
+              default: "auto"
+            CFM_SSH_KEY_ID:
+              type: string
+              description: "Credentials ID of ssh key for connection to Cloudify"
+              default: "${_param:vnf_openstack_ssh_key_credentials}"
+            CFY_AGENT_NET:
+              type: string
+              description: "Network for Cloudify agents that has access to Cloudify Manager"
+              default: "cfm-net-shared"
+            CFY_AGENT_FLAVOR:
+              type: string
+              default: "cfy.agent"
+            CFY_AGENT_IMAGE:
+              type: string
+              default: "ubuntu-xenial"
             VNF_ARTIFACTORY_URL:
               type: string
               default: "${_param:vnf_artifactory_url}"
@@ -110,3 +129,7 @@
             VNF_DOCKER_CLI_PLATFORM:
               type: string
               default: "ubuntu"
+            CLOUDIFY_DEPLOYMENT_TIMEOUT:
+              type: string
+              description: "Set up timeout for cloudify deployment (depends on each VNF specific and network throughput)."
+              default: 1800
diff --git a/jenkins/client/job/vnf-onboarding/test_metaswitch_vsbc.yml b/jenkins/client/job/vnf-onboarding/test_metaswitch_vsbc.yml
new file mode 100644
index 0000000..e27cc1b
--- /dev/null
+++ b/jenkins/client/job/vnf-onboarding/test_metaswitch_vsbc.yml
@@ -0,0 +1,226 @@
+parameters:
+  jenkins:
+    client:
+      plugin:
+        gerrit-trigger: {}
+      job:
+        test_metaswitch_vnf:
+            type: workflow-scm
+            name: test_metaswitch_vnf
+            display_name: "Onboarding tests for Metaswitch vSBC VNF"
+            discard:
+              build:
+                keep_num: 20
+            scm:
+              type: git
+              url: "${_param:jenkins_gerrit_url}/vnf-onboarding/pipelines"
+              credentials:  "${_param:vnf_gerrit_credentials}"
+              script: test_vnf_onboarding.groovy
+            trigger:
+              gerrit:
+                project:
+                  "vnf-onboarding/metaswitch-vsbc":
+                    branches:
+                      - compare_type: "ANT"
+                        name: "**"
+                event:
+                  patchset:
+                    - created:
+                        excludeDrafts: false
+                        excludeTrivialRebase: false
+                        excludeNoCodeChange: false
+                  change:
+                    - merged
+                  comment:
+                    - addedContains:
+                        commentAddedCommentContains: '(retest|recheck|reverify)'
+            param:
+              DEFAULT_GIT_URL:
+                type: string
+                description: "Run against alternate system reclass"
+                default: "${_param:jenkins_gerrit_url}/vnf-onboarding/metaswitch-vsbc"
+              DEFAULT_GIT_REF:
+                type: string
+                default: master
+              OPENSTACK_API_URL:
+                type: string
+                default: ${_param:vnf_openstack_api_url}"
+              OPENSTACK_API_CREDENTIALS:
+                type: string
+                default: "${_param:vnf_openstack_api_credentials}"
+              OPENSTACK_API_TENANT:
+                type: string
+                default: "test"
+              GERRIT_CREDENTIALS:
+                type: string
+                default: "${_param:vnf_gerrit_credentials}"
+              ELASTIC_URL:
+                type: string
+                default: "${_param:vnf_elastic_url}"
+              DEBUG_OPTIONS:
+                type: string
+                default: "skip_inspection=1"
+                description: "Example: skip_all=1 skip_deploy=1 skip_inspection=1"
+              NFV_PLATFORM_REPO:
+                type: string
+                description: "Take Cloudify blueprints, Dockerfile and CI scripts from this repo"
+                default: "ssh://mcp-gerrit@gerrit.mcp.mirantis.net:29418/vnf-onboarding/nfv-platform"
+              NFV_PLATFORM_REPO_BRANCH:
+                type: string
+                default: "master"
+              NFV_PLATFORM_REPO_CREDENTIALS:
+                type: string
+                default: "${_param:vnf_gerrit_credentials}"
+              CONTRAIL_ENABLED:
+                type: boolean
+                default: false
+              CONTRAIL_API_URL:
+                type: string
+                default: "${_param:contrail_api_url}"
+              SETUP_OWN_CLOUDIFY:
+                type: boolean
+                description: "Use temporary private Cloudify instance"
+                default: false
+              CLOUDIFY_MANAGER_IP:
+                type: string
+                description: "IP address of extrenal Cloudify. \"auto\" refers to address of deploy_cloudify job Cloudify instance"
+                default: "auto"
+              CFM_SSH_KEY_ID:
+                type: string
+                description: "Credentials ID of ssh key for connection to Cloudify"
+                default: "${_param:vnf_openstack_ssh_key_credentials}"
+              CFY_AGENT_NET:
+                type: string
+                description: "Network for Cloudify agents that has access to Cloudify Manager"
+                default: "cfm-net-shared"
+              CFY_AGENT_FLAVOR:
+                type: string
+                default: "cfy.agent"
+              CFY_AGENT_IMAGE:
+                type: string
+                default: "ubuntu-xenial"
+              VNF_ARTIFACTORY_URL:
+                type: string
+                default: "${_param:vnf_artifactory_url}"
+              VNF_ARTIFACTORY_PLUGINS_DIR:
+                type: string
+                default: "${_param:vnf_artifactory_url}/cloudify/plugins/"
+              VNF_DOCKER_REGISTRY_PATH:
+                type: string
+                default: "${_param:vnf_docker_registry_path}"
+              VNF_DOCKER_CLI_TAG:
+                type: string
+                default: "latest"
+              VNF_DOCKER_SCRUN_TAG:
+                type: string
+                description: "Not in use for this job"
+                default: "latest"
+              VNF_PLUGINS:
+                type: string
+                description: "Plugins to fetch from artifactory and install during build package step"
+                default: "vnf_onboarding_tools-0.1-py27-none-linux_x86_64_Ubuntu_xenial"
+              VNF_OPTIONS:
+                type: string
+                default: ""
+              VNF_DOCKER_CLI_PLATFORM:
+                type: string
+                default: "ubuntu"
+              CLOUDIFY_DEPLOYMENT_TIMEOUT:
+                type: string
+                description: "Set up timeout for cloudify deployment (depends on each VNF specific and network throughput)."
+                default: 7200
+
+
+        platform_validation_pipeline:
+          type: workflow-scm
+          name: platform_validation_pipeline
+          display_name: "Validate OpenStack platform before deploy of VNF"
+          discard:
+            build:
+              keep_num: 20
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/vnf-onboarding/pipelines"
+            credentials: "${_param:vnf_gerrit_credentials}"
+            script: test_platform.groovy
+          param:
+            OPENSTACK_API_CREDENTIALS:
+              type: string
+              description: "OpenStack admin user credentials for running tests"
+              default: "${_param:vnf_openstack_api_credentials}"
+            OS_PROJECT_NAME:
+              type: string
+              description: "OpenStack project name for running tests"
+              default: "platform-test"
+            OS_AUTH_URL:
+              type: string
+              description: "OpenStack auth url"
+              default: "http://${_param:openstack_control_address}:35357/v3"
+            IMAGE_ID:
+              type: string
+              description: "Specify image id to execute tests against custom images"
+              default: ""
+            FLAVOR_ID:
+              type: string
+              description: "Specify flavor id to execute tests against custom images"
+              default: ""
+            MIN_COMPUTE_NODES:
+              type: string
+              description: "Specify number of compute nodes of environment"
+              default: '2'
+            FIXED_SHARED_NETWORK_NAME:
+              type: string
+              description: "Shared network that will be used in tests."
+              default: "test-shared"
+            COMPUTE_NODE_HOST_NAME:
+              type: string
+              description: "To run CPU pinning/NUMA topology tests against specific node"
+              default: ''
+            COMPUTE_AVAILABILITY_ZONE:
+              type: string
+              description: "To run CPU pinning/NUMA topology tests against specific node"
+              default: 'nova'
+            COMPUTE_NUMA_NODE_COUNT:
+              type: string
+              description: "Number of NUMA node for NUMA topology testing."
+              default: '2'
+            IMAGE_SSH_USER:
+              type: string
+              description: "Specify user name to login in test OpenStack VMs"
+              default: "cirros"
+            VNF_PLATFORM_TESTS_REPO:
+              type: string
+              description: "Repository with testing framework"
+              default: "${_param:jenkins_gerrit_url}vnf-onboarding/platform-tests"
+            VNF_PLATFORM_TESTS_BRANCH:
+              type: string
+              default: "master"
+            VNF_PLATFORM_TESTS_REPO_CREDENTIALS:
+              type: string
+              default: "${_param:vnf_gerrit_credentials}"
+            TEMPEST_IMAGE_DOCKER_REGISTRY_PATH:
+              type: string
+              description: "Path for docker image with testing tool.  If empty, image will be build using VNF_PLATFORM_TESTS_* parameters."
+              default: ${_param:vnf_docker_registry_path}
+            TEMPEST_IMAGE_NAME:
+              type: string
+              description: "Name of docker image with testing tool"
+              default: "platform_tests:latest"
+            ELASTIC_URL:
+              type: string
+              description: "URL to elastic search API"
+              default: "${_param:vnf_elastic_url}"
+            ELASTIC_TRANSFER_REPO:
+              type: string
+              description: "Repository with scripts for transfering test results to elastic search"
+              default: "${_param:jenkins_gerrit_url}/vnf-onboarding/nfv-platform"
+            ELASTIC_TRANSFER_REPO_CREDENTIALS:
+              type: string
+              default: "${_param:vnf_gerrit_credentials}"
+            ELASTIC_TRANSFER_REPO_BRANCH:
+              type: string
+              default: "master"
+            DOCKER_TEMPEST_PARAMS:
+              type: string
+              description: "Pass custom parameters for tempest container"
+              default: ""
diff --git a/jenkins/client/job/vnf-onboarding/test_nginx_vnf.yml b/jenkins/client/job/vnf-onboarding/test_nginx_vnf.yml
index 2dc1a31..f5ca331 100644
--- a/jenkins/client/job/vnf-onboarding/test_nginx_vnf.yml
+++ b/jenkins/client/job/vnf-onboarding/test_nginx_vnf.yml
@@ -80,9 +80,28 @@
             CONTRAIL_API_URL:
               type: string
               default: "${_param:contrail_api_url}"
-            CI_OPTIONS:
+            SETUP_OWN_CLOUDIFY:
+              type: boolean
+              description: "Use temporary private Cloudify instance"
+              default: false
+            CLOUDIFY_MANAGER_IP:
               type: string
-              default: "CFY_AGENT_NET=cfm-net CFY_AGENT_FLAVOR=cfy.agent CFY_AGENT_IMAGE=ubuntu1 CFY_AGENT_USER=cfyuser CFY_SG=cfm-sg CFY_SSH_KEY_ID=openstack_key"
+              description: "IP address of extrenal Cloudify. \"auto\" refers to address of deploy_cloudify job Cloudify instance"
+              default: "auto"
+            CFM_SSH_KEY_ID:
+              type: string
+              description: "Credentials ID of ssh key for connection to Cloudify"
+              default: "${_param:vnf_openstack_ssh_key_credentials}"
+            CFY_AGENT_NET:
+              type: string
+              description: "Network for Cloudify agents that has access to Cloudify Manager"
+              default: "cfm-net-shared"
+            CFY_AGENT_FLAVOR:
+              type: string
+              default: "cfy.agent"
+            CFY_AGENT_IMAGE:
+              type: string
+              default: "ubuntu-xenial"
             VNF_ARTIFACTORY_URL:
               type: string
               default: "${_param:vnf_artifactory_url}"
@@ -108,3 +127,7 @@
             VNF_DOCKER_CLI_PLATFORM:
               type: string
               default: "ubuntu"
+            CLOUDIFY_DEPLOYMENT_TIMEOUT:
+              type: string
+              description: "Set up timeout for cloudify deployment (depends on each VNF specific and network throughput)."
+              default: 900
diff --git a/jenkins/client/job/vnf-onboarding/test_platform.yml b/jenkins/client/job/vnf-onboarding/test_platform.yml
deleted file mode 100644
index 1dd0051..0000000
--- a/jenkins/client/job/vnf-onboarding/test_platform.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-parameters:
-  jenkins:
-    client:
-      plugin:
-        gerrit-trigger: {}
-      job:
-        platform_validation_pipeline:
-          type: workflow-scm
-          name: platform_validation_pipeline
-          display_name: "Validate OpenStack platform before deploy of VNF"
-          discard:
-            build:
-              keep_num: 20
-          scm:
-            type: git
-            url: "${_param:jenkins_gerrit_url}/vnf-onboarding/pipelines"
-            credentials: "${_param:vnf_gerrit_credentials}"
-            script: test_platform.groovy
-          param:
-            OPENSTACK_API_CREDENTIALS:
-              type: string
-              description: "OpenStack admin user credentials for running tests"
-              default: "${_param:vnf_openstack_api_credentials}"
-            OS_PROJECT_NAME:
-              type: string
-              description: "OpenStack project name for running tests"
-              default: "platform-test"
-            OS_AUTH_URL:
-              type: string
-              description: "OpenStack auth url"
-              default: "http://${_param:openstack_control_address}:35357/v3"
-            IMAGE_ID:
-              type: string
-              description: "Specify image id to execute tests against custom images"
-              default: ""
-            FLAVOR_ID:
-              type: string
-              description: "Specify flavor id to execute tests against custom images"
-              default: ""
-            MIN_COMPUTE_NODES:
-              type: string
-              description: "Specify number of compute nodes of environment"
-              default: '2'
-            FIXED_SHARED_NETWORK_NAME:
-              type: string
-              description: "Shared network that will be used in tests."
-              default: "test-shared"
-            COMPUTE_NODE_HOST_NAME:
-              type: string
-              description: "To run CPU pinning/NUMA topology tests against specific node"
-              default: ''
-            COMPUTE_AVAILABILITY_ZONE:
-              type: string
-              description: "To run CPU pinning/NUMA topology tests against specific node"
-              default: 'nova'
-            COMPUTE_NUMA_NODE_COUNT:
-              type: string
-              description: "Number of NUMA node for NUMA topology testing."
-              default: '2'
-            IMAGE_SSH_USER:
-              type: string
-              description: "Specify user name to login in test OpenStack VMs"
-              default: "cirros"
-            VNF_PLATFORM_TESTS_REPO:
-              type: string
-              description: "Repository with testing framework"
-              default: "${_param:jenkins_gerrit_url}vnf-onboarding/platform-tests"
-            VNF_PLATFORM_TESTS_BRANCH:
-              type: string
-              default: "master"
-            VNF_PLATFORM_TESTS_REPO_CREDENTIALS:
-              type: string
-              default: "${_param:vnf_gerrit_credentials}"
-            TEMPEST_IMAGE_DOCKER_REGISTRY_PATH:
-              type: string
-              description: "Path for docker image with testing tool.  If empty, image will be build using VNF_PLATFORM_TESTS_* parameters."
-              default: ${_param:vnf_docker_registry_path}
-            TEMPEST_IMAGE_NAME:
-              type: string
-              description: "Name of docker image with testing tool"
-              default: "platform_tests:latest"
-            ELASTIC_URL:
-              type: string
-              description: "URL to elastic search API"
-              default: "${_param:vnf_elastic_url}"
-            ELASTIC_TRANSFER_REPO:
-              type: string
-              description: "Repository with scripts for transfering test results to elastic search"
-              default: "${_param:jenkins_gerrit_url}/vnf-onboarding/nfv-platform"
-            ELASTIC_TRANSFER_REPO_CREDENTIALS:
-              type: string
-              default: "${_param:vnf_gerrit_credentials}"
-            ELASTIC_TRANSFER_REPO_BRANCH:
-              type: string
-              default: "master"
-            DOCKER_TEMPEST_PARAMS:
-              type: string
-              description: "Pass custom parameters for tempest container"
-              default: ""
diff --git a/linux/system/repo/mcp/apt_mirantis/aptly.yml b/linux/system/repo/mcp/apt_mirantis/aptly.yml
index 5a023a5..f563502 100644
--- a/linux/system/repo/mcp/apt_mirantis/aptly.yml
+++ b/linux/system/repo/mcp/apt_mirantis/aptly.yml
@@ -8,6 +8,6 @@
         mcp_aptly:
           source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_aptly_version}/aptly/${_param:linux_system_codename}/ squeeze main"
           architectures: amd64
-          key_id: 9E3E53F19C7DE460
+          key_id: ED75B5A4483DA07C
           key_server: keys.gnupg.net
           clean_file: true
diff --git a/openssh/server/team/k8s_apps_team.yml b/openssh/server/team/k8s_apps_team.yml
index 1cd8bd9..496ce86 100644
--- a/openssh/server/team/k8s_apps_team.yml
+++ b/openssh/server/team/k8s_apps_team.yml
@@ -18,13 +18,6 @@
           full_name: Michail Zhnichkov
           home: /home/mzhnichkov
           email: mzhnichkov@mirantis.com
-        prazumovsky:
-          enabled: true
-          name: prazumovsky
-          sudo: true
-          full_name: Peter Razumovsky
-          home: /home/prazumovsky
-          email: prazumovsky@mirantis.com
         slukjanov:
           enabled: true
           name: slukjanov
diff --git a/openssh/server/team/members/prazumovsky.yml b/openssh/server/team/members/prazumovsky.yml
new file mode 100644
index 0000000..dc2f1ea
--- /dev/null
+++ b/openssh/server/team/members/prazumovsky.yml
@@ -0,0 +1,20 @@
+parameters:
+  linux:
+    system:
+      user:
+        prazumovsky:
+          enabled: true
+          name: prazumovsky
+          sudo: ${_param:linux_system_user_sudo}
+          full_name: Peter Razumovsky
+          home: /home/prazumovsky
+          email: prazumovsky@mirantis.com
+  openssh:
+    server:
+      enabled: true
+      user:
+        prazumovsky:
+          enabled: true
+          public_keys:
+            - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBySoU/ncTbwN25gxgaubgnB8+xF6mQpiz/tC+MDLitiEw/QHloz6ME5slTJseW2Uvk4jFZz5FNZ9k9/1j+pOtafV8GMHIUOhvX3RUZEiq7wXmcH1T1P4z74Y5anouc82crAWW3d0hQUEAEOx0G3ZGTDmkQTl16mgJvmejvXIN1ESTdEA9tctUogJoSdVu7OGcjGwkqWM9x4CTT7vvD51whHvFswaf6GIWZC3ia1xVTAMJ8W6Xppi5muTW+Uhr4wZm06zZCVHXN+5uYMxwufSoyXc5zwQ+DBPsGENdFvjdNQltlIf9fU3GHuH3d9wAhiPM5CetPcWcj6j2PwwMbx+R prazumovsky@Peters-MacBook-Pro.local
+          user: ${linux:system:user:prazumovsky}
\ No newline at end of file
diff --git a/openssh/server/team/qa_scale.yml b/openssh/server/team/qa_scale.yml
index 9415496..2013d07 100644
--- a/openssh/server/team/qa_scale.yml
+++ b/openssh/server/team/qa_scale.yml
@@ -3,6 +3,7 @@
 - system.openssh.server.team.members.sgalkin
 - system.openssh.server.team.members.obasov
 - system.openssh.server.team.members.mikhailkraynov
+- system.openssh.server.team.members.prazumovsky
 - system.openssh.server.team.members.mcp-scale-jenkins
 
 parameters: