diff --git a/scripts/dockerLimitMemory.sh b/scripts/dockerLimitMemory.sh
index d4979e1304..965519f354 100644
--- a/scripts/dockerLimitMemory.sh
+++ b/scripts/dockerLimitMemory.sh
@@ -6,16 +6,16 @@ docker stats --no-stream
 
 #limit memory used by each container
 docker update --memory=2Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco_' | awk '{print $1}')
-docker update --memory=1Gb --memory-swap -1 $(docker ps -a | grep '_search_' | awk '{print $1}')
+docker update --memory=1.5Gb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_search_' | awk '{print $1}')
 #docker update --memory=1Gb --memory-swap -1 $(docker ps -a | grep '_zeppelin_' | awk '{print $1}')
-docker update --memory=256Mb --memory-swap -1 $(docker ps -a | grep '_postgres_' | awk '{print $1}')
-docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_transform-router_' | awk '{print $1}')
-docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_imagemagick_' | awk '{print $1}')
-docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_alfresco-pdf-renderer_' | awk '{print $1}')
-docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}')
-docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_tika_' | awk '{print $1}')
-docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_libreoffice_' | awk '{print $1}')
-docker update --memory=512Mb --memory-swap -1 $(docker ps -a | grep '_activemq_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_postgres_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_transform-router_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_imagemagick_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_alfresco-pdf-renderer_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_shared-file-store_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_tika_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_libreoffice_' | awk '{print $1}')
+docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}')
 
 #stop not needed container
 docker stop $(docker ps -a | grep '_zeppelin_' | awk '{print $1}')