diff --git a/classes/cluster/mcp-offline/infra/config.yml b/classes/cluster/mcp-offline/infra/config.yml
index 361fd04..94c608a 100644
--- a/classes/cluster/mcp-offline/infra/config.yml
+++ b/classes/cluster/mcp-offline/infra/config.yml
@@ -1,8 +1,8 @@
 classes:
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo.mcp.apt_mirantis.docker_legacy
+- system.linux.system.repo.mcp.apt_mirantis.docker
 - system.openssh.client.lab
 - system.salt.master.pkg
 - system.salt.minion.ca.salt_master
diff --git a/classes/cluster/mcp-offline/infra/init.yml b/classes/cluster/mcp-offline/infra/init.yml
index b52ee30..cf850c8 100644
--- a/classes/cluster/mcp-offline/infra/init.yml
+++ b/classes/cluster/mcp-offline/infra/init.yml
@@ -1,6 +1,6 @@
 classes:
+- system.defaults
 - system.linux.system.single.debian
-- system.openssh.server.team.cicd
 parameters:
   _param:
     # TODO: Uncomment next line "linux_system_user_sudo: true" during the deployment.
diff --git a/classes/cluster/mcp-offline/infra/mirror b/classes/cluster/mcp-offline/infra/mirror
index 494b3b2..bab77b5 160000
--- a/classes/cluster/mcp-offline/infra/mirror
+++ b/classes/cluster/mcp-offline/infra/mirror
@@ -1 +1 @@
-Subproject commit 494b3b2b0940459a3311e73a9b91f9a79348c32d
+Subproject commit bab77b5391afd67e4a185393c3552d26681d5bf8
diff --git a/classes/system b/classes/system
index 73a81e6..45e8d14 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 73a81e64bf27be7b7305129fc272ce90f21352eb
+Subproject commit 45e8d140da325c85b2f4f24f0e4ee83ab2b00e5f