diff --git a/docker-compose.yml b/docker-compose.yml
index 909dd8df107..2431b8e99c9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -376,11 +376,12 @@ services:
       - '/var/run/docker.sock:/var/run/docker.sock:ro'
 
   tika-service:
-    image: dadarek/wait-for-dependencies
+    image: owncloudci/wait-for:latest
     container_name: web_tika_service
     depends_on:
       - tika
-    command: tika:9998
+    command:
+      - 'wait-for -it tika:9998 -t 300'
 
   tika:
     image: apache/tika:2.9.1.0