diff --git a/.gitmodules b/.gitmodules
index 1fb8af5..ee749db 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "classes/system"]
 	path = classes/system
-	url = https://github.com/Mirantis/reclass-system-salt-model.git
+	url = http://gerrit.mcp.mirantis.com/salt-models/reclass-system
 [submodule "classes/cluster/mcp-offline/infra/mirror"]
 	path = classes/cluster/mcp-offline/infra/mirror
-	url = https://github.com/Mirantis/mcp-local-repo-model
+	url = http://gerrit.mcp.mirantis.com/mcp/mcp-local-repo-model
diff --git a/classes/cluster/mcp-offline/infra/config.yml b/classes/cluster/mcp-offline/infra/config.yml
index 94c608a..84fb98b 100644
--- a/classes/cluster/mcp-offline/infra/config.yml
+++ b/classes/cluster/mcp-offline/infra/config.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.salt-formulas
 - system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.docker
diff --git a/classes/cluster/mcp-offline/infra/init.yml b/classes/cluster/mcp-offline/infra/init.yml
index 37a1ad2..aa17067 100644
--- a/classes/cluster/mcp-offline/infra/init.yml
+++ b/classes/cluster/mcp-offline/infra/init.yml
@@ -6,8 +6,8 @@
     # 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
-    docker_compose_image: apt:5000/compose:1.8.0
-    apt_mk_version: "2018.11.0"
+    #mcp_version: "2018.11.0"
+    mcp_version: "proposed"
     aptly_server_hostname: apt
     aptly_server_address: 127.0.0.1
     linux_repo_refresh_db: true
diff --git a/classes/cluster/mcp-offline/infra/mirror b/classes/cluster/mcp-offline/infra/mirror
index aacd18b..79a08a7 160000
--- a/classes/cluster/mcp-offline/infra/mirror
+++ b/classes/cluster/mcp-offline/infra/mirror
@@ -1 +1 @@
-Subproject commit aacd18b350c61db038efe76979481c1a3c8e8295
+Subproject commit 79a08a790f6f824f28285f8a53923a93c1f84ac3
diff --git a/classes/system b/classes/system
index 17bb3f0..a0f868e 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 17bb3f0be92fc22fa461bbf1ea3286b9613823c3
+Subproject commit a0f868e2f233a39a129608327a4f422f586cf727