diff --git a/classes/cluster/mcp-day01/infra/config.yml b/classes/cluster/mcp-day01/infra/config.yml
index d70c251..af673f2 100644
--- a/classes/cluster/mcp-day01/infra/config.yml
+++ b/classes/cluster/mcp-day01/infra/config.yml
@@ -1,14 +1,14 @@
 classes:
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.salt.master.pkg
 - system.salt.minion.ca.salt_master
 - system.salt.master.api
 - system.reclass.storage.salt
-- cluster.mcp-day01.infra
 - cluster.mcp-day01.infra.maas
 - cluster.mcp-day01.infra.jenkins
+- cluster.mcp-day01.infra
 parameters:
   _param:
     salt_master_base_environment: prd
diff --git a/classes/cluster/mcp-day01/infra/init.yml b/classes/cluster/mcp-day01/infra/init.yml
index 3d5f707..4312a81 100644
--- a/classes/cluster/mcp-day01/infra/init.yml
+++ b/classes/cluster/mcp-day01/infra/init.yml
@@ -6,7 +6,7 @@
     # TODO: Uncomment next line "linux_system_user_sudo: true" during the deployment.
     # Don't set it "false" before you configure sudo policies and enable power users.
     # linux_system_user_sudo: true
-    apt_mk_version: "2018.3.1"
+    apt_mk_version: "proposed"
     linux_repo_refresh_db: true
     infra_config_hostname: cfg01
     salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
@@ -34,6 +34,8 @@
       package:
         cloud-init:
           version: latest
+        reclass:
+          version: latest
         jq:
           version: latest
         ipmitool:
diff --git a/classes/cluster/mcp-day01/infra/jenkins.yml b/classes/cluster/mcp-day01/infra/jenkins.yml
index 47487a8..e470856 100644
--- a/classes/cluster/mcp-day01/infra/jenkins.yml
+++ b/classes/cluster/mcp-day01/infra/jenkins.yml
@@ -5,6 +5,7 @@
 - system.jenkins.client
 - system.jenkins.client.credential.salt
 - system.jenkins.client.user.admin
+- system.linux.system.repo.mcp.apt_mirantis.jenkins
 parameters:
   _param:
     jenkins_client_user: admin
@@ -60,12 +61,6 @@
           group: jenkins
           mode: 700
           makedirs: true
-      repo:
-        jenkins-ppa:
-          source: "deb http://pkg.jenkins.io/debian-stable binary/"
-          architectures: amd64
-          key_id: D50582E6
-          key_server: https://pkg.jenkins.io/debian/jenkins-ci.org.key
       package:
         jenkins:
           version: latest