diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 19ad3643ce..302edbc4f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -162,17 +162,17 @@ jobs:
         run: dotnet run --project build -c release -- unit-test
 
       - name: Publish AOT
-        if: ${{ matrix.os != 'ubuntu-latest' }} # publish containers already validates AOT build
+        if: ${{ github.event_name == 'push' && matrix.os != 'ubuntu-latest' }} # publish containers already validates AOT build
         run: dotnet run --project build -c release -- publishbinaries
-        
+
       - name: Publish Containers
-        if: ${{ matrix.os == 'ubuntu-latest' }} 
+        if: ${{ github.event_name == 'push' && matrix.os == 'ubuntu-latest' }}
         env:
           DOCKER_NO_PUBLISH: true
         run: dotnet run --project build -c release -- publishcontainers
-        
+
       - name: Run Container
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+        if: ${{ github.event_name == 'push' && matrix.os == 'ubuntu-latest' }}
         run: dotnet run --project build -c release -- runlocalcontainer
         
 
diff --git a/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj b/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj
index ff9d136a49..80f98e469f 100644
--- a/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj
+++ b/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj
@@ -6,6 +6,7 @@
     <Nullable>enable</Nullable>
     <!-- CS0618: Obsolete members - DisplayName is deprecated but still used by YAML deserialization -->
     <NoWarn>$(NoWarn);CS0618</NoWarn>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Elastic.Documentation.LegacyDocs/Elastic.Documentation.LegacyDocs.csproj b/src/Elastic.Documentation.LegacyDocs/Elastic.Documentation.LegacyDocs.csproj
index 62dcadb8d0..b25bfc8e2c 100644
--- a/src/Elastic.Documentation.LegacyDocs/Elastic.Documentation.LegacyDocs.csproj
+++ b/src/Elastic.Documentation.LegacyDocs/Elastic.Documentation.LegacyDocs.csproj
@@ -6,6 +6,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>Elastic.Documentation.LegacyDocs</RootNamespace>
+        <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Elastic.Documentation.LinkIndex/Elastic.Documentation.LinkIndex.csproj b/src/Elastic.Documentation.LinkIndex/Elastic.Documentation.LinkIndex.csproj
index e86f0f7745..5af6db6628 100644
--- a/src/Elastic.Documentation.LinkIndex/Elastic.Documentation.LinkIndex.csproj
+++ b/src/Elastic.Documentation.LinkIndex/Elastic.Documentation.LinkIndex.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Elastic.Documentation.Links/Elastic.Documentation.Links.csproj b/src/Elastic.Documentation.Links/Elastic.Documentation.Links.csproj
index ade5da3232..6299cd5c1c 100644
--- a/src/Elastic.Documentation.Links/Elastic.Documentation.Links.csproj
+++ b/src/Elastic.Documentation.Links/Elastic.Documentation.Links.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Elastic.Documentation.Navigation/Elastic.Documentation.Navigation.csproj b/src/Elastic.Documentation.Navigation/Elastic.Documentation.Navigation.csproj
index 4b7075ec90..94dc26fe58 100644
--- a/src/Elastic.Documentation.Navigation/Elastic.Documentation.Navigation.csproj
+++ b/src/Elastic.Documentation.Navigation/Elastic.Documentation.Navigation.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Elastic.Documentation.ServiceDefaults/Elastic.Documentation.ServiceDefaults.csproj b/src/Elastic.Documentation.ServiceDefaults/Elastic.Documentation.ServiceDefaults.csproj
index ef3d8edd85..4bf0ef0294 100644
--- a/src/Elastic.Documentation.ServiceDefaults/Elastic.Documentation.ServiceDefaults.csproj
+++ b/src/Elastic.Documentation.ServiceDefaults/Elastic.Documentation.ServiceDefaults.csproj
@@ -5,6 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsAspireSharedProject>true</IsAspireSharedProject>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Elastic.Documentation/Elastic.Documentation.csproj b/src/Elastic.Documentation/Elastic.Documentation.csproj
index fbc2f8c723..f1ceb02821 100644
--- a/src/Elastic.Documentation/Elastic.Documentation.csproj
+++ b/src/Elastic.Documentation/Elastic.Documentation.csproj
@@ -5,6 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>Elastic.Documentation</RootNamespace>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/authoring/Elastic.Documentation.Refactor/Elastic.Documentation.Refactor.csproj b/src/authoring/Elastic.Documentation.Refactor/Elastic.Documentation.Refactor.csproj
index f8c18faad7..825c3e80a2 100644
--- a/src/authoring/Elastic.Documentation.Refactor/Elastic.Documentation.Refactor.csproj
+++ b/src/authoring/Elastic.Documentation.Refactor/Elastic.Documentation.Refactor.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/services/Elastic.Changelog/Elastic.Changelog.csproj b/src/services/Elastic.Changelog/Elastic.Changelog.csproj
index cf1cb5a68a..f48857ea8f 100644
--- a/src/services/Elastic.Changelog/Elastic.Changelog.csproj
+++ b/src/services/Elastic.Changelog/Elastic.Changelog.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/services/Elastic.Documentation.Assembler/Elastic.Documentation.Assembler.csproj b/src/services/Elastic.Documentation.Assembler/Elastic.Documentation.Assembler.csproj
index 175061e07c..5ab82b36d2 100644
--- a/src/services/Elastic.Documentation.Assembler/Elastic.Documentation.Assembler.csproj
+++ b/src/services/Elastic.Documentation.Assembler/Elastic.Documentation.Assembler.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/services/Elastic.Documentation.Isolated/Elastic.Documentation.Isolated.csproj b/src/services/Elastic.Documentation.Isolated/Elastic.Documentation.Isolated.csproj
index 090ef0e77a..3b50392249 100644
--- a/src/services/Elastic.Documentation.Isolated/Elastic.Documentation.Isolated.csproj
+++ b/src/services/Elastic.Documentation.Isolated/Elastic.Documentation.Isolated.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="GitHub.Actions.Core" />
diff --git a/src/services/Elastic.Documentation.Services/Elastic.Documentation.Services.csproj b/src/services/Elastic.Documentation.Services/Elastic.Documentation.Services.csproj
index 96209f37e3..6f2393e619 100644
--- a/src/services/Elastic.Documentation.Services/Elastic.Documentation.Services.csproj
+++ b/src/services/Elastic.Documentation.Services/Elastic.Documentation.Services.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>