diff --git a/roles/tobiko-configure/tasks/main.yaml b/roles/tobiko-configure/tasks/main.yaml
index ced1afc6d..cc44a1840 100644
--- a/roles/tobiko-configure/tasks/main.yaml
+++ b/roles/tobiko-configure/tasks/main.yaml
@@ -3,7 +3,7 @@
 - name: "pick undercloud SSH shotname from inventory"
   set_fact:
     undercloud_ssh_hostname: >-
-      {{ hostvars[undercloud_hostname].ansible_hostname |
+      {{ hostvars[undercloud_hostname].ansible_fqdn |
          default(undercloud_hostname) }}
   when:
     - (undercloud_ssh_hostname | length) == 0