diff --git a/tasks/main.yml b/tasks/main.yml
index a3ae506..7ec98e2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -129,10 +129,15 @@
 - name: "Test whether Nextcloud is healthy from the outside"
   become: false
   uri:
-    url: https://{{ nextcloud_virtual_host }}/login
+    url: "{{ nextcloud_overwrite_cli_url }}/login"
+    return_content: yes
     timeout: 300
     validate_certs: no
+  register: url_check
   delegate_to: localhost
+  until: "'Nextcloud' in url_check.content"
+  retries: 5
+  delay: 10
   tags: health
 
 - debug: