diff --git a/tcp_tests/templates/common-services/mk22-lab-dvr-common-services.yaml b/tcp_tests/templates/common-services/mk22-lab-dvr-common-services.yaml
index 584ee04..c6152a8 100644
--- a/tcp_tests/templates/common-services/mk22-lab-dvr-common-services.yaml
+++ b/tcp_tests/templates/common-services/mk22-lab-dvr-common-services.yaml
@@ -1,5 +1,5 @@
-{% from 'mk22-lab-dvr-defaults.jinja' import DOMAIN_NAME %}
-{% from 'mk22-lab-dvr-defaults.jinja' import HOSTNAME_CFG01 %}
+{% from 'mk22-lab-dvr-defaults.jinja' import DOMAIN_NAME with context %}
+{% from 'mk22-lab-dvr-defaults.jinja' import HOSTNAME_CFG01 with context %}
 
 # Install support services
 
diff --git a/tcp_tests/templates/openstack/mk22-lab-dvr-openstack.yaml b/tcp_tests/templates/openstack/mk22-lab-dvr-openstack.yaml
index edac153..df5a577 100644
--- a/tcp_tests/templates/openstack/mk22-lab-dvr-openstack.yaml
+++ b/tcp_tests/templates/openstack/mk22-lab-dvr-openstack.yaml
@@ -1,5 +1,5 @@
-{% from 'mk22-lab-dvr-defaults.jinja' import DOMAIN_NAME %}
-{% from 'mk22-lab-dvr-defaults.jinja' import HOSTNAME_CFG01 %}
+{% from 'mk22-lab-dvr-defaults.jinja' import DOMAIN_NAME with context %}
+{% from 'mk22-lab-dvr-defaults.jinja' import HOSTNAME_CFG01 with context %}
 
 # Install OpenStack control services
 
@@ -129,79 +129,6 @@
   skip_fail: true
 
 
-# Install contrail on controllers
-
-- description: Install contrail database on controllers
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@opencontrail:database' state.sls opencontrail.database -b 1
-  #cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-  #    'ctl*' state.sls opencontrail.database -b 1
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: false
-
-- description: Check cassandra status on ctl01
-  cmd: salt -C 'I@opencontrail:database'
-    cmd.run 'nodetool status;nodetool compactionstats;nodetool describecluster;' -b 1
-  #cmd: salt 'ctl*'
-  #    cmd.run 'nodetool status;nodetool compactionstats;nodetool describecluster;' -b 1
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: false
-
-- description: Install opencontrail control services
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@opencontrail:control' state.sls opencontrail -b 1
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: false
-
-
-- description: Add contrail bgp router on ctl01
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@opencontrail:control:id:1' cmd.run
-    '/usr/share/contrail-utils/provision_control.py --oper add --api_server_ip 172.16.10.254
-    --api_server_port 8082 --host_name ctl01 --host_ip 172.16.10.101 --router_asn
-    64512 --admin_user admin --admin_password workshop --admin_tenant_name admin'
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: false
-
-- description: Add contrail bgp router on ctl02
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@opencontrail:control:id:1' cmd.run
-    '/usr/share/contrail-utils/provision_control.py --oper add --api_server_ip 172.16.10.254
-    --api_server_port 8082 --host_name ctl02 --host_ip 172.16.10.102 --router_asn
-    64512 --admin_user admin --admin_password workshop --admin_tenant_name admin'
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: false
-
-- description: Add contrail bgp router on ctl03
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@opencontrail:control:id:1' cmd.run
-    '/usr/share/contrail-utils/provision_control.py --oper add --api_server_ip 172.16.10.254
-    --api_server_port 8082 --host_name ctl03 --host_ip 172.16.10.103 --router_asn
-    64512 --admin_user admin --admin_password workshop --admin_tenant_name admin'
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: false
-
-- description: Check contrail status
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@opencontrail:control' cmd.run 'contrail-status'
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: false
-
-- description: Test neutron and nova with contrail
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@keystone:server' cmd.run '. /root/keystonerc; neutron net-list; nova net-list'
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: false
-
-
 # Install compute node
 
 - description: Apply formulas for compute node
@@ -216,33 +143,9 @@
   retry: {count: 3, delay: 5}
   skip_fail: true
 
-- description: Add vrouter for cmp01
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@opencontrail:control:id:1' cmd.run
-    '/usr/share/contrail-utils/provision_vrouter.py --oper add --host_name cmp01 --host_ip
-    172.16.10.105 --api_server_ip 172.16.10.254 --api_server_port 8082 --admin_user
-    admin --admin_password workshop --admin_tenant_name admin'
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: false
-
-- description: Reboot compute nodes
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'cmp*' system.reboot;
-    sleep 30
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: false
-
 - description: Check IP on computes
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'cmp*' cmd.run
     'ip a'
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 10, delay: 30}
   skip_fail: false
-
-- description: Check contrail status on computes
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'cmp*' cmd.run
-    'contrail-status'
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: false
diff --git a/tcp_tests/templates/salt/mk22-lab-dvr-salt.yaml b/tcp_tests/templates/salt/mk22-lab-dvr-salt.yaml
index aad7534..cf93bc4 100644
--- a/tcp_tests/templates/salt/mk22-lab-dvr-salt.yaml
+++ b/tcp_tests/templates/salt/mk22-lab-dvr-salt.yaml
@@ -1,5 +1,5 @@
-{% from 'mk22-lab-dvr-defaults.jinja' import DOMAIN_NAME %}
-{% from 'mk22-lab-dvr-defaults.jinja' import HOSTNAME_CFG01 %}
+{% from 'mk22-lab-dvr-defaults.jinja' import DOMAIN_NAME with context %}
+{% from 'mk22-lab-dvr-defaults.jinja' import HOSTNAME_CFG01 with context %}
 
 # Install salt to the config node
 
@@ -252,8 +252,7 @@
   skip_fail: false
 
 - description: Configure salt.minion on controllers
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' state.sls
-    salt.minion
+  cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' state.sls salt.minion
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 3, delay: 5}
   skip_fail: false
@@ -264,9 +263,14 @@
   retry: {count: 3, delay: 5}
   skip_fail: false
 
+- description: Check salt minion versions on slaves
+  cmd: salt '*' state.show_top
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 3, delay: 5}
+  skip_fail: false
+
 - description: Configure ntp on controllers
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' state.sls
-    ntp
+  cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' state.sls ntp
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 5, delay: 10}
   skip_fail: false