diff --git a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-vcp-environment.yaml b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-vcp-environment.yaml
index e0b365a..e9461ca 100644
--- a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-vcp-environment.yaml
+++ b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-vcp-environment.yaml
@@ -35,7 +35,7 @@
     dbs01.cookied-cicd-ovs-maas.local:
       reclass_storage_name: openstack_database_node01
       roles:
-      - openstack_database_leader_2018_8_0
+      - openstack_database_leader
       - linux_system_codename_xenial
       interfaces:
         ens2:
@@ -46,7 +46,7 @@
     dbs02.cookied-cicd-ovs-maas.local:
       reclass_storage_name: openstack_database_node02
       roles:
-      - openstack_database_2018_8_0
+      - openstack_database
       - linux_system_codename_xenial
       interfaces:
         ens2:
@@ -57,7 +57,7 @@
     dbs03.cookied-cicd-ovs-maas.local:
       reclass_storage_name: openstack_database_node03
       roles:
-      - openstack_database_2018_8_0
+      - openstack_database
       - linux_system_codename_xenial
       interfaces:
         ens2: