diff --git a/containers/zammad-elasticsearch/Dockerfile b/containers/zammad-elasticsearch/Dockerfile
index c68953f..0febf09 100644
--- a/containers/zammad-elasticsearch/Dockerfile
+++ b/containers/zammad-elasticsearch/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.5
+FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.8
 MAINTAINER Zammad <info@zammad.org>
 ARG BUILD_DATE
 
diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh
index 56a2802..33202be 100644
--- a/containers/zammad/docker-entrypoint.sh
+++ b/containers/zammad/docker-entrypoint.sh
@@ -75,7 +75,7 @@ if [ "$1" = 'zammad-init' ]; then
     sleep 5
   done
 
-  if [ -n "$(curl -s ${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}/_cat/indices |grep zammad)" ]; then
+  if [ -z "$(curl -s ${ELASTICSEARCH_HOST}:${ELASTICSEARCH_PORT}/_cat/indices |grep zammad)" ]; then
     echo "rebuilding es searchindex..."
     bundle exec rake searchindex:rebuild
   fi