diff --git a/tobiko/shell/ssh/_client.py b/tobiko/shell/ssh/_client.py
index afdce03f5..531a9ebe0 100644
--- a/tobiko/shell/ssh/_client.py
+++ b/tobiko/shell/ssh/_client.py
@@ -456,17 +456,17 @@ class SSHClientManager(object):
         if isinstance(host, netaddr.IPAddress):
             host = str(host)
 
+        if host_config:
+            hostname = hostname or host_config.hostname
+            port = port or host_config.port
+            username = username or host_config.username
+
         global_host_config = _config.ssh_host_config(host=host,
                                                      config_files=config_files)
         hostname = hostname or global_host_config.hostname
         port = port or global_host_config.port
         username = username or global_host_config.username
 
-        if host_config:
-            hostname = hostname or host_config.hostname
-            port = port or host_config.port
-            username = username or host_config.username
-
         host_key = hostname, port, username, proxy_jump
         client = self.clients.get(host_key, UNDEFINED_CLIENT)
         if client is UNDEFINED_CLIENT:
diff --git a/tobiko/tripleo/_overcloud.py b/tobiko/tripleo/_overcloud.py
index 9602bada8..9d097ef39 100644
--- a/tobiko/tripleo/_overcloud.py
+++ b/tobiko/tripleo/_overcloud.py
@@ -87,8 +87,13 @@ def overcloud_node_ip_address(ip_version=None, network_name=None, server=None,
     server = server or find_overcloud_node(**params)
     ip_version = ip_version or CONF.tobiko.tripleo.overcloud_ip_version
     network_name = network_name or CONF.tobiko.tripleo.overcloud_network_name
-    return nova.find_server_ip_address(server=server, ip_version=ip_version,
-                                       network_name=network_name)
+    address = nova.find_server_ip_address(server=server,
+                                          ip_version=ip_version,
+                                          network_name=network_name)
+    LOG.debug(f"Got Overcloud node address '{address}' from Undercloud "
+              f"(ip_version={ip_version}, network_name={network_name}, "
+              f"server={server})")
+    return address
 
 
 class OvercloudSshKeyFileFixture(tobiko.SharedFixture):