diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 289cb58..6e864f6 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -37,6 +37,7 @@ function configure_tobiko {
     configure_tobiko_nova "${tobiko_conf_file}"
     configure_tobiko_neutron "${tobiko_conf_file}"
     configure_tobiko_ssh "${tobiko_conf_file}"
+    configure_tobiko_tripleo "${tobiko_conf_file}"
 
     echo_summary "Apply changes to actual ${TOBIKO_CONF_FILE} file."
     sudo mkdir -p $(dirname "${TOBIKO_CONF_FILE}")
@@ -184,6 +185,16 @@ function configure_tobiko_ssh {
     )
 }
 
+
+function configure_tobiko_tripleo {
+    echo_summary "Write [tripleo] section to ${TOBIKO_CONF_FILE}"
+    local tobiko_conf_file=$1
+
+    # Ensure Tobiko will skip looking for the undercloud node
+    iniset "${tobiko_conf_file}" tripleo undercloud_ssh_hostname ""
+}
+
+
 function configure_key_file {
     local tobiko_conf_file=$1