diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail32-maas-2018.8.0/salt-context-environment.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail32-maas-2018.8.0/salt-context-environment.yaml
index 659203e..2f5b431 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail32-maas-2018.8.0/salt-context-environment.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail32-maas-2018.8.0/salt-context-environment.yaml
@@ -69,7 +69,7 @@
     dbs01.cookied-bm-mcp-ocata-contrail.local:
       reclass_storage_name: openstack_database_node01
       roles:
-      - openstack_database_leader
+      - openstack_database_leader_2018_8_0
       - linux_system_codename_xenial
       interfaces:
         ens2:
@@ -80,7 +80,7 @@
     dbs02.cookied-bm-mcp-ocata-contrail.local:
       reclass_storage_name: openstack_database_node02
       roles:
-      - openstack_database
+      - openstack_database_2018_8_0
       - linux_system_codename_xenial
       interfaces:
         ens2:
@@ -91,7 +91,7 @@
     dbs03.cookied-bm-mcp-ocata-contrail.local:
       reclass_storage_name: openstack_database_node03
       roles:
-      - openstack_database
+      - openstack_database_2018_8_0
       - linux_system_codename_xenial
       interfaces:
         ens2: