diff --git a/.github/workflows/vsix.yml b/.github/workflows/vsix.yml
index 759e7cba6..40c151724 100644
--- a/.github/workflows/vsix.yml
+++ b/.github/workflows/vsix.yml
@@ -67,7 +67,7 @@ jobs:
           mkdir vsix
           7z x src/GUI/lib/efreveng90.exe.zip -oefreveng90 -y
           dir /a:-d /s /b "efreveng90" | find /c ":\" > filecount.txt
-          findstr "144" filecount.txt
+          findstr "146" filecount.txt
 
     - name: Build
       run: msbuild EFCorePowerTools.sln /property:Configuration=Release /p:DeployExtension=false /p:ZipPackageCompressionLevel=normal /v:m
@@ -79,7 +79,7 @@ jobs:
         mkdir vsix
         7z x src/GUI/EFCorePowerTools/bin/Release/EFCorePowerTools.vsix -ovsix -y
         dir /a:-d /s /b "vsix" | find /c ":\" > filecount.txt
-        findstr "81" filecount.txt
+        findstr "82" filecount.txt
 
     - name: Move build output
       if: github.ref == 'refs/heads/master' && github.repository_owner == 'erikej' && (github.event_name == 'push' ||  github.event_name == 'workflow_dispatch')
diff --git a/src/Core/RevEng.Core.80/ServiceProviderBuilder.cs b/src/Core/RevEng.Core.80/ServiceProviderBuilder.cs
index 0d4ac5159..c425c3b8d 100644
--- a/src/Core/RevEng.Core.80/ServiceProviderBuilder.cs
+++ b/src/Core/RevEng.Core.80/ServiceProviderBuilder.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 #if !CORE90
-using EntityFrameworkCore.Scaffolding.Handlebars;
 using FirebirdSql.EntityFrameworkCore.Firebird.Design.Internal;
 #endif
+using EntityFrameworkCore.Scaffolding.Handlebars;
 using ErikEJ.EntityFrameworkCore.SqlServer.Scaffolding;
 using Humanizer.Inflections;
 using Microsoft.EntityFrameworkCore.Design;
@@ -68,7 +68,6 @@ public static IServiceCollection AddEfpt(this IServiceCollection serviceCollecti
                 serviceCollection.AddSingleton<ICandidateNamingService>(provider => new ReplacingCandidateNamingService(options.UsePrefixNavigationNaming, options.CustomReplacers, options.PreserveCasingWithRegex));
             }
 
-#if !CORE90
             if (options.UseHandleBars)
             {
                 serviceCollection.AddHandlebarsScaffolding(hbOptions =>
@@ -79,7 +78,7 @@ public static IServiceCollection AddEfpt(this IServiceCollection serviceCollecti
                 serviceCollection.AddSingleton<ITemplateFileService>(provider
                     => new CustomTemplateFileService(options.OptionsPath));
             }
-#endif
+
             if (options.UseInflector || options.UseLegacyPluralizer)
             {
                 if (options.UseLegacyPluralizer)
diff --git a/src/Core/RevEng.Core.90/RevEng.Core.90.csproj b/src/Core/RevEng.Core.90/RevEng.Core.90.csproj
index a6a9b1a3e..9f4d34662 100644
--- a/src/Core/RevEng.Core.90/RevEng.Core.90.csproj
+++ b/src/Core/RevEng.Core.90/RevEng.Core.90.csproj
@@ -20,10 +20,6 @@
     <Compile Include="..\RevEng.Core.80\Diagram\*.cs" Link="Diagram\%(Filename)%(Extension)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Remove="..\RevEng.Core.80\CustomTemplateFileService.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="DbContextExtensionsSqlQuery" />
     <EmbeddedResource Include="DbContextExtensionsSqlQuery.Sync" />
@@ -31,9 +27,9 @@
 
   <ItemGroup>
     <PackageReference Include="Bricelam.EntityFrameworkCore.Pluralizer" Version="1.0.0" />
+    <PackageReference Include="EntityFrameworkCore.Scaffolding.Handlebars" Version="9.0.0-beta1" />
     <PackageReference Include="EntityFrameworkCore.Sqlite.NodaTime" Version="9.1.0" />
-<!--    <PackageReference Include="EntityFrameworkCore.Scaffolding.Handlebars" Version="8.0.0" />
-    <PackageReference Include="FirebirdSql.EntityFrameworkCore.Firebird" Version="11.0.0" />-->
+<!--  <PackageReference Include="FirebirdSql.EntityFrameworkCore.Firebird" Version="11.0.0" />-->
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
diff --git a/src/GUI/EFCorePowerTools/CodeTemplates900.zip b/src/GUI/EFCorePowerTools/CodeTemplates900.zip
new file mode 100644
index 000000000..8de555e9c
Binary files /dev/null and b/src/GUI/EFCorePowerTools/CodeTemplates900.zip differ
diff --git a/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj b/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj
index 0ea67090a..f0a56096a 100644
--- a/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj
+++ b/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj
@@ -223,6 +223,9 @@
     <Content Include="CodeTemplates800.zip">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <Content Include="CodeTemplates900.zip">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <None Include="Key.snk" />
     <Content Include="PowerToolsReadMe.md">
       <IncludeInVSIX>true</IncludeInVSIX>
diff --git a/src/GUI/Shared/Helpers/ReverseEngineerHelper.cs b/src/GUI/Shared/Helpers/ReverseEngineerHelper.cs
index ca8335f97..165804627 100644
--- a/src/GUI/Shared/Helpers/ReverseEngineerHelper.cs
+++ b/src/GUI/Shared/Helpers/ReverseEngineerHelper.cs
@@ -54,6 +54,9 @@ public string DropTemplates(string optionsPath, string projectPath, CodeGenerati
                     case CodeGenerationMode.EFCore8:
                         zipName = "CodeTemplates800.zip";
                         break;
+                    case CodeGenerationMode.EFCore9:
+                        zipName = "CodeTemplates900.zip";
+                        break;
                     default:
                         throw new ArgumentException($"Unsupported code generation mode for templates: {codeGenerationMode}");
                 }