diff --git a/ansible/roles/baremetal/tasks/append_to_etc_hosts.yml b/ansible/roles/baremetal/tasks/append_to_etc_hosts.yml
index 8b26d01016..b6eb60581a 100644
--- a/ansible/roles/baremetal/tasks/append_to_etc_hosts.yml
+++ b/ansible/roles/baremetal/tasks/append_to_etc_hosts.yml
@@ -2,12 +2,12 @@
 - name: get real node hostname
   shell: echo $(hostname)
   register: real_node_hostname
-  delegate_to: "{{ baremetal_node }}"
+  delegate_to: "{{ control_node }}"
 
 - name: get real node ip
-  shell: ip -4 addr show "{{ hostvars[baremetal_node]['baremetal_nic'] }}" | grep -oP "(?<=inet )[\d\.]+(?=/)"
+  shell: ip -4 addr show "{{ hostvars[control_node]['baremetal_nic'] }}" | grep -oP "(?<=inet )[\d\.]+(?=/)"
   register: real_node_ip
-  delegate_to: "{{ baremetal_node }}"
+  delegate_to: "{{ control_node }}"
 
 - name: Insert hosts entries for all kolla-ansible hosts
   lineinfile:
diff --git a/ansible/roles/baremetal/tasks/pre-install.yml b/ansible/roles/baremetal/tasks/pre-install.yml
index 9aa13c2564..2e8f37c84b 100644
--- a/ansible/roles/baremetal/tasks/pre-install.yml
+++ b/ansible/roles/baremetal/tasks/pre-install.yml
@@ -39,9 +39,9 @@
   when: customize_etc_hosts | bool == True
 
 - include: append_to_etc_hosts.yml
-  with_inventory_hostnames: baremetal
+  with_inventory_hostnames: control
   loop_control:
-    loop_var: baremetal_node
+    loop_var: control_node
   become: True
   when: customize_etc_hosts | bool == True