diff --git a/Directory.Build.props b/Directory.Build.props
index d1c26c7..e911545 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -5,6 +5,8 @@
     <Nullable>enable</Nullable>
     <BuildInParallel>false</BuildInParallel>
     <RestoreBuildInParallel>false</RestoreBuildInParallel>
+    <MicrosoftExtensionsVersion>8.0.0</MicrosoftExtensionsVersion>
+    <MicrosoftExtensionsVersion Condition="'$(TargetFramework)' == 'net10.0'">10.0.8</MicrosoftExtensionsVersion>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/examples/Spindle.Example.Hosting/Spindle.Example.Hosting.csproj b/examples/Spindle.Example.Hosting/Spindle.Example.Hosting.csproj
index 8377765..27947e5 100644
--- a/examples/Spindle.Example.Hosting/Spindle.Example.Hosting.csproj
+++ b/examples/Spindle.Example.Hosting/Spindle.Example.Hosting.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
+      <PackageReference Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsVersion)" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
diff --git a/examples/Spindle.Example.Observability/Spindle.Example.Observability.csproj b/examples/Spindle.Example.Observability/Spindle.Example.Observability.csproj
index f0121de..e281bbb 100644
--- a/examples/Spindle.Example.Observability/Spindle.Example.Observability.csproj
+++ b/examples/Spindle.Example.Observability/Spindle.Example.Observability.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
+      <PackageReference Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsVersion)" />
       <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.17.0" />
       <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.17.0" />
       <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.17.0" />
diff --git a/src/Spindle.Abstractions/Spindle.Abstractions.csproj b/src/Spindle.Abstractions/Spindle.Abstractions.csproj
index 1049070..291bc6a 100644
--- a/src/Spindle.Abstractions/Spindle.Abstractions.csproj
+++ b/src/Spindle.Abstractions/Spindle.Abstractions.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.8" />
+      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Spindle.Hosting/Spindle.Hosting.csproj b/src/Spindle.Hosting/Spindle.Hosting.csproj
index 80c9184..4d6ba99 100644
--- a/src/Spindle.Hosting/Spindle.Hosting.csproj
+++ b/src/Spindle.Hosting/Spindle.Hosting.csproj
@@ -6,9 +6,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
-      <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.8" />
-      <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.8" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsVersion)" />
+      <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
+      <PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsVersion)" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Spindle.Runtime/Execution/LocalStepExecutor.cs b/src/Spindle.Runtime/Execution/LocalStepExecutor.cs
index 2245a53..1fe0fbd 100644
--- a/src/Spindle.Runtime/Execution/LocalStepExecutor.cs
+++ b/src/Spindle.Runtime/Execution/LocalStepExecutor.cs
@@ -221,7 +221,15 @@ await storeSession.Leases
         }
         catch (Exception exception)
         {
-            activity?.AddException(exception);
+            activity?.AddEvent(
+                new ActivityEvent(
+                    "exception",
+                    tags: new ActivityTagsCollection
+                    {
+                        { "exception.type", exception.GetType().FullName },
+                        { "exception.message", exception.Message },
+                        { "exception.stacktrace", exception.ToString() },
+                    }));
             try
             {
                 await store
diff --git a/src/Spindle.Runtime/Spindle.Runtime.csproj b/src/Spindle.Runtime/Spindle.Runtime.csproj
index d2dec4a..9f0e19f 100644
--- a/src/Spindle.Runtime/Spindle.Runtime.csproj
+++ b/src/Spindle.Runtime/Spindle.Runtime.csproj
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.8" />
+      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
     </ItemGroup>
 
 </Project>
diff --git a/tests/Spindle.Hosting.Tests/Spindle.Hosting.Tests.csproj b/tests/Spindle.Hosting.Tests/Spindle.Hosting.Tests.csproj
index d648aef..32d2d5c 100644
--- a/tests/Spindle.Hosting.Tests/Spindle.Hosting.Tests.csproj
+++ b/tests/Spindle.Hosting.Tests/Spindle.Hosting.Tests.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
+      <PackageReference Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsVersion)" />
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
       <PackageReference Include="xunit" Version="2.9.3" />
       <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">