diff --git a/mastodon/docker-compose.yml b/mastodon/docker-compose.yml
index a44aa65..4c75490 100644
--- a/mastodon/docker-compose.yml
+++ b/mastodon/docker-compose.yml
@@ -131,7 +131,7 @@ services:
 #      - triton.cns.services=mastodon-redis
 
   web:
-    image: tootsuite/mastodon:v3.5.3
+    image: tootsuite/mastodon:v4.0.2
     mem_limit: 1g
     restart: always
     env_file: .env.production
@@ -144,7 +144,7 @@ services:
       - triton.cns.services=mastodon-web
 
   streaming:
-    image: tootsuite/mastodon:v3.5.3
+    image: tootsuite/mastodon:v4.0.2
     mem_limit: 1g
     restart: always
     env_file: .env.production
@@ -157,7 +157,7 @@ services:
       - triton.cns.services=mastodon-streaming
 
   sidekiq:
-    image: tootsuite/mastodon:v3.5.3
+    image: tootsuite/mastodon:v4.0.2
     mem_limit: 1g
     restart: always
     env_file: .env.production
@@ -167,14 +167,20 @@ services:
       - triton.cns.services=mastodon-sidekiq
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.4
     mem_limit: 512m
     restart: always
     environment:
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - "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=es-mastodon"
       - "discovery.type=single-node"
-      - "bootstrap.memory_lock=true"
+      - "thread_pool.write.queue_size=1000"
     network_mode: mastodon-fabric
     labels:
       - triton.cns.services=mastodon-elasticsearch
@@ -182,3 +188,6 @@ services:
       memlock:
         soft: -1
         hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536