diff --git a/Dockerfile b/Dockerfile
index 4904cdf6f9..3782994e13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -100,7 +100,7 @@ ENTRYPOINT ["/app/app-docker-entrypoint.sh"]
 
 # completely self-contained
 
-FROM exceptionless/elasticsearch:8.19.15 AS exceptionless
+FROM exceptionless/elasticsearch:8.19.21 AS exceptionless
 
 WORKDIR /app
 COPY --from=job-publish /app/src/Exceptionless.Job/out ./
diff --git a/build/docker/elasticsearch/8.x/Dockerfile b/build/docker/elasticsearch/8.x/Dockerfile
index bbab4cc3bc..c2dc4e0d49 100644
--- a/build/docker/elasticsearch/8.x/Dockerfile
+++ b/build/docker/elasticsearch/8.x/Dockerfile
@@ -1,5 +1,5 @@
 # https://www.docker.elastic.co/
-FROM docker.elastic.co/elasticsearch/elasticsearch:8.19.15
+FROM docker.elastic.co/elasticsearch/elasticsearch:8.19.21
 
 RUN elasticsearch-plugin install -b mapper-size
 
diff --git a/docker/docker-compose.apm.yml b/docker/docker-compose.apm.yml
index bd55972eb9..0592e55d38 100644
--- a/docker/docker-compose.apm.yml
+++ b/docker/docker-compose.apm.yml
@@ -2,7 +2,7 @@ version: "2.2"
 
 services:
   setup:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.19.15
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.19.21
     volumes:
       - certs:/usr/share/elasticsearch/config/certs
     user: "0"
@@ -53,7 +53,7 @@ services:
     depends_on:
       setup:
         condition: service_healthy
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.19.15
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.19.21
     volumes:
       - certs:/usr/share/elasticsearch/config/certs
       - esdata:/usr/share/elasticsearch/data
@@ -98,7 +98,7 @@ services:
     depends_on:
       elasticsearch:
         condition: service_healthy
-    image: docker.elastic.co/kibana/kibana:8.19.15
+    image: docker.elastic.co/kibana/kibana:8.19.21
     volumes:
       - certs:/usr/share/kibana/config/certs
     ports:
@@ -124,7 +124,7 @@ services:
     depends_on:
       elasticsearch:
         condition: service_healthy
-    image: docker.elastic.co/apm/apm-server:8.19.15
+    image: docker.elastic.co/apm/apm-server:8.19.21
     volumes:
       - certs:/usr/share/apm-server/certs
     ports:
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index a18d81b4cf..66a8216fc2 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -50,7 +50,7 @@ services:
       - appdata:/app/storage
 
   elasticsearch:
-    image: exceptionless/elasticsearch:8.19.15
+    image: exceptionless/elasticsearch:8.19.21
     environment:
       discovery.type: single-node
       xpack.security.enabled: "false"
@@ -74,7 +74,7 @@ services:
   kibana:
     depends_on:
       - elasticsearch
-    image: docker.elastic.co/kibana/kibana:8.19.15
+    image: docker.elastic.co/kibana/kibana:8.19.21
     ports:
       - 5601:5601
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index c81594d41f..4c1912bda9 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   elasticsearch:
-    image: exceptionless/elasticsearch:8.19.15
+    image: exceptionless/elasticsearch:8.19.21
     environment:
       node.name: elasticsearch
       cluster.name: exceptionless
@@ -26,7 +26,7 @@ services:
   kibana:
     depends_on:
       - elasticsearch
-    image: docker.elastic.co/kibana/kibana:8.19.15
+    image: docker.elastic.co/kibana/kibana:8.19.21
     environment:
       xpack.security.enabled: "false"
     ports:
diff --git a/k8s/elastic-monitor.yaml b/k8s/elastic-monitor.yaml
index 943cde867d..ddde6dea81 100644
--- a/k8s/elastic-monitor.yaml
+++ b/k8s/elastic-monitor.yaml
@@ -4,7 +4,7 @@ metadata:
   name: elastic-monitor
   namespace: elastic-system
 spec:
-  version: 8.19.15
+  version: 8.19.21
   podDisruptionBudget: {}
   nodeSets:
     - name: main
@@ -228,7 +228,7 @@ metadata:
   name: kibana-monitor
   namespace: elastic-system
 spec:
-  version: 8.19.15
+  version: 8.19.21
   count: 1
   http:
     tls:
@@ -364,7 +364,7 @@ metadata:
   name: fleet-server
   namespace: elastic-system
 spec:
-  version: 8.19.15
+  version: 8.19.21
   kibanaRef:
     name: kibana-monitor
   elasticsearchRefs:
@@ -388,7 +388,7 @@ metadata:
   name: elastic-agent
   namespace: elastic-system
 spec:
-  version: 8.19.15
+  version: 8.19.21
   kibanaRef:
     name: kibana-monitor
   fleetServerRef:
