diff --git a/ansible/roles/ironic/tasks/bootstrap.yml b/ansible/roles/ironic/tasks/bootstrap.yml
index 0763380b4b..b98f202432 100644
--- a/ansible/roles/ironic/tasks/bootstrap.yml
+++ b/ansible/roles/ironic/tasks/bootstrap.yml
@@ -44,6 +44,8 @@
       database_user: "{{ ironic_inspector_database_user }}"
       database_password: "{{ ironic_inspector_database_password }}"
       group: "ironic-inspector"
+  loop_control:
+    label: "{{ item.database_name }}"
   when:
     - not use_preconfigured_databases | bool
     - inventory_hostname in groups[item.group]
diff --git a/ansible/roles/nova/tasks/bootstrap.yml b/ansible/roles/nova/tasks/bootstrap.yml
index 8f43f8fb5d..130b9d9ce6 100644
--- a/ansible/roles/nova/tasks/bootstrap.yml
+++ b/ansible/roles/nova/tasks/bootstrap.yml
@@ -41,6 +41,8 @@
     - database_name: "{{ nova_api_database_name }}"
       database_username: "{{ nova_api_database_user }}"
       database_password: "{{ nova_api_database_password }}"
+  loop_control:
+    label: "{{ item.database_name }}"
   run_once: True
   delegate_to: "{{ groups['nova-api'][0] }}"
   when: