diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 8578352eb..e1630040a 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 Create a bug report, feature proposal, or ask a question.
 
-NOTICE: A bug report without sufficient technical and repro details and version information WILL BE CLOSED WITHOUT ANY FURTHER ACTION.
+NOTICE: **A bug report without sufficient technical and reproduction details and version information WILL BE CLOSED WITHOUT ANY FURTHER ACTION.**
 
 ### Provide steps to reproduce a bug
 
@@ -10,11 +10,11 @@ Please include a **complete** description of the issue or link to a project that
 
 - EF Core Power Tools version: (found in About dialog - blue questionmark icon on context menu)
 
-- Exact Visual Studio version: (e.g. Visual Studio 2022 17.6.5)
+- Exact Visual Studio version: (e.g. Visual Studio 2022 17.12.3)
 
 - Database engine: (SQL Server, Azure SQL, Postgres, Oracle, Firebird, SQLite, MySQL)
 
-- EF Core version in use: (e.g. EF Core 7)
+- EF Core version in use: (e.g. EF Core 9)
 
 - Is Handlebars templates used: no/yes
 
diff --git a/src/Core/RevEng.Core.80/ServiceProviderBuilder.cs b/src/Core/RevEng.Core.80/ServiceProviderBuilder.cs
index c425c3b8d..191cbe725 100644
--- a/src/Core/RevEng.Core.80/ServiceProviderBuilder.cs
+++ b/src/Core/RevEng.Core.80/ServiceProviderBuilder.cs
@@ -18,8 +18,8 @@
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.DependencyInjection;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Design.Internal;
-#if !CORE90
 using Oracle.EntityFrameworkCore.Design.Internal;
+#if !CORE90
 using Pomelo.EntityFrameworkCore.MySql.Design.Internal;
 #endif
 using RevEng.Common;
@@ -121,12 +121,12 @@ public static IServiceCollection AddEfpt(this IServiceCollection serviceCollecti
                     }
 
                     break;
-
+#endif
                 case DatabaseType.Oracle:
                     var oracleProvider = new OracleDesignTimeServices();
                     oracleProvider.ConfigureDesignTimeServices(serviceCollection);
                     break;
-
+#if !CORE90
                 case DatabaseType.Firebird:
                     var firebirdProvider = new FbDesignTimeServices();
                     firebirdProvider.ConfigureDesignTimeServices(serviceCollection);
diff --git a/src/Core/RevEng.Core.90/RevEng.Core.90.csproj b/src/Core/RevEng.Core.90/RevEng.Core.90.csproj
index ae7891cc3..930a44810 100644
--- a/src/Core/RevEng.Core.90/RevEng.Core.90.csproj
+++ b/src/Core/RevEng.Core.90/RevEng.Core.90.csproj
@@ -38,8 +38,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="9.0.1" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="9.0.1" />
-<!--    <PackageReference Include="Oracle.EntityFrameworkCore" Version="8.23.50" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="8.0.2" />-->
+    <PackageReference Include="Oracle.EntityFrameworkCore" Version="9.23.60" />
+<!--  <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="8.0.2" />-->
     <PackageReference Include="SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime" Version="9.0.0" />
     <PackageReference Include="System.CodeDom" Version="8.0.0" />
   </ItemGroup>
diff --git a/src/GUI/RevEng.Shared/Providers.cs b/src/GUI/RevEng.Shared/Providers.cs
index 75aeba69b..8e7d07bc1 100644
--- a/src/GUI/RevEng.Shared/Providers.cs
+++ b/src/GUI/RevEng.Shared/Providers.cs
@@ -391,6 +391,9 @@ public static List<NuGetPackage> GetNeededPackages(DatabaseType databaseType, bo
                     case CodeGenerationMode.EFCore8:
                         pkgVersion = "8.23.50";
                         break;
+                    case CodeGenerationMode.EFCore9:
+                        pkgVersion = "9.23.60";
+                        break;
                 }
 
                 packages.Add(new NuGetPackage