diff --git a/docker-compose.datastores.yml b/docker-compose.datastores.yml
index 1e019153b5..187cb7040b 100644
--- a/docker-compose.datastores.yml
+++ b/docker-compose.datastores.yml
@@ -51,6 +51,10 @@ services:
 
   elasticsearch:
     image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-elasticsearch:$PHRASEANET_DOCKER_TAG
+    ulimits:
+      nofile:
+        soft: 65536
+        hard: 65536
     profiles: ["elasticsearch"]
     build: ./docker/elasticsearch
     restart: on-failure
diff --git a/stack.sh b/stack.sh
index 9682839e7e..1d03847681 100755
--- a/stack.sh
+++ b/stack.sh
@@ -44,6 +44,11 @@ stack_status() {
 display_info() {
     echo "Checking environment information..."
     echo
+
+    # Kernel version (Linux and macOS compatible)
+    echo "Kernel Version:"
+    uname -sr
+    echo
     
     check_compose_version