diff --git a/cache/entrypoint.sh b/cache/entrypoint.sh
index 24f6491f2e288362a80bd8507ad09cba97b97715..81a77cdfc99c60a582199ac8918d02f9f5957c9b 100644
--- a/cache/entrypoint.sh
+++ b/cache/entrypoint.sh
@@ -1,10 +1,11 @@
 #!/bin/bash -e
 
 SERVICES=${WAIT_SERVICES:=''}
+TIMEOUT=${WAIT_TIMEOUT:='15'}
 
 if [[ ! -z $SERVICES ]] ; then
     for service in $SERVICES ; do
-        wait-for-it $service
+        wait-for-it -t $TIMEOUT $service
     done
 fi
 
diff --git a/core/Dockerfile b/core/Dockerfile
index 040b3f56fca7192829bec34df1e234d263798bc1..c6228df26041db28bd7769954b09e879cdaf2083 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -42,7 +42,6 @@ RUN apt update && \
   apt clean && \
   rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-
 RUN pip3 install . && \
     pip3 install python-keystoneclient python-swiftclient redis
 
@@ -76,6 +75,7 @@ ADD rgbnir_definition.json \
     run-httpd.sh \
     run-registrar.sh \
     registrar.py \
+    mapcache_items_view.sql \
     entrypoint.sh \
     /
 
diff --git a/core/entrypoint.sh b/core/entrypoint.sh
index 5e6c9e95f32fce886b329dd2e4c6c6a45ca5529a..e78b1330d926b5936575619ce36509e11d4d08b3 100644
--- a/core/entrypoint.sh
+++ b/core/entrypoint.sh
@@ -1,10 +1,11 @@
 #!/bin/bash -e
 
 SERVICES=${WAIT_SERVICES:=''}
+TIMEOUT=${WAIT_TIMEOUT:='15'}
 
 if [[ ! -z $SERVICES ]] ; then
     for service in $SERVICES ; do
-        wait-for-it $service
+        wait-for-it -t $TIMEOUT $service
     done
 fi
 
diff --git a/preprocessor/entrypoint.sh b/preprocessor/entrypoint.sh
index 24f6491f2e288362a80bd8507ad09cba97b97715..81a77cdfc99c60a582199ac8918d02f9f5957c9b 100644
--- a/preprocessor/entrypoint.sh
+++ b/preprocessor/entrypoint.sh
@@ -1,10 +1,11 @@
 #!/bin/bash -e
 
 SERVICES=${WAIT_SERVICES:=''}
+TIMEOUT=${WAIT_TIMEOUT:='15'}
 
 if [[ ! -z $SERVICES ]] ; then
     for service in $SERVICES ; do
-        wait-for-it $service
+        wait-for-it -t $TIMEOUT $service
     done
 fi