diff --git a/tasks/main.yml b/tasks/main.yml
index 267bc7f..7e7e577 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -52,23 +52,16 @@
     that:
       - "output.ansible_facts['collabora']['collabora-online_collabora_1'].state.running"
 
-- name: "Wait for Collabora service (443/TLS) to become available from the public internet"
-  become: false
-  wait_for:
-    host: "{{ collabora_virtual_host }}"
-    port: 443
-  delegate_to: localhost
-
 - name: "Test whether Collabora is healthy from the public internet"
   become: false
   uri:
     url: https://{{ collabora_virtual_host }}
     return_content: yes
-    timeout: 600
+    timeout: 300
     validate_certs: no
   register: url_check
   delegate_to: localhost
-
-- fail:
-    msg: 'Collabora is not available!'
-  when: "'OK' not in url_check.content"
+  until: "'OK' in url_check.content"
+  retries: 5
+  delay: 10
+  tags: health