diff --git a/.github/workflows/build-and-publish-pre-release.yml b/.github/workflows/build-and-publish-pre-release.yml
index df18a99c..90e8a792 100644
--- a/.github/workflows/build-and-publish-pre-release.yml
+++ b/.github/workflows/build-and-publish-pre-release.yml
@@ -28,7 +28,7 @@ jobs:
   # @@required: main
   build-pre-release:
 
-    runs-on: [self-hosted, linux, build]
+    runs-on: ${{ startsWith(vars.PRE_RELEASE_BUILD_ENVIRONMENT, '[') && fromJSON(vars.PRE_RELEASE_BUILD_ENVIRONMENT) || vars.PRE_RELEASE_BUILD_ENVIRONMENT || 'ubuntu-latest' }}
 
     env:
       # Which NPM Registry to use
diff --git a/src/BuildBot/BuildBot.csproj b/src/BuildBot/BuildBot.csproj
index 81821b31..d74cd0ea 100644
--- a/src/BuildBot/BuildBot.csproj
+++ b/src/BuildBot/BuildBot.csproj
@@ -33,8 +33,8 @@
     <OptimizationPreference>speed</OptimizationPreference>
     <OutputType>Exe</OutputType>
     <PackageTags>FunFair BuildBot</PackageTags>
-    <PublishAot>false</PublishAot>
-    <PublishTrimmed>false</PublishTrimmed>
+    <PublishAot>true</PublishAot>
+    <PublishTrimmed>true</PublishTrimmed>
     <RepositoryUrl>https://github.com/funfair-tech/BuildBot</RepositoryUrl>
     <RunAOTCompilation>false</RunAOTCompilation>
     <RuntimeIdentifiers>win-x64;win-arm64;osx-x64;osx-arm64;linux-x64;linux-arm64</RuntimeIdentifiers>
@@ -85,7 +85,6 @@
     <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="10.0.12" IncludeAssets="compile;runtime" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.12" IncludeAssets="compile;runtime" />
     <PackageReference Include="Serilog" Version="4.4.0" IncludeAssets="compile;runtime;build;buildTransitive" />
-    <PackageReference Include="Serilog.Enrichers.Demystifier" Version="1.0.3" IncludeAssets="compile;runtime" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" IncludeAssets="compile;runtime" />
     <PackageReference Include="Serilog.Enrichers.Process" Version="3.0.0" IncludeAssets="compile;runtime" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" IncludeAssets="compile;runtime" />
diff --git a/src/BuildBot/Helpers/ServerStartup.cs b/src/BuildBot/Helpers/ServerStartup.cs
index bd6bdc34..f52fa2a9 100644
--- a/src/BuildBot/Helpers/ServerStartup.cs
+++ b/src/BuildBot/Helpers/ServerStartup.cs
@@ -124,7 +124,6 @@ private static void ConfigureLogging(ILoggingBuilder logger)
     private static Logger CreateLogger()
     {
         return new LoggerConfiguration()
-            .Enrich.WithDemystifiedStackTraces()
             .Enrich.FromLogContext()
             .Enrich.WithMachineName()
             .Enrich.WithProcessId()