diff --git a/contrib/DockerFileBuildHelper/DockerFileBuildHelper.csproj b/contrib/DockerFileBuildHelper/DockerFileBuildHelper.csproj
index 532ab8b1..5aea2aca 100644
--- a/contrib/DockerFileBuildHelper/DockerFileBuildHelper.csproj
+++ b/contrib/DockerFileBuildHelper/DockerFileBuildHelper.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <LangVersion>8</LangVersion>
+    <TargetFramework>net10.0</TargetFramework>
+    <LangVersion>12</LangVersion>
     <StartupObject>DockerFileBuildHelper.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
diff --git a/docker-compose-generator/Dockerfile b/docker-compose-generator/Dockerfile
index b1c10968..04608397 100644
--- a/docker-compose-generator/Dockerfile
+++ b/docker-compose-generator/Dockerfile
@@ -1,5 +1,5 @@
 #
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.404-bookworm-slim AS builder
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0.201-noble AS builder
 WORKDIR /source
 COPY src/docker-compose-generator.csproj docker-compose-generator.csproj
 # Cache some dependencies
@@ -8,7 +8,7 @@ COPY src/. .
 RUN dotnet publish --output /app/ --configuration Release
 
 #
-FROM mcr.microsoft.com/dotnet/runtime:8.0.11-bookworm-slim
+FROM mcr.microsoft.com/dotnet/runtime:10.0.5-noble
 LABEL org.btcpayserver.image=docker-compose-generator
 WORKDIR /datadir
 WORKDIR /app
diff --git a/docker-compose-generator/src/docker-compose-generator.csproj b/docker-compose-generator/src/docker-compose-generator.csproj
index 293fad44..4754dc45 100644
--- a/docker-compose-generator/src/docker-compose-generator.csproj
+++ b/docker-compose-generator/src/docker-compose-generator.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <LangVersion>12</LangVersion>
-	<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net8.0</TargetFramework>
+	<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net10.0</TargetFramework>
   <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">$(TargetFrameworkOverride)</TargetFramework>
 	<RootNamespace>DockerGenerator</RootNamespace>
   </PropertyGroup>