diff --git a/tasks/persistent_cloud_new.yml b/tasks/persistent_cloud_new.yml
index 184a93a1bb..a69fe5f4c8 100644
--- a/tasks/persistent_cloud_new.yml
+++ b/tasks/persistent_cloud_new.yml
@@ -5,7 +5,7 @@
   register: host_is_up
   ignore_errors: true
 
-- name: clean out old known_hosts
+- name: clean out old known_hosts (name based entries)
   local_action: known_hosts path={{item}} host={{inventory_hostname}} state=absent
   ignore_errors: True
   with_items:
@@ -13,6 +13,14 @@
   - /etc/ssh/ssh_known_hosts
   when: host_is_up|failed
 
+- name: clean out old known_hosts (IP based entries)
+  local_action: known_hosts path={{item}} host={{inventory_hostname | ipaddr}} state=absent
+  ignore_errors: True
+  with_items:
+  - /root/.ssh/known_hosts
+  - /etc/ssh/ssh_known_hosts
+  when: host_is_up|failed
+
 - name: spin UP VM using nova_compute
   sudo: False
   local_action: