diff --git a/tobiko/openstack/topology/_topology.py b/tobiko/openstack/topology/_topology.py
index 7ceb1800b..390eb51ea 100644
--- a/tobiko/openstack/topology/_topology.py
+++ b/tobiko/openstack/topology/_topology.py
@@ -267,10 +267,17 @@ class OpenStackTopology(tobiko.SharedFixture):
         return digger
 
     def discover_nodes(self):
+        self.discover_ssh_proxy_jump_node()
         self.discover_configured_nodes()
         self.discover_controller_nodes()
         self.discover_compute_nodes()
 
+    def discover_ssh_proxy_jump_node(self):
+        ssh_client = ssh.ssh_proxy_client()
+        if ssh_client is not None:
+            self.add_node(ssh_client=ssh_client,
+                          group='proxy_jump')
+
     def discover_configured_nodes(self):
         for address in self.config.conf.nodes or []:
             self.add_node(address=address)
diff --git a/tobiko/tripleo/_topology.py b/tobiko/tripleo/_topology.py
index 1bad04fec..418778889 100644
--- a/tobiko/tripleo/_topology.py
+++ b/tobiko/tripleo/_topology.py
@@ -67,6 +67,7 @@ class TripleoTopology(topology.OpenStackTopology):
     }
 
     def discover_nodes(self):
+        self.discover_ssh_proxy_jump_node()
         self.discover_undercloud_nodes()
         self.discover_overcloud_nodes()