diff --git a/tcp_tests/templates/openstack/mk22-lab-advanced-openstack.yaml b/tcp_tests/templates/openstack/mk22-lab-advanced-openstack.yaml
index 4d6aad2..17f858b 100644
--- a/tcp_tests/templates/openstack/mk22-lab-advanced-openstack.yaml
+++ b/tcp_tests/templates/openstack/mk22-lab-advanced-openstack.yaml
@@ -114,13 +114,13 @@
   skip_fail: true
 
 # Install contrail on controllers
-- description: Workaround of the bug https://mirantis.jira.com/browse/PROD-8164
+
+- description: Workaround of the bug https://mirantis.jira.com/browse/PROD-8164 for opencontrail.database
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' grains.set noservices True
-  node_name: cfg01.mk22-lab-basic.local
+  node_name: cfg01.mk22-lab-advanced.local
   retry: {count: 3, delay: 5}
   skip_fail: false
 
-# Install contrail on controllers
 - description: Install contrail database on controllers
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'ctl*' state.sls
     opencontrail.database -b 1
@@ -171,6 +171,13 @@
 
 
 # Install compute node
+
+- description: Workaround of the bug https://mirantis.jira.com/browse/PROD-8164for opencontrail on compute nodes
+  cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' grains.set noservices True
+  node_name: cfg01.mk22-lab-advanced.local
+  retry: {count: 3, delay: 5}
+  skip_fail: false
+
 - description: Apply formulas for compute node
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'cmp*' state.apply
   node_name: cfg01.mk22-lab-advanced.local
diff --git a/tcp_tests/templates/openstack/mk22-lab-basic-openstack.yaml b/tcp_tests/templates/openstack/mk22-lab-basic-openstack.yaml
index b69285c..7c6283f 100644
--- a/tcp_tests/templates/openstack/mk22-lab-basic-openstack.yaml
+++ b/tcp_tests/templates/openstack/mk22-lab-basic-openstack.yaml
@@ -114,7 +114,8 @@
   skip_fail: true
 
 # Install contrail on controllers
-- description: Workaround of the bug https://mirantis.jira.com/browse/PROD-8164
+
+- description: Workaround of the bug https://mirantis.jira.com/browse/PROD-8164 for opencontrail.database
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' grains.set noservices True
   node_name: cfg01.mk22-lab-basic.local
   retry: {count: 3, delay: 5}
@@ -170,6 +171,12 @@
 
 
 # Install compute node
+
+- description: Workaround of the bug https://mirantis.jira.com/browse/PROD-8164 for opencontrail on compute nodes
+  cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' grains.set noservices True
+  node_name: cfg01.mk22-lab-basic.local
+  retry: {count: 3, delay: 5}
+  skip_fail: false
 - description: Apply formulas for compute node
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'cmp*' state.apply
   node_name: cfg01.mk22-lab-basic.local