diff --git a/Containers/fulltextsearch/Dockerfile b/Containers/fulltextsearch/Dockerfile
index 65a772c0..0130c3b4 100644
--- a/Containers/fulltextsearch/Dockerfile
+++ b/Containers/fulltextsearch/Dockerfile
@@ -1,5 +1,5 @@
 # Probably from here https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/Dockerfile
-FROM elasticsearch:7.17.10
+FROM elasticsearch:8.7.1
 
 USER root
 
diff --git a/php/containers.json b/php/containers.json
index f72fb3f2..40cb0eca 100644
--- a/php/containers.json
+++ b/php/containers.json
@@ -499,10 +499,18 @@
       ],
       "internal_port": "9200",
       "environment": [
+        "POSTGRES_HOST=nextcloud-aio-database",
         "TZ=%TIMEZONE%",
+        "ES_JAVA_OPTS=-Xms1024M -Xmx1024M -Des.enforce.bootstrap.checks=true",
+        "xpack.license.self_generated.type=basic",
+        "xpack.security.enabled=false",
+        "xpack.watcher.enabled=false",
+        "xpack.graph.enabled=false",
+        "xpack.ml.enabled=false",
+        "bootstrap.memory_lock=true",
+        "cluster.name=nextcloud-aio",
         "discovery.type=single-node",
-        "ES_JAVA_OPTS=-Xms1024M -Xmx1024M",
-        "POSTGRES_HOST=nextcloud-aio-database"
+        "thread_pool.write.queue_size=1000"
       ],
       "volumes": [
         {