diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index d4ec5da..cfd93f7 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -3,6 +3,7 @@
 parameters:
   ceilometer:
     agent:
+      region: ${_param:openstack_region}
       enabled: true
       version: ${_param:ceilometer_version}
       secret: ${_param:ceilometer_secret_key}
diff --git a/jenkins/client/job/aptly.yml b/jenkins/client/job/aptly.yml
index b6398ce..c428b84 100644
--- a/jenkins/client/job/aptly.yml
+++ b/jenkins/client/job/aptly.yml
@@ -1,6 +1,3 @@
-classes:
-  - system.jenkins.client.job.common
-
 parameters:
   jenkins:
     client:
diff --git a/jenkins/client/job/common.yml b/jenkins/client/job/common.yml
deleted file mode 100644
index c92d623..0000000
--- a/jenkins/client/job/common.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-parameters:
-  _param:
-    jenkins_gerrit_url: "ssh://jenkins-mk@gerrit.mcp.mirantis.net:29418"
-    jenkins_pipeline_libs: "${_param:jenkins_gerrit_url}/tcp/ccp-pipeline-libs"
-    jenkins_packer_pipeline: "${_param:jenkins_gerrit_url}/mk/packer-templates"
-    jenkins_contrail_pipeline: "${_param:jenkins_gerrit_url}/contrail/contrail-pipeline"
-    jenkins_aptly_api_url: "http://10.10.100.85:8081"
-    jenkins_aptly_url: "http://apt-mk.mirantis.com"
-    jenkins_pollscm_spec: "H/60 * * * *"
diff --git a/jenkins/client/job/debian/packages/extra.yml b/jenkins/client/job/debian/packages/extra.yml
index 137d4ea..941c9b4 100644
--- a/jenkins/client/job/debian/packages/extra.yml
+++ b/jenkins/client/job/debian/packages/extra.yml
@@ -1,5 +1,3 @@
-classes:
-  - system.jenkins.client.job.common
 parameters:
   jenkins:
     client:
diff --git a/jenkins/client/job/debian/packages/horizon/modules.yml b/jenkins/client/job/debian/packages/horizon/modules.yml
index 86a5990..f63032c 100644
--- a/jenkins/client/job/debian/packages/horizon/modules.yml
+++ b/jenkins/client/job/debian/packages/horizon/modules.yml
@@ -1,5 +1,3 @@
-classes:
-  - system.jenkins.client.job.common
 parameters:
   jenkins:
     client:
diff --git a/jenkins/client/job/debian/packages/horizon/themes.yml b/jenkins/client/job/debian/packages/horizon/themes.yml
index b94518c..a8f8ac2 100644
--- a/jenkins/client/job/debian/packages/horizon/themes.yml
+++ b/jenkins/client/job/debian/packages/horizon/themes.yml
@@ -1,5 +1,3 @@
-classes:
-  - system.jenkins.client.job.common
 parameters:
   jenkins:
     client:
diff --git a/jenkins/client/job/debian/packages/salt-multi.yml b/jenkins/client/job/debian/packages/salt-multi.yml
index f8e8991..f703e7b 100644
--- a/jenkins/client/job/debian/packages/salt-multi.yml
+++ b/jenkins/client/job/debian/packages/salt-multi.yml
@@ -1,5 +1,3 @@
-classes:
-  - system.jenkins.client.job.common
 parameters:
   jenkins:
     client:
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index f848660..7dd70ea 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -1,5 +1,3 @@
-classes:
-  - system.jenkins.client.job.common
 parameters:
   jenkins:
     client:
diff --git a/jenkins/client/job/git-mirrors/upstream.yml b/jenkins/client/job/git-mirrors/upstream.yml
index 939eb20..f4f7f50 100644
--- a/jenkins/client/job/git-mirrors/upstream.yml
+++ b/jenkins/client/job/git-mirrors/upstream.yml
@@ -1,5 +1,3 @@
-classes:
-  - system.jenkins.client.job.common
 parameters:
   jenkins:
     client:
