diff --git a/.codex/environments/environment.toml b/.codex/environments/environment.toml
index 2fa6e2ed3c..8b525d054a 100644
--- a/.codex/environments/environment.toml
+++ b/.codex/environments/environment.toml
@@ -155,6 +155,6 @@ if command -v docker >/dev/null 2>&1 && docker info >/dev/null 2>&1; then
     Exceptionless-Mail \
     2>/dev/null || true
 
-  docker volume rm exceptionless.data.v1 2>/dev/null || true
+  docker volume rm exceptionless.data.v2 2>/dev/null || true
 fi
 '''
diff --git a/src/Exceptionless.AppHost/Extensions/ElasticsearchExtensions.cs b/src/Exceptionless.AppHost/Extensions/ElasticsearchExtensions.cs
index de5eb373f7..0107183c53 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.22 tag of the Elasticsearch container image
+    /// Adds an Elasticsearch container using exceptionless/elasticsearch:9.5.4, including the mapper-size plugin.
     /// </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>
@@ -125,7 +125,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.22";
+    public const string Tag = "9.5.4";
 }
 
 internal sealed class ElasticsearchConnectionHealthCheck(Func<string?> connectionStringFactory) : IHealthCheck
diff --git a/src/Exceptionless.AppHost/Program.cs b/src/Exceptionless.AppHost/Program.cs
index 9969a49efc..ecbf4c2a16 100644
--- a/src/Exceptionless.AppHost/Program.cs
+++ b/src/Exceptionless.AppHost/Program.cs
@@ -21,7 +21,8 @@
 const string SharedEmailConnectionString = "smtp://localhost:1026";
 
 var elastic = builder.AddElasticsearch("Elasticsearch", port: 9200)
-    .WithDataVolume("exceptionless.data.v1")
+    // Increment the volume version for breaking data changes and preserve the previous volume.
+    .WithDataVolume("exceptionless.data.v2")
     .WithEndpointProxySupport(false);
 
 // Backend tests use in-memory queues/cache and scoped file storage. Starting the