diff --git a/whitebox_neutron_tempest_plugin/tests/scenario/base.py b/whitebox_neutron_tempest_plugin/tests/scenario/base.py
index cd9dc9b..1a178d8 100644
--- a/whitebox_neutron_tempest_plugin/tests/scenario/base.py
+++ b/whitebox_neutron_tempest_plugin/tests/scenario/base.py
@@ -140,8 +140,6 @@ class BaseTempestWhiteboxTestCase(base.BaseTempestTestCase):
                     node['is_compute'] = is_compute
                 return
 
-        if WB_CONF.openstack_type == 'tripleo':
-            host = hostname + ".ctlplane"
         node = {'name': hostname,
                 'client': cls.get_node_client(host),
                 'is_networker': is_networker,
@@ -471,19 +469,6 @@ class BaseTempestTestCaseOvn(BaseTempestWhiteboxTestCase):
 
     @classmethod
     def _get_ovn_dbs(cls):
-        ssl_params = ''
-        if WB_CONF.openstack_type == 'tripleo':
-            cmd = ("sudo ovs-vsctl get open . external_ids:ovn-remote | "
-                   "sed -e 's/\"//g'")
-            sbdb = cls.run_on_master_controller(cmd)
-            if 'ssl' in sbdb:
-                ssl_params = '-p {} -c {} -C {} '.format(
-                    WB_CONF.pki_private_key,
-                    WB_CONF.pki_certificate,
-                    WB_CONF.pki_ca_cert)
-            nbdb = sbdb.replace('6642', '6641')
-            cmd = 'ovn-{}ctl --db={} %s' % (ssl_params)
-            cmd = 'sudo %s exec ovn_controller %s' % (cls.container_app, cmd)
         if WB_CONF.openstack_type == 'devstack':
             sbdb = "unix:/usr/local/var/run/ovn/ovnsb_db.sock"
             nbdb = sbdb.replace('sb', 'nb')
diff --git a/whitebox_neutron_tempest_plugin/tests/scenario/test_multicast.py b/whitebox_neutron_tempest_plugin/tests/scenario/test_multicast.py
index 7512b68..a7d41fa 100644
--- a/whitebox_neutron_tempest_plugin/tests/scenario/test_multicast.py
+++ b/whitebox_neutron_tempest_plugin/tests/scenario/test_multicast.py
@@ -797,13 +797,10 @@ class MulticastTestIPv4OvnBase(MulticastTestIPv4, base.BaseTempestTestCaseOvn):
             " options:mcast_relay=" + state)
 
     def restart_ovn_controller_on_compute_nodes(self):
+        prefix = 'edpm_' if WB_CONF.openstack_type == 'podified' else ''
+        cmd = "sudo systemctl restart {}ovn-controller.service".format(prefix)
         for node in self.nodes:
             if node['is_compute'] is True and node['is_controller'] is False:
-                service_prefix = (
-                    "tripleo_" if WB_CONF.openstack_type == "tripleo"
-                    else "")
-                cmd = ("sudo systemctl restart {}"
-                       "ovn-controller.service".format(service_prefix))
                 node['client'].exec_command(cmd)
         time.sleep(10)