diff --git a/docker-compose-generator/linuxamd64.Dockerfile b/docker-compose-generator/linuxamd64.Dockerfile
index 2a37690..9fc4ea3 100644
--- a/docker-compose-generator/linuxamd64.Dockerfile
+++ b/docker-compose-generator/linuxamd64.Dockerfile
@@ -1,5 +1,5 @@
 #
-FROM mcr.microsoft.com/dotnet/sdk:6.0.401-bullseye-slim AS builder
+FROM mcr.microsoft.com/dotnet/sdk:8.0.100-bookworm-slim 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:6.0.9-bullseye-slim
+FROM mcr.microsoft.com/dotnet/runtime:8.0.0-bookworm-slim
 LABEL org.btcpayserver.image=docker-compose-generator
 WORKDIR /datadir
 WORKDIR /app
diff --git a/docker-compose-generator/linuxarm32v7.Dockerfile b/docker-compose-generator/linuxarm32v7.Dockerfile
index ee54ae0..924bdda 100644
--- a/docker-compose-generator/linuxarm32v7.Dockerfile
+++ b/docker-compose-generator/linuxarm32v7.Dockerfile
@@ -1,5 +1,5 @@
 # This is a manifest image, will pull the image with the same arch as the builder machine
-FROM mcr.microsoft.com/dotnet/sdk:6.0.401-bullseye-slim AS builder
+FROM mcr.microsoft.com/dotnet/sdk:8.0.100-bookworm-slim 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
 
 # Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program
-FROM mcr.microsoft.com/dotnet/runtime:6.0.9-bullseye-slim-arm32v7
+FROM mcr.microsoft.com/dotnet/runtime:8.0.0-bookworm-slim-arm32v7
 LABEL org.btcpayserver.image=docker-compose-generator
 WORKDIR /datadir
 
diff --git a/docker-compose-generator/linuxarm64v8.Dockerfile b/docker-compose-generator/linuxarm64v8.Dockerfile
index f6b88fa..2d56ac6 100644
--- a/docker-compose-generator/linuxarm64v8.Dockerfile
+++ b/docker-compose-generator/linuxarm64v8.Dockerfile
@@ -1,5 +1,5 @@
 # This is a manifest image, will pull the image with the same arch as the builder machine
-FROM mcr.microsoft.com/dotnet/sdk:6.0.401-bullseye-slim AS builder
+FROM mcr.microsoft.com/dotnet/sdk:8.0.100-bookworm-slim 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
 
 # Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program
-FROM mcr.microsoft.com/dotnet/runtime:6.0.9-bullseye-slim-arm64v8
+FROM mcr.microsoft.com/dotnet/runtime:8.0.0-bookworm-slim-arm64v8
 LABEL org.btcpayserver.image=docker-compose-generator
 WORKDIR /datadir
 
diff --git a/docker-compose-generator/src/docker-compose-generator.csproj b/docker-compose-generator/src/docker-compose-generator.csproj
index d26d8be..293fad4 100644
--- a/docker-compose-generator/src/docker-compose-generator.csproj
+++ b/docker-compose-generator/src/docker-compose-generator.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <LangVersion>10.0</LangVersion>
-	<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net6.0</TargetFramework>
+    <LangVersion>12</LangVersion>
+	<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net8.0</TargetFramework>
   <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">$(TargetFrameworkOverride)</TargetFramework>
 	<RootNamespace>DockerGenerator</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="YamlDotNet" Version="8.0.0" />
+	  <PackageReference Include="YamlDotNet" Version="13.7.1" />
   </ItemGroup>
 </Project>