diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 6c8181fa1..addfc7793 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -58,9 +58,10 @@ body:
     attributes:
       label: AWS Lambda function runtime
       options:
-        - dotnet6
         - dotnet8
         - dotnet8 (AOT)
+        - dotnet10
+        - dotnet10 (AOT)
     validations:
       required: true
   - type: textarea
diff --git a/docs/getting-started/logger/aot.md b/docs/getting-started/logger/aot.md
index f42610893..08edfa7c0 100644
--- a/docs/getting-started/logger/aot.md
+++ b/docs/getting-started/logger/aot.md
@@ -209,7 +209,7 @@ Alternatively, you can use Docker directly for more control:
 
 ```bash
 # Create a build container using Amazon's provided image
-docker run --rm -v $(pwd):/workspace -w /workspace public.ecr.aws/sam/build-dotnet8:latest-x86_64 \
+docker run --rm -v $(pwd):/workspace -w /workspace public.ecr.aws/sam/build-dotnet10:latest-x86_64 \
     bash -c "cd src/PowertoolsAotLoggerDemo && dotnet publish -c Release -r linux-x64 -o publish"
 
 # Deploy using the AWS CLI
@@ -227,7 +227,7 @@ aws lambda create-function \
 
 ```powershell
 # Create a build container using Amazon's provided image
-docker run --rm -v ${PWD}:/workspace -w /workspace public.ecr.aws/sam/build-dotnet8:latest-x86_64 `
+docker run --rm -v ${PWD}:/workspace -w /workspace public.ecr.aws/sam/build-dotnet10:latest-x86_64 `
     bash -c "cd src/PowertoolsAotLoggerDemo && dotnet publish -c Release -r linux-x64 -o publish"
 
 # Deploy using the AWS CLI
diff --git a/libraries/tests/e2e/InfraShared/FunctionConstruct.cs b/libraries/tests/e2e/InfraShared/FunctionConstruct.cs
index 808aecf04..aaf7d1b52 100644
--- a/libraries/tests/e2e/InfraShared/FunctionConstruct.cs
+++ b/libraries/tests/e2e/InfraShared/FunctionConstruct.cs
@@ -13,7 +13,7 @@ public FunctionConstruct(Construct scope, string id, FunctionConstructProps prop
         var framework = "net8.0";
         var distPath = $"{props.DistPath}/deploy_{props.Architecture.Name}_{props.Runtime.Name}.zip";
         var command = props.IsAot
-            ? $"dotnet-lambda package -pl {props.SourcePath} -cmd ../../../ -o {distPath} -farch {props.Architecture.Name} -cifb public.ecr.aws/sam/build-dotnet8"
+            ? $"dotnet-lambda package -pl {props.SourcePath} -cmd ../../../ -o {distPath} -farch {props.Architecture.Name} -cifb public.ecr.aws/sam/build-dotnet10"
             : $"dotnet-lambda package -pl {props.SourcePath} -o {distPath} -f {framework} -farch {props.Architecture.Name}";
         
         Console.WriteLine(command);