diff --git a/tcp_tests/templates/mcp-local-aptly/underlay.yaml b/tcp_tests/templates/mcp-local-aptly/underlay.yaml
index 517d4ea..07b38e0 100644
--- a/tcp_tests/templates/mcp-local-aptly/underlay.yaml
+++ b/tcp_tests/templates/mcp-local-aptly/underlay.yaml
@@ -16,14 +16,14 @@
 
     address_pools:
       admin-pool01:
-        net: {{ os_env('ADMIN_ADDRESS_POOL01', '10.170.0.0/16:24') }}
+        net: {{ os_env('ADMIN_ADDRESS_POOL01', '10.170.0.240/28:28') }}
         params:
           ip_reserved:
-            gateway: +122
+            gateway: +2
             l2_network_device: +1
-            default_{{ HOSTNAME_APT01 }}: +122
+            default_{{ HOSTNAME_APT01 }}: +2  #10.170.0.242
           ip_ranges:
-            dhcp: [+90, -10]
+            dhcp: [+5, +10]
 
     groups:
       - name: default
diff --git a/tcp_tests/templates/mcp-ocata-local-repo-dvr/run_test.sh b/tcp_tests/templates/mcp-ocata-local-repo-dvr/run_test.sh
index 8958ee8..ceabf28 100644
--- a/tcp_tests/templates/mcp-ocata-local-repo-dvr/run_test.sh
+++ b/tcp_tests/templates/mcp-ocata-local-repo-dvr/run_test.sh
@@ -14,7 +14,7 @@
 # Offline deployment simulation, requests to the apt01 node are redirected to an 'offline apt node' with mirrors of repositories
 export FORMULA_REPOSITORY="deb [arch=amd64] http://apt.mirantis.local.test/ubuntu-xenial ${REPOSITORY_SUITE} salt extra"
 export FORMULA_GPG="http://apt.mirantis.local.test/public.gpg"
-export SALT_REPOSITORY="deb [arch=amd64] http://apt.mirantis.local.test/ubuntu-xenial/salt/2016.3/ ${REPOSITORY_SUITE} main"
+export SALT_REPOSITORY="deb [arch=amd64] http://apt.mirantis.local.test/ubuntu-xenial/ ${REPOSITORY_SUITE} salt/2016.3 main"
 export SALT_GPG="http://apt.mirantis.local.test/public.gpg"
 export UBUNTU_REPOSITORY="deb http://mirror.mcp.mirantis.local.test/ubuntu xenial main universe restricted"
 export UBUNTU_UPDATES_REPOSITORY="deb http://mirror.mcp.mirantis.local.test/ubuntu xenial-updates main universe restricted"
diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 25132d5..5c805a6 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -108,7 +108,6 @@
     #HOME=/root git config --global http.sslCAInfo /root/.git_trusted_certs.pem;
     HOME=/root git config --global user.email "mcp-integration-qa@example.com";
     HOME=/root git config --global user.name "MCP Integration QA";
-    HOME=/root git config submodule."classes/system".url "{{ SALT_MODELS_SYSTEM_REPOSITORY }}";
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 1}
   skip_fail: false
@@ -122,27 +121,29 @@
   cmd: |
     set -e;
     #ssh-keyscan -H github.com >> ~/.ssh/known_hosts;
-    export GIT_SSL_NO_VERIFY=true; git clone -b {{ SALT_MODELS_BRANCH }} --recurse-submodules {{ SALT_MODELS_REPOSITORY }} /srv/salt/reclass;
-    pushd /srv/salt/reclass && \
+    export GIT_SSL_NO_VERIFY=true; git clone -b {{ SALT_MODELS_BRANCH }} {{ SALT_MODELS_REPOSITORY }} /srv/salt/reclass;
+    pushd /srv/salt/reclass;
+    git config submodule."classes/system".url "{{ SALT_MODELS_SYSTEM_REPOSITORY }}";
+    git submodule update --init --recursive;
     {%- if SALT_MODELS_REF_CHANGE != '' %}
     {%- for item in SALT_MODELS_REF_CHANGE.split(" ") %}
-    git fetch {{ SALT_MODELS_REPOSITORY }} {{ item }} && git cherry-pick FETCH_HEAD && \
+    git fetch {{ SALT_MODELS_REPOSITORY }} {{ item }} && git cherry-pick FETCH_HEAD;
     {%- endfor %}
     {%- elif SALT_MODELS_COMMIT != 'master' %}
-    git checkout {{ SALT_MODELS_COMMIT }} && \
+    git checkout {{ SALT_MODELS_COMMIT }};
     {%- endif %}
     {%- if SALT_MODELS_SYSTEM_COMMIT != '' %}
-    pushd classes/system/ && \
-    git checkout {{ SALT_MODELS_SYSTEM_COMMIT }} && \
-    popd && \
+    pushd classes/system/;
+    git checkout {{ SALT_MODELS_SYSTEM_COMMIT }};
+    popd;
     {%- elif SALT_MODELS_SYSTEM_REF_CHANGE != '' %}
     pushd classes/system/ && \
     {%- for item in SALT_MODELS_SYSTEM_REF_CHANGE.split(" ") %}
-    git fetch {{ SALT_MODELS_SYSTEM_REPOSITORY }} {{ item }} && git cherry-pick FETCH_HEAD && \
+    git fetch {{ SALT_MODELS_SYSTEM_REPOSITORY }} {{ item }} && git cherry-pick FETCH_HEAD;
     {%- endfor %}
-    popd && \
+    popd;
     {%- else %}
-    git submodule update --init --recursive && \
+    git submodule update --init --recursive;
     {%- endif %}
     popd;
     mkdir -p /srv/salt/reclass/classes/service;