diff --git a/.config/mise/tasks/github/actions/docker-compose-smoke b/.config/mise/tasks/github/actions/docker-compose-smoke
index 1442513e6..8d2721b13 100755
--- a/.config/mise/tasks/github/actions/docker-compose-smoke
+++ b/.config/mise/tasks/github/actions/docker-compose-smoke
@@ -8,8 +8,13 @@ fingerprints_before=$(mktemp)
 fingerprints_after=$(mktemp)
 compose_started=0
 cleanup() {
+	status=$?
 	rm -f "$fingerprints_before" "$fingerprints_after"
 	if [ "$compose_started" -eq 1 ]; then
+		if [ "$status" -ne 0 ]; then
+			docker compose ps --all
+			docker compose logs --no-color --tail=200
+		fi
 		docker compose down
 	fi
 }
diff --git a/.github/workflows/build-container-ubuntu-lts.yml b/.github/workflows/build-container-ubuntu-lts.yml
index a06af21fc..3d1da69c8 100644
--- a/.github/workflows/build-container-ubuntu-lts.yml
+++ b/.github/workflows/build-container-ubuntu-lts.yml
@@ -38,7 +38,7 @@ jobs:
         id: select
         uses: TrogonStack/github-actions/actions/runs-on-selector@266fc0eaedf8ec0711fa87f8de24d3ba18087a85
         with:
-          pools-json: '{"github":"ubuntu-latest","blacksmith":"blacksmith-4vcpu-ubuntu-2404"}'
+          pools-json: '{"github":"ubuntu-latest"}'
           default-pool-name: github
 
   build-images:
diff --git a/Dockerfile b/Dockerfile
index edbfe3228..87fcc78bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -69,7 +69,7 @@ WORKDIR /opt/eventstore
 
 RUN groupadd -g ${GID} "eventstore" && \
     useradd \
-    --no-create-home \
+    --create-home \
     --uid ${UID} \
     --gid "eventstore" \
     "eventstore"
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 9eb964ba0..9711bc967 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -78,8 +78,8 @@
     <PackageVersion Include="System.CommandLine.DragonFruit" Version="0.4.0-alpha.25306.1" />
     <PackageVersion Include="System.ComponentModel.Composition" Version="10.0.10" />
     <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="10.0.10" />
-    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="10.0.10" />
-    <PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.10" />
+    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="10.0.13" />
+    <PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.13" />
     <PackageVersion Include="System.ServiceModel.Http" Version="10.0.652802" />
     <PackageVersion Include="TrogonEventStore.Plugins" Version="24.10.10" />
     <PackageVersion Include="xunit" Version="2.9.3" />
diff --git a/src/EventStore.SourceGenerators.Tests/EventStore.SourceGenerators.Tests.csproj b/src/EventStore.SourceGenerators.Tests/EventStore.SourceGenerators.Tests.csproj
index 9677b5fab..a8beea26a 100644
--- a/src/EventStore.SourceGenerators.Tests/EventStore.SourceGenerators.Tests.csproj
+++ b/src/EventStore.SourceGenerators.Tests/EventStore.SourceGenerators.Tests.csproj
@@ -31,6 +31,7 @@
 		<PackageReference Include="Microsoft.NET.Test.Sdk" />
 		<PackageReference Include="Newtonsoft.Json" />
 		<PackageReference Include="NuGet.Protocol" />
+		<PackageReference Include="System.Security.Cryptography.Pkcs" />
 		<PackageReference Include="xunit" />
 		<PackageReference Include="xunit.runner.visualstudio">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>