diff --git a/playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml b/playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml
index 9126973d8..de6790118 100644
--- a/playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml
+++ b/playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml
@@ -17,9 +17,9 @@
 - name: "Update facts from ironic to fill in any missing values"
   include: update_facts_from_ironic.yaml
 
-- name: "Identify ssh_public_key if ssh_public_key_path is defined"
+- name: "Identify ssh_public_key from ssh_public_key_path"
   include: ssh_public_key_path.yaml
-  when: ssh_public_key is undefined and ssh_public_key_path is defined
+  when: ssh_public_key is undefined
 
 - name: "Make temporary folder to build configdrive"
   local_action: command mktemp -d