diff --git a/tobiko/openstack/topology/_topology.py b/tobiko/openstack/topology/_topology.py
index e27ae1a54..84cf92278 100644
--- a/tobiko/openstack/topology/_topology.py
+++ b/tobiko/openstack/topology/_topology.py
@@ -185,7 +185,7 @@ class OpenStackTopology(tobiko.SharedFixture):
         neutron.OPENVSWITCH_AGENT: 'devstack@q-agt',
         neutron.METADATA_AGENT: 'devstack@q-meta',
         neutron.OVN_METADATA_AGENT: 'devstack@q-ovn-metadata-agent',
-        neutron.OVN_CONTROLLER: 'devstack@ovn-controller'
+        neutron.OVN_CONTROLLER: 'ovn-controller'
     }
     agent_to_container_name_mappings: typing.Dict[str, str] = {}
 
diff --git a/tobiko/tests/faults/neutron/test_agents.py b/tobiko/tests/faults/neutron/test_agents.py
index 4758e46ae..bfb53e51a 100644
--- a/tobiko/tests/faults/neutron/test_agents.py
+++ b/tobiko/tests/faults/neutron/test_agents.py
@@ -584,6 +584,9 @@ class OvnControllerTest(BaseAgentTest):
             self.container_name = self.get_agent_container_name(
                 self.agent_name)
 
+        if not self.container_name:
+            self.skipTest(f"Missing container(s): '{self.container_name}'")
+
         for host in hosts:
             ssh_client = topology.get_openstack_node(hostname=host).ssh_client
             pid = None