diff --git a/ansible/roles/mariadb/tasks/bootstrap.yml b/ansible/roles/mariadb/tasks/bootstrap.yml
index aef9392267..c0d38f874d 100644
--- a/ansible/roles/mariadb/tasks/bootstrap.yml
+++ b/ansible/roles/mariadb/tasks/bootstrap.yml
@@ -56,7 +56,7 @@
     - inventory_hostname == groups['mariadb'][0]
 
 - name: Waiting for MariaDB service to be ready
-  command: "docker exec mariadb ls /var/lib/mysql/mariadb.pid"
+  command: "docker exec mariadb ls /var/lib/mysql/{{ item }}"
   register: bootstrap_result
   when:
     - delegate_host == 'None'
@@ -65,3 +65,6 @@
   changed_when: False
   retries: 6
   delay: 10
+  with_items:
+    - cluster.exists
+    - mariadb.pid