diff --git a/jenkins/client/job/image/centos.yml b/jenkins/client/job/image/centos.yml
index e4b9b72..852f695 100644
--- a/jenkins/client/job/image/centos.yml
+++ b/jenkins/client/job/image/centos.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    jenkins_packer_pipeline: "${_param:jenkins_gerrit_url}/mk/packer-templates"
   jenkins:
     client:
       job:
@@ -67,4 +69,4 @@
               default: "true"
             OPENSTACK_API_CLIENT:
               type: string
-              default: "liberty"
\ No newline at end of file
+              default: "liberty"
diff --git a/jenkins/client/job/image/debian.yml b/jenkins/client/job/image/debian.yml
index 317c5df..7c996f3 100644
--- a/jenkins/client/job/image/debian.yml
+++ b/jenkins/client/job/image/debian.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    jenkins_packer_pipeline: "${_param:jenkins_gerrit_url}/mk/packer-templates"
   jenkins:
     client:
       job:
diff --git a/jenkins/client/job/image/ubuntu.yml b/jenkins/client/job/image/ubuntu.yml
index e49bda0..504702c 100755
--- a/jenkins/client/job/image/ubuntu.yml
+++ b/jenkins/client/job/image/ubuntu.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    jenkins_packer_pipeline: "${_param:jenkins_gerrit_url}/mk/packer-templates"
   jenkins:
     client:
       job:
diff --git a/jenkins/client/job/opencontrail/build/dpdk-extra.yml b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
index d4960a4..0ac7b50 100644
--- a/jenkins/client/job/opencontrail/build/dpdk-extra.yml
+++ b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
@@ -1,5 +1,3 @@
-classes:
-  - system.jenkins.client.job.common
 parameters:
   jenkins:
     client:
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index a550d3f..69cb4e7 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -1,6 +1,6 @@
-classes:
-  - system.jenkins.client.job.common
 parameters:
+  _param:
+    jenkins_contrail_pipeline: "${_param:jenkins_gerrit_url}/contrail/contrail-pipeline"
   jenkins:
     client:
       job_template:
@@ -29,7 +29,7 @@
               os: ubuntu
               dist: trusty
               branch: R3.1.1.x
-              ppa: irantis/mopencontrail-3.1.1
+              ppa: mirantis/opencontrail-3.1.1
               upload_source_package: true
             - buildname: oc311
               os: ubuntu
diff --git a/jenkins/client/job/opencontrail/git-mirrors/2way.yml b/jenkins/client/job/opencontrail/git-mirrors/2way.yml
index 989ef68..0ecb83f 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/2way.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/2way.yml
@@ -1,6 +1,6 @@
-classes:
-  - system.jenkins.client.job.common
 parameters:
+  _param:
+    jenkins_pollscm_spec: "H/60 * * * *"
   jenkins:
     client:
       job:
diff --git a/jenkins/client/job/opencontrail/git-mirrors/downstream.yml b/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
index 1cdb7e8..0cf3a33 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
@@ -1,6 +1,6 @@
-classes:
-  - system.jenkins.client.job.common
 parameters:
+  _param:
+    jenkins_pollscm_spec: "H/60 * * * *"
   jenkins:
     client:
       job_template:
diff --git a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
index 303b035..ece2182 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
@@ -1,6 +1,7 @@
-classes:
-  - system.jenkins.client.job.common
 parameters:
+  _param:
+    jenkins_pollscm_spec: "H/60 * * * *"
+    jenkins_contrail_pipeline: "${_param:jenkins_gerrit_url}/contrail/contrail-pipeline"
   jenkins:
     client:
       job_template:
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 9b7bb78..0ea3d7b 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    jenkins_pollscm_spec: "H/60 * * * *"
   jenkins:
     client:
       job_template:
diff --git a/jenkins/client/job/salt-models/git-mirrors.yml b/jenkins/client/job/salt-models/git-mirrors.yml
index 2ff917b..7ee7b94 100644
--- a/jenkins/client/job/salt-models/git-mirrors.yml
+++ b/jenkins/client/job/salt-models/git-mirrors.yml
@@ -1,6 +1,6 @@
-classes:
-  - system.jenkins.client.job.common
 parameters:
+  _param:
+    jenkins_pollscm_spec: "H/60 * * * *"
   jenkins:
     client:
       job_template: