diff --git a/defaults/init.yml b/defaults/init.yml
index 563b1a5..4231078 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -29,8 +29,6 @@
     banner_company_name: COMPANY_NAME
     motd_company_name: "${_param:banner_company_name}"
     ssh_banner_company_name: "${_param:banner_company_name}"
-    # Openstack globals
-    openstack_version: 'queens'
     # Docker artifact globals
     mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
     mcp_binary_registry: "https://${_param:mcp_docker_registry}/artifactory/binary-prod-local"
diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index a6c2409..74c5f41 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -45,6 +45,10 @@
     linux_system_repo_update_mcp_extra_url: ${_param:linux_system_repo_update_url}/extra/
     linux_system_repo_hotfix_mcp_extra_url: ${_param:linux_system_repo_hotfix_url}/extra/
     #
+    linux_system_repo_mcp_kubernetes_extra_url: ${_param:linux_system_repo_url}/kubernetes-extra
+    linux_system_repo_update_mcp_kubernetes_extra_url: ${_param:linux_system_repo_update_url}/kubernetes-extra
+    linux_system_repo_hotfix_mcp_kubernetes_extra_url: ${_param:linux_system_repo_hotfix_url}/kubernetes-extra
+    #
     linux_system_repo_mcp_salt_url: ${_param:linux_system_repo_url}/salt-formulas/
     linux_system_repo_update_mcp_salt_url: ${_param:linux_system_repo_update_url}/salt-formulas/
     linux_system_repo_hotfix_mcp_salt_url: ${_param:linux_system_repo_hotfix_url}/salt-formulas/
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 95566dc..11ca586 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -19,7 +19,7 @@
     openstack_memcache_security_strategy: 'ENCRYPT'
     openstack_memcached_proto_tcp_enabled: True
     openstack_memcached_proto_udp_enabled: False
-    openstack_version: ocata
+    openstack_version: queens
     openstack_old_version: ${_param:openstack_version}
     openstack_upgrade_enabled: False
     # Cinder
diff --git a/linux/system/repo/mcp/apt_mirantis/hotfix/kubernetes_extra.yml b/linux/system/repo/mcp/apt_mirantis/hotfix/kubernetes_extra.yml
new file mode 100644
index 0000000..9b656e8
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/hotfix/kubernetes_extra.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.mirantis_com
+parameters:
+  linux:
+    system:
+      repo:
+        kubernetes_extra_hotfix:
+          source: "deb ${_param:linux_system_repo_hotfix_mcp_kubernetes_extra_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+          key: ${_param:linux_system_repo_mirror_mirantis_key}
+          architectures: ${_param:linux_system_architecture}
+          clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/kubernetes_extra.yml b/linux/system/repo/mcp/apt_mirantis/kubernetes_extra.yml
new file mode 100644
index 0000000..d6d0866
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/kubernetes_extra.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.mirantis_com
+parameters:
+  linux:
+    system:
+      repo:
+        kubernetes_extra:
+          source: "deb ${_param:linux_system_repo_mcp_kubernetes_extra_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+          key: ${_param:linux_system_repo_mirror_mirantis_key}
+          architectures: ${_param:linux_system_architecture}
+          clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/update/kubernetes_extra.yml b/linux/system/repo/mcp/apt_mirantis/update/kubernetes_extra.yml
new file mode 100644
index 0000000..40af87c
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/update/kubernetes_extra.yml
@@ -0,0 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.mirantis_com
+parameters:
+  linux:
+    system:
+      repo:
+        kubernetes_extra_update:
+          source: "deb ${_param:linux_system_repo_update_mcp_kubernetes_extra_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+          key: ${_param:linux_system_repo_mirror_mirantis_key}
+          architectures: ${_param:linux_system_architecture}
+          clean_file: true