diff --git a/k8s/ex-dev-elasticsearch.yaml b/k8s/ex-dev-elasticsearch.yaml
index 46f14cc5eb..5bd8457402 100644
--- a/k8s/ex-dev-elasticsearch.yaml
+++ b/k8s/ex-dev-elasticsearch.yaml
@@ -14,8 +14,8 @@ metadata:
   name: ex-dev
   namespace: ex-dev
 spec:
-  version: 8.19.15
-  image: exceptionless/elasticsearch:8.19.15 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
+  version: 8.19.21
+  image: exceptionless/elasticsearch:8.19.21 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
   secureSettings:
     - secretName: ex-dev-snapshots
   http:
@@ -68,7 +68,7 @@ metadata:
   name: ex-dev
   namespace: ex-dev
 spec:
-  version: 8.19.15
+  version: 8.19.21
   count: 1
   elasticsearchRef:
     name: ex-dev
diff --git a/k8s/ex-prod-elasticsearch.yaml b/k8s/ex-prod-elasticsearch.yaml
index f159ae3046..12e9499c12 100644
--- a/k8s/ex-prod-elasticsearch.yaml
+++ b/k8s/ex-prod-elasticsearch.yaml
@@ -14,8 +14,8 @@ metadata:
   name: ex-prod
   namespace: ex-prod
 spec:
-  version: 8.19.15
-  image: exceptionless/elasticsearch:8.19.15 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
+  version: 8.19.21
+  image: exceptionless/elasticsearch:8.19.21 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
   monitoring:
     metrics:
       elasticsearchRefs:
@@ -79,7 +79,7 @@ metadata:
   name: ex-prod
   namespace: ex-prod
 spec:
-  version: 8.19.15
+  version: 8.19.21
   count: 1
   elasticsearchRef:
     name: ex-prod
diff --git a/k8s/exceptionless/values.yaml b/k8s/exceptionless/values.yaml
index db1c202926..d210af82a0 100644
--- a/k8s/exceptionless/values.yaml
+++ b/k8s/exceptionless/values.yaml
@@ -36,7 +36,7 @@ elasticsearch:
   connectionString:
   image:
     repository: exceptionless/elasticsearch
-    tag: 8.19.15
+    tag: 8.19.21
     pullPolicy: IfNotPresent
 
 redis:
diff --git a/samples/docker-compose.all-in-one.yml b/samples/docker-compose.all-in-one.yml
index 5b1caf2d42..f604d357f2 100644
--- a/samples/docker-compose.all-in-one.yml
+++ b/samples/docker-compose.all-in-one.yml
@@ -20,7 +20,7 @@ services:
   kibana:
     depends_on:
       - elasticsearch
-    image: docker.elastic.co/kibana/kibana:8.19.15
+    image: docker.elastic.co/kibana/kibana:8.19.21
     ports:
       - 5601:5601
 
diff --git a/samples/docker-compose.yml b/samples/docker-compose.yml
index d73e0518c9..754d063bdb 100644
--- a/samples/docker-compose.yml
+++ b/samples/docker-compose.yml
@@ -44,7 +44,7 @@ services:
       - ex_appdata:/app/storage
 
   elasticsearch:
-    image: exceptionless/elasticsearch:8.19.15
+    image: exceptionless/elasticsearch:8.19.21
     environment:
       discovery.type: single-node
       xpack.security.enabled: "false"
@@ -58,7 +58,7 @@ services:
   kibana:
     depends_on:
       - elasticsearch
-    image: docker.elastic.co/kibana/kibana:8.19.15
+    image: docker.elastic.co/kibana/kibana:8.19.21
     ports:
       - 5601:5601
 
diff --git a/src/Exceptionless.AppHost/Extensions/ElasticsearchExtensions.cs b/src/Exceptionless.AppHost/Extensions/ElasticsearchExtensions.cs
index ec5c5e4031..689fb8411c 100644
--- a/src/Exceptionless.AppHost/Extensions/ElasticsearchExtensions.cs
+++ b/src/Exceptionless.AppHost/Extensions/ElasticsearchExtensions.cs
@@ -13,7 +13,7 @@ public static class ElasticsearchBuilderExtensions
     private const int KibanaPort = 5601;
 
     /// <summary>
-    /// Adds a Elasticsearch container to the application model. The default image is "docker.elastic.co/elasticsearch/elasticsearch". This version the package defaults to the 8.19.15 tag of the Elasticsearch container image
+    /// Adds a Elasticsearch container to the application model. The default image is "docker.elastic.co/elasticsearch/elasticsearch". This version the package defaults to the 8.19.21 tag of the Elasticsearch container image
     /// </summary>
     /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
     /// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
@@ -121,7 +121,7 @@ internal static class ElasticsearchContainerImageTags
     public const string Image = "exceptionless/elasticsearch";
     public const string KibanaRegistry = "docker.elastic.co";
     public const string KibanaImage = "kibana/kibana";
-    public const string Tag = "8.19.15";
+    public const string Tag = "8.19.21";
 }
 
 internal sealed class ElasticsearchConnectionHealthCheck(Func<string?> connectionStringFactory) : IHealthCheck