diff --git a/tcp_tests/managers/envmanager_devops.py b/tcp_tests/managers/envmanager_devops.py
index 9461c71..1643f5f 100644
--- a/tcp_tests/managers/envmanager_devops.py
+++ b/tcp_tests/managers/envmanager_devops.py
@@ -151,6 +151,7 @@
         for d_node in self._env.get_nodes(role__in=roles):
             ssh_data = {
                 'node_name': d_node.name,
+                'roles': [d_node.role],
                 'address_pool': self._get_network_pool(
                     ext.NETWORK_TYPE.public).address_pool.name,
                 'host': self.node_ip(d_node),
diff --git a/tcp_tests/managers/underlay_ssh_manager.py b/tcp_tests/managers/underlay_ssh_manager.py
index 2880272..578768a 100644
--- a/tcp_tests/managers/underlay_ssh_manager.py
+++ b/tcp_tests/managers/underlay_ssh_manager.py
@@ -40,6 +40,7 @@
               keys_source_host: None,
               login: ,
               password: ,
+              roles: [],
             },
             {
               node_name: node1,
@@ -50,6 +51,7 @@
               keys_source_host: None,
               login:
               password:
+              roles: [],
             },
             {
               node_name: node2,
@@ -97,6 +99,7 @@
                 'address_pool': ssh.get('address_pool', None),
                 'port': ssh.get('port', None),
                 'keys': ssh.get('keys', []),
+                'roles': ssh.get('roles', []),
             }
 
             if 'keys_source_host' in ssh:
@@ -122,6 +125,7 @@
                 'address_pool': ssh.get('address_pool', None),
                 'port': ssh.get('port', None),
                 'keys': ssh.get('keys', []),
+                'roles': ssh.get('roles', []),
             }
             self.config_ssh.remove(ssh_data)