diff --git a/debmirror/mirror_mirantis_com/docker/xenial.yml b/debmirror/mirror_mirantis_com/docker/xenial.yml
index 24e865c..e4cffaa 100644
--- a/debmirror/mirror_mirantis_com/docker/xenial.yml
+++ b/debmirror/mirror_mirantis_com/docker/xenial.yml
@@ -17,6 +17,6 @@
           section: [ stable ]
           filter:
             # conteinerD - forked at 'extra' repo.
-            001: --exclude='(docker-ce_17|containerd\.io)'
+            001: --exclude='(docker-ce_17|containerd.io_1.2.0~(beta|rc))'
             # Drop docker-ce <= 18.09
             002: --exclude='(docker-ce(-|_)18.0[0-8])'
diff --git a/defaults/init.yml b/defaults/init.yml
index 6911315..6c30995 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -9,6 +9,7 @@
 - system.defaults.linux_system_repo
 - system.defaults.linux_system_file
 - system.defaults.git
+- system.defaults.maas
 - system.defaults.openstack
 - system.defaults.galera
 - system.defaults.rabbitmq
diff --git a/defaults/maas.yml b/defaults/maas.yml
new file mode 100644
index 0000000..df932c8
--- /dev/null
+++ b/defaults/maas.yml
@@ -0,0 +1,17 @@
+parameters:
+  _param:
+    default_local_mirrror_content:
+      maas_mirror_image_sections:
+        bootloaders:
+          keyring: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
+          upstream: ${_param:linux_system_repo_url}/maas-ephemeral-v3/
+          local_dir: /srv/http/${_param:mcp_version}/maas-ephemeral-v3/
+          count: 1
+          # i386 need for pxe
+          filters: ['arch~(i386|amd64)', 'os~(grub*|pxelinux*)']
+        xenial:
+          keyring: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
+          upstream: ${_param:linux_system_repo_url}/maas-ephemeral-v3/
+          local_dir: /srv/http/${_param:mcp_version}/maas-ephemeral-v3/
+          count: 1
+          filters: ['release~(xenial)', 'arch~(amd64)', 'subarch~(generic|hwe-16*|ga-16*)']
diff --git a/jenkins/client/job/deploy/update/kubernetes_update.yml b/jenkins/client/job/deploy/update/kubernetes_update.yml
index 7829b41..454d92b 100644
--- a/jenkins/client/job/deploy/update/kubernetes_update.yml
+++ b/jenkins/client/job/deploy/update/kubernetes_update.yml
@@ -4,8 +4,6 @@
 parameters:
   _param:
     jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
-    kubernetes_hyperkube_repo: ${_param:mcp_docker_registry}/mirantis/kubernetes
-    kubernetes_calico_repo: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico
   jenkins:
     client:
       job:
@@ -127,3 +125,11 @@
               type: string
               default: ""
               description: "Versioned calico/kube-controllers image. Should be null if update rolling via reclass-system level"
+            KUBERNETES_ETCD_SOURCE:
+              type: string
+              default: ""
+              description: "Versioned binary for etcd server. Should be null if update rolling via reclass-system level"
+            KUBERNETES_ETCD_SOURCE_HASH:
+              type: string
+              default: ""
+              description: "Checksum of etcd binary. Should be null if update rolling via reclass-system level"