diff --git a/tcp_tests/settings_oslo.py b/tcp_tests/settings_oslo.py
index 6c818f2..5ba6602 100644
--- a/tcp_tests/settings_oslo.py
+++ b/tcp_tests/settings_oslo.py
@@ -24,7 +24,7 @@
 
 
 _default_conf = pkg_resources.resource_filename(
-    __name__, 'templates/default.yaml')
+    __name__, 'templates/tcpcloud-default.yaml')
 
 
 hardware_opts = [
@@ -51,8 +51,8 @@
                   }, ...]""", default=[]),
     ct.Cfg('roles', ct.JSONList(),
            help="Node roles managed by underlay in the environment",
-           default=[ext.UNDERLAY_NODE_ROLE.salt-master,
-                    ext.UNDERLAY_NODE_ROLE.salt-minion, ]),
+           default=[ext.UNDERLAY_NODE_ROLE.salt_master,
+                    ext.UNDERLAY_NODE_ROLE.salt_minion, ]),
     ct.Cfg('nameservers', ct.JSONList(),
            help="IP addresses of DNS servers",
            default=[]),