diff --git a/aptly/server/docker.yml b/aptly/server/docker.yml
index 6038976..ee8f4a2 100644
--- a/aptly/server/docker.yml
+++ b/aptly/server/docker.yml
@@ -2,7 +2,10 @@
   - service.aptly.server.single
 parameters:
   _param:
-    aptly_server_secure: true
+    aptly_server_secure: false
+    aptly_gpg_keypair_id: none
+    aptly_gpg_public_key: none
+    aptly_gpg_private_key: none
   aptly:
     server:
       enabled: true
diff --git a/docker/swarm/service/aptly.yml b/docker/swarm/service/aptly.yml
index d85b1b4..5f6de6e 100644
--- a/docker/swarm/service/aptly.yml
+++ b/docker/swarm/service/aptly.yml
@@ -1,4 +1,8 @@
 parameters:
+  _param:
+    docker_image_aptly:
+      api: tcpcloud/aptly-api
+      public: tcpcloud/aptly-public
   docker:
     client:
       service:
diff --git a/docker/swarm/service/docker.yml b/docker/swarm/service/docker.yml
index a79fc08..d20b4db 100644
--- a/docker/swarm/service/docker.yml
+++ b/docker/swarm/service/docker.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    docker_image_registry: registry:2
   docker:
     client:
       service:
diff --git a/docker/swarm/service/gerrit.yml b/docker/swarm/service/gerrit.yml
index d1bdfae..d33bdbb 100644
--- a/docker/swarm/service/gerrit.yml
+++ b/docker/swarm/service/gerrit.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    docker_image_gerrit: tcpcloud/gerrit:2.12.7
   docker:
     client:
       service:
diff --git a/docker/swarm/service/jenkins.yml b/docker/swarm/service/jenkins.yml
index c0b0721..3069dc6 100644
--- a/docker/swarm/service/jenkins.yml
+++ b/docker/swarm/service/jenkins.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    docker_image_jenkins: tcpcloud/jenkins:2.50
   docker:
     client:
       service:
diff --git a/docker/swarm/service/mysql.yml b/docker/swarm/service/mysql.yml
index 53faa8b..f94cf4d 100644
--- a/docker/swarm/service/mysql.yml
+++ b/docker/swarm/service/mysql.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    docker_image_mysql: mysql:5.6
   docker:
     client:
       service:
@@ -10,7 +12,7 @@
             MYSQL_ROOT_PASSWORD: ${_param:mysql_admin_password}
           restart:
             condition: any
-          image: "mysql:5.6"
+          image: "${_param:docker_image_mysql}"
           ports:
             - 13306:3306
           volume:
diff --git a/docker/swarm/service/openldap.yml b/docker/swarm/service/openldap.yml
index d009ed5..e390772 100644
--- a/docker/swarm/service/openldap.yml
+++ b/docker/swarm/service/openldap.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    docker_image_openldap: osixia/openldap:1.1.7
   docker:
     client:
       service:
@@ -7,7 +9,7 @@
           # https://github.com/docker/docker/issues/24877
           restart:
             condition: any
-          image: osixia/openldap:1.1.7
+          image: ${_param:docker_image_openldap}
           environment:
             HOSTNAME: ldap01.${_param:cluster_public_host}
             LDAP_ORGANISATION: "${_param:openldap_organisation}"
diff --git a/docker/swarm/service/visualizer.yml b/docker/swarm/service/visualizer.yml
index fe52c0b..8519363 100644
--- a/docker/swarm/service/visualizer.yml
+++ b/docker/swarm/service/visualizer.yml
@@ -1,11 +1,13 @@
 parameters:
+  _param:
+    docker_image_visualizer: manomarks/visualizer
   docker:
     client:
       service:
         visualizer:
           restart:
             condition: any
-          image: manomarks/visualizer
+          image: ${_param:docker_image_visualizer}
           constraint: "node.role==manager"
           ports:
             - 18090:8080
diff --git a/jenkins/client/job/opencontrail/build/init.yml b/jenkins/client/job/opencontrail/build/init.yml
index 759d78a..b4853b6 100644
--- a/jenkins/client/job/opencontrail/build/init.yml
+++ b/jenkins/client/job/opencontrail/build/init.yml
@@ -1,3 +1,4 @@
 classes:
   - system.jenkins.client.job.opencontrail.build.generic
+  - system.jenkins.client.job.opencontrail.build.test
   - system.jenkins.client.job.opencontrail.build.dpdk-extra
