diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5df734e32..429591bbf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   fast_tests:
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:2024.11.1
     steps:
       - checkout
       - run:
@@ -10,7 +10,7 @@ jobs:
             cd .circleci && ./run-tests.sh "Fast=Fast|ThirdParty=ThirdParty" && ./can-build.sh
   selenium_tests:
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:2024.11.1
     steps:
       - checkout
       - run:
@@ -18,7 +18,7 @@ jobs:
             cd .circleci && ./run-tests.sh "Selenium=Selenium"
   integration_tests:
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:2024.11.1
     steps:
       - checkout
       - run:
@@ -26,7 +26,7 @@ jobs:
             cd .circleci && ./run-tests.sh "Integration=Integration"
   trigger_docs_build:
     machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:2024.11.1
     steps:
       - run:
           command: |
diff --git a/.circleci/run-tests.sh b/.circleci/run-tests.sh
index 8f37a38cd..acd577e84 100755
--- a/.circleci/run-tests.sh
+++ b/.circleci/run-tests.sh
@@ -2,8 +2,8 @@
 set -e
 
 cd ../BTCPayServer.Tests
-docker-compose -v
-docker-compose -f "docker-compose.altcoins.yml" down --v
+docker-compose --version
+docker-compose -f "docker-compose.altcoins.yml" down -v
 
 # For some reason, docker-compose pull fails time to time, so we try several times
 n=0
diff --git a/BTCPayServer.Tests/BTCPayServer.Tests.csproj b/BTCPayServer.Tests/BTCPayServer.Tests.csproj
index e000157bd..29249d126 100644
--- a/BTCPayServer.Tests/BTCPayServer.Tests.csproj
+++ b/BTCPayServer.Tests/BTCPayServer.Tests.csproj
@@ -39,8 +39,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.15" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.16" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.11" />
     <PackageReference Include="Selenium.Support" Version="4.1.1" />
     <PackageReference Include="Selenium.WebDriver" Version="4.22.0" />
diff --git a/BTCPayServer.Tests/Dockerfile b/BTCPayServer.Tests/Dockerfile
index 52fa208c6..7cc24cccb 100644
--- a/BTCPayServer.Tests/Dockerfile
+++ b/BTCPayServer.Tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0.101-bookworm-slim AS builder
+FROM mcr.microsoft.com/dotnet/sdk:8.0.404-bookworm-slim AS builder
 
 RUN apt-get update && apt-get install -y --no-install-recommends chromium-driver \
     && rm -rf /var/lib/apt/lists/*
diff --git a/BTCPayServer.Tests/xunit.runner.json b/BTCPayServer.Tests/xunit.runner.json
index d58dae577..e4f38ad43 100644
--- a/BTCPayServer.Tests/xunit.runner.json
+++ b/BTCPayServer.Tests/xunit.runner.json
@@ -1,6 +1,5 @@
 {
     "maxParallelThreads": 4,
     "longRunningTestSeconds": 60,
-    "diagnosticMessages": true,
     "methodDisplay": "method"
 }
diff --git a/Dockerfile b/Dockerfile
index e7f4f415e..80f28afbb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.203-bookworm-slim AS builder
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.404-bookworm-slim AS builder
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
 WORKDIR /source
 COPY nuget.config nuget.config
@@ -21,7 +21,7 @@ ARG CONFIGURATION_NAME=Release
 ARG GIT_COMMIT
 RUN cd BTCPayServer && dotnet publish -p:GitCommit=${GIT_COMMIT} --output /app/ --configuration ${CONFIGURATION_NAME}
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0.3-bookworm-slim
+FROM mcr.microsoft.com/dotnet/aspnet:8.0.11-bookworm-slim
 
 RUN apt-get update && apt-get install -y --no-install-recommends iproute2 openssh-client \
     && rm -rf /var/lib/apt/lists/*