diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml
index 3e42701..f22accc 100644
--- a/roles/bitbucket_dataset_restore/tasks/main.yml
+++ b/roles/bitbucket_dataset_restore/tasks/main.yml
@@ -5,8 +5,7 @@
 - name: wait for port 7990 to be up
   wait_for:
     port: 7990
-    delay: 10
-    timeout: 60
+    delay: 60
 
 - name: Copy Bitbucket dataset from s3
   get_url:
@@ -23,4 +22,7 @@
     body_format: json
     return_content: yes
   register: response
+  until: response.status == 200
+  retries: 6
+  delay: 10
   failed_when: "'INITIALISING' not in response.content"
\ No newline at end of file