diff --git a/tcp_tests/templates/openstack/mk22-lab-advanced-openstack.yaml b/tcp_tests/templates/openstack/mk22-lab-advanced-openstack.yaml
index 17f858b..55b151c 100644
--- a/tcp_tests/templates/openstack/mk22-lab-advanced-openstack.yaml
+++ b/tcp_tests/templates/openstack/mk22-lab-advanced-openstack.yaml
@@ -183,6 +183,11 @@
   node_name: cfg01.mk22-lab-advanced.local
   retry: {count: 3, delay: 5}
   skip_fail: false
+- 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: Re-apply(as in doc) 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 7c6283f..154f73b 100644
--- a/tcp_tests/templates/openstack/mk22-lab-basic-openstack.yaml
+++ b/tcp_tests/templates/openstack/mk22-lab-basic-openstack.yaml
@@ -182,6 +182,11 @@
   node_name: cfg01.mk22-lab-basic.local
   retry: {count: 3, delay: 5}
   skip_fail: false
+- 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: Re-apply(as in doc) formulas for compute node
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'cmp*' state.apply
   node_name: cfg01.mk22-lab-basic.local