diff --git a/tcp_tests/templates/salt/virtual-mcp10-ovs-salt.yaml b/tcp_tests/templates/salt/virtual-mcp10-ovs-salt.yaml
index 5211705..68beb02 100644
--- a/tcp_tests/templates/salt/virtual-mcp10-ovs-salt.yaml
+++ b/tcp_tests/templates/salt/virtual-mcp10-ovs-salt.yaml
@@ -56,6 +56,21 @@
   retry: {count: 1, delay: 1}
   skip_fail: false
 
+- description: Configure GIT settings and certificates
+  cmd: touch /root/.git_trusted_certs.pem;
+    for server in git.tcpcloud.eu github.com; do
+        openssl s_client -showcerts -connect $server:443 </dev/null
+        | openssl x509 -outform PEM
+        >> /root/.git_trusted_certs.pem;
+    done;
+    HOME=/root git config --global http.sslCAInfo /root/.git_trusted_certs.pem;
+    HOME=/root git config --global user.email "tcp-qa@example.com";
+    HOME=/root git config --global user.name "TCP QA";
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 1}
+  skip_fail: false
+
+
 - description: Clone reclass models with submodules
   cmd: |
     ssh-keyscan -H github.com >> ~/.ssh/known_hosts;
@@ -152,10 +167,20 @@
   retry: {count: 1, delay: 1}
   skip_fail: false
 
+- description: Run 'reclass' formula on cfg01
+  cmd: timeout 120 salt --hard-crash --state-output=mixed --state-verbose=False
+    -C 'I@salt:master' reclass;
+    salt-call --no-color state.sls salt.master;
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: true
+
+
 - description: Run 'salt' formula on cfg01
   cmd: timeout 120 salt --hard-crash --state-output=mixed --state-verbose=False
     -C 'I@salt:master' state.sls salt.master.service;
-    salt-call --no-color state.sls salt.master;
+    salt-call --no-color state.sls salt.master,salt.api,salt.minion.ca;
+    systemctl restart salt-minion;
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: true
@@ -186,7 +211,7 @@
   skip_fail: false
 
 - description: Show  reclass-salt --top
-  cmd: salt-call --no-color state.sls salt.minion.cert -l info
+  cmd: reclass-salt --top; salt-call --no-color state.sls salt.minion.cert -l info;
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false
@@ -194,19 +219,6 @@
 
 # Bootstrap all nodes
 
-- description: Workaround for missing kernel modules
-  cmd: salt '*' cmd.run "for module in nf_conntrack_ipv4 ip_tables
-    x_tables nf_defrag_ipv4 nf_nat_ipv4 nf_nat
-    iptable_filter iptable_mangle iptable_nat;
-    do
-    modprobe \$module;
-    echo \$module >> /etc/modules;
-    done"
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 1}
-  skip_fail: false
-
-
 - description: Configure linux on controllers
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'ctl*' state.sls
     linux
@@ -244,13 +256,6 @@
   retry: {count: 1, delay: 5}
   skip_fail: false
 
-- description: '*Workaround* for the bug https://mirantis.jira.com/browse/PROD-8021'
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' cmd.run 'apt-get
-    -y install linux-image-extra-$(uname -r)'
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 2, delay: 5}
-  skip_fail: false
-
 - description: Configure salt.minion on ctl
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'ctl*' state.sls salt.minion
   node_name: {{ HOSTNAME_CFG01 }}