diff --git a/jenkins/client/job/opencontrail/build/test.yml b/jenkins/client/job/opencontrail/build/test.yml
index 1182746..7b39b97 100644
--- a/jenkins/client/job/opencontrail/build/test.yml
+++ b/jenkins/client/job/opencontrail/build/test.yml
@@ -11,7 +11,7 @@
               branch: R3.1
             - buildname: oc31
               os: ubuntu
-              dist: trusty
+              dist: xenial
               branch: R3.1
             - buildname: oc311
               os: ubuntu
@@ -19,7 +19,7 @@
               branch: R3.1.1.x
             - buildname: oc311
               os: ubuntu
-              dist: trusty
+              dist: xenial
               branch: R3.1.1.x
             - buildname: oc32
               os: ubuntu
@@ -27,7 +27,7 @@
               branch: R3.2
             - buildname: oc32
               os: ubuntu
-              dist: trusty
+              dist: xenial
               branch: R3.2
           template:
             discard:
diff --git a/linux/system/repo/glusterfs.yml b/linux/system/repo/glusterfs.yml
new file mode 100644
index 0000000..da4cddf
--- /dev/null
+++ b/linux/system/repo/glusterfs.yml
@@ -0,0 +1,9 @@
+parameters:
+  linux:
+    system:
+      repo:
+        glusterfs-ppa:
+          source: "deb http://ppa.launchpad.net/gluster/glusterfs-3.7/ubuntu trusty main"
+          architectures: amd64
+          key_id: 3FE869A9
+          key_server: keyserver.ubuntu.com
\ No newline at end of file
diff --git a/linux/system/repo/mcp/contrail.yml b/linux/system/repo/mcp/contrail.yml
new file mode 100644
index 0000000..9f65ee3
--- /dev/null
+++ b/linux/system/repo/mcp/contrail.yml
@@ -0,0 +1,11 @@
+parameters:
+  _param:
+    linux_repo_contrail_component: oc311
+    apt_mk_version: stable
+  linux:
+    system:
+      repo:
+        mcp_opencontrail:
+          source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:apt_mk_version} ${_param:openstack_version} ${_param:linux_repo_contrail_component} extra"
+          architectures: amd64
+          key_url: "http://apt-mk.mirantis.com/public.gpg"
diff --git a/linux/system/repo/mcp/extra.yml b/linux/system/repo/mcp/extra.yml
new file mode 100644
index 0000000..0bd9f13
--- /dev/null
+++ b/linux/system/repo/mcp/extra.yml
@@ -0,0 +1,10 @@
+parameters:
+  _param:
+    apt_mk_version: stable
+  linux:
+    system:
+      repo:
+        mcp_extra:
+          source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:apt_mk_version} extra"
+          architectures: amd64
+          key_url: "http://apt-mk.mirantis.com/public.gpg"
diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml
new file mode 100644
index 0000000..372caf0
--- /dev/null
+++ b/linux/system/repo/mcp/openstack.yml
@@ -0,0 +1,26 @@
+parameters:
+  _param:
+    mcp_repo_version: 1.0
+  linux:
+    system:
+      repo:
+        mirantis_openstack:
+          source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version} main"
+          architectures: amd64
+          key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+        mirantis_openstack_hotfix:
+          source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-hotfix main"
+          architectures: amd64
+          key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+        mirantis_openstack_security:
+          source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-security main"
+          architectures: amd64
+          key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+        mirantis_openstack_updates:
+          source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-updates main"
+          architectures: amd64
+          key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+        mirantis_openstack_holdback:
+          source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-holdback main"
+          architectures: amd64
+          key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
diff --git a/linux/system/repo/mcp/salt.yml b/linux/system/repo/mcp/salt.yml
new file mode 100644
index 0000000..e7240a4
--- /dev/null
+++ b/linux/system/repo/mcp/salt.yml
@@ -0,0 +1,10 @@
+parameters:
+  _param:
+    apt_mk_version: stable
+  linux:
+    system:
+      repo:
+        mcp_salt:
+          source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:apt_mk_version} salt"
+          architectures: amd64
+          key_url: "http://apt-mk.mirantis.com/public.gpg"
diff --git a/linux/system/repo/mcp10.yml b/linux/system/repo/mcp10.yml
deleted file mode 100644
index 2581543..0000000
--- a/linux/system/repo/mcp10.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-parameters:
-  linux:
-    system:
-      repo:
-        mirantis_openstack:
-          source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0/${_param:linux_system_codename} mitaka main"
-          architectures: amd64
-          key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/${_param:linux_system_codename}/archive-mcp1.0.key"
-        mirantis_openstack_hotfix:
-          source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0/${_param:linux_system_codename} mitaka-hotfix main"
-          architectures: amd64
-          key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/${_param:linux_system_codename}/archive-mcp1.0.key"
-        mirantis_openstack_security:
-          source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0/${_param:linux_system_codename} mitaka-security main"
-          architectures: amd64
-          key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/${_param:linux_system_codename}/archive-mcp1.0.key"
-        mirantis_openstack_updates:
-          source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0/${_param:linux_system_codename} mitaka-updates main"
-          architectures: amd64
-          key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/${_param:linux_system_codename}/archive-mcp1.0.key"
-        mirantis_openstack_holdback:
-          source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0/${_param:linux_system_codename} mitaka-holdback main"
-          architectures: amd64
-          key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/${_param:linux_system_codename}/archive-mcp1.0.key"
diff --git a/linux/system/repo/mcp_contrail.yml b/linux/system/repo/mcp_contrail.yml
deleted file mode 100644
index 85f0aa4..0000000
--- a/linux/system/repo/mcp_contrail.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  _param:
-    linux_repo_contrail_component: oc311
-  linux:
-    system:
-      repo:
-        tcpcloud_opencontrail:
-          source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ nightly ${_param:openstack_version} ${_param:linux_repo_contrail_component} extra"
-          architectures: amd64
-          key_url: "http://apt-mk.mirantis.com/public.gpg"
-
-
-
diff --git a/linux/system/repo/saltstack/trusty.yml b/linux/system/repo/saltstack/trusty.yml
new file mode 100644
index 0000000..c20d4dc
--- /dev/null
+++ b/linux/system/repo/saltstack/trusty.yml
@@ -0,0 +1,9 @@
+parameters:
+  _param:
+    salt_version: 2016.3
+  linux:
+    system:
+      repo:
+        salt:
+          source: "deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/${_param:salt_version} trusty main"
+          key_url: "http://repo.saltstack.com/apt/ubuntu/14.04/amd64/${_param:salt_version}/SALTSTACK-GPG-KEY.pub"
\ No newline at end of file
diff --git a/linux/system/repo/saltstack/xenial.yml b/linux/system/repo/saltstack/xenial.yml
new file mode 100644
index 0000000..0c933b8
--- /dev/null
+++ b/linux/system/repo/saltstack/xenial.yml
@@ -0,0 +1,9 @@
+parameters:
+  _param:
+    salt_version: 2016.3
+  linux:
+    system:
+      repo:
+        salt:
+          source: "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/${_param:salt_version} xenial main"
+          key_url: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/${_param:salt_version}/SALTSTACK-GPG-KEY.pub"
\ No newline at end of file
diff --git a/linux/system/repo/saltstack_2016_3_trusty.yml b/linux/system/repo/saltstack_2016_3_trusty.yml
index 19e4814..c7e03d7 100644
--- a/linux/system/repo/saltstack_2016_3_trusty.yml
+++ b/linux/system/repo/saltstack_2016_3_trusty.yml
@@ -1,3 +1,4 @@
+##Obsolete, please use repo/saltstack/trusty
 parameters:
   linux:
     system:
diff --git a/linux/system/repo/saltstack_2016_3_xenial.yml b/linux/system/repo/saltstack_2016_3_xenial.yml
index 6fed4c5..413294f 100644
--- a/linux/system/repo/saltstack_2016_3_xenial.yml
+++ b/linux/system/repo/saltstack_2016_3_xenial.yml
@@ -1,3 +1,4 @@
+##Obsolete, please use repo/saltstack/xenial
 parameters:
   linux:
     system:
diff --git a/openssh/server/team/mmo_de.yml b/openssh/server/team/mmo_devops.yml
similarity index 100%
rename from openssh/server/team/mmo_de.yml
rename to openssh/server/team/mmo_devops.yml
diff --git a/salt/master/pkg.yml b/salt/master/pkg.yml
index 046512f..b075138 100644
--- a/salt/master/pkg.yml
+++ b/salt/master/pkg.yml
@@ -7,4 +7,4 @@
 - system.salt.master.formula.pkg.saltstack
 - system.salt.master.formula.pkg.stacklight
 - system.salt.master.formula.pkg.monitoring
-- system.linux.system.repo.tcp_salt
+- system.linux.system.repo.mcp.salt