diff --git a/infrared_plugin/plugin.spec b/infrared_plugin/plugin.spec
index c8dfed24f..ef097af40 100644
--- a/infrared_plugin/plugin.spec
+++ b/infrared_plugin/plugin.spec
@@ -149,6 +149,10 @@ subparsers:
             type: Value
             help: hostname or IP address to be used to connect to undercloud host
             ansible_variable: undercloud_ssh_hostname
+          undercloud_ssh_key_filename:
+            type: Value
+            help: SSH key filename to connect to undercloud host
+            ansible_variable: undercloud_ssh_key_filename
           overcloud-ssh-username:
             type: Value
             help: user name to be used to connect to TripleO Overcloud hosts
diff --git a/roles/tobiko-configure/defaults/main.yaml b/roles/tobiko-configure/defaults/main.yaml
index e3ed2cee1..67d621152 100644
--- a/roles/tobiko-configure/defaults/main.yaml
+++ b/roles/tobiko-configure/defaults/main.yaml
@@ -13,6 +13,7 @@ test_default_conf:
   tripleo:
     undercloud_ssh_hostname: "{{ undercloud_ssh_hostname }}"
     overcloud_ssh_username: "{{ overcloud_ssh_username }}"
+    undercloud_ssh_key_filename: "{{ undercloud_ssh_key_filename }}"
 
 test_log_debug: ''
 
@@ -24,5 +25,6 @@ stackrc_file: '{{ ansible_user_dir }}/overcloudrc'
 
 undercloud_hostname: '{{ groups.get("undercloud", []) | first | default("undercloud-0") }}'
 undercloud_ssh_hostname: ''
+undercloud_ssh_key_filename: ''
 
 overcloud_ssh_username: ''
diff --git a/roles/tobiko-configure/tasks/main.yaml b/roles/tobiko-configure/tasks/main.yaml
index 856ed7825..e38b3902d 100644
--- a/roles/tobiko-configure/tasks/main.yaml
+++ b/roles/tobiko-configure/tasks/main.yaml
@@ -1,6 +1,6 @@
 ---
 
-- name: "pick undercloud SSH shotname from inventory"
+- name: "pick undercloud SSH hostname from inventory"
   set_fact:
     undercloud_ssh_hostname: >-
       {{ hostvars[undercloud_hostname].ansible_fqdn |