diff --git a/src/EFCore.Tasks/README.md b/src/EFCore.Tasks/README.md
index e23d373b089..b32333a35da 100644
--- a/src/EFCore.Tasks/README.md
+++ b/src/EFCore.Tasks/README.md
@@ -4,7 +4,7 @@ This package should be referenced by the project containing the derived `DbConte
 
 ## Usage
 
-Install the package into your project, set `<EFOptimizeContext Condition="'$(Configuration)'=='Release'">true</EFOptimizeContext>` and then run build normally.
+Install the package into your project and if PublishAOT is true then just publish normally. Otherwise you can control code generation by the `$(EFScaffoldModelStage)` and `$(EFPrecompileQueriesStage)` properties, which can be set to either `publish` or `build` to control at what stage the code will be generated. Any other value will disable the corresponding generation.
 
 If the startup project is different from the current project it needs to be specified: `<EFStartupProject>..\Startup\Startup.csproj</EFStartupProject>`
 
diff --git a/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.targets b/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.targets
index 1032f4edbea..cbf43363318 100644
--- a/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.targets
+++ b/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.targets
@@ -20,7 +20,6 @@
   <!-- Usage:
   For the compiled model and precompiled queries to be generated when publishing with $(PublishAOT) set to true the only action needed is to reference Microsoft.EntityFrameworkCore.Tasks from all projects containing a derived DbContext or a query.
   For solutions where specifying the startup project is necessary, IDesignTimeDbContextFactory<> should be implemented.
-$(EFOptimizeContext) can be set to true to enable code generation outside of NativeAOT.
 $(EFScaffoldModelStage) and $(EFPrecompileQueriesStage) can be set to either publish or build to control at what stage will the code be generated. Any other value will disable the corresponding generation (in case the code is generated manually using `dotnet ef dbcontext optimize`)
 If there's more than one context and $(DbContextType) is not set, then the compiled model will be generated for all of them.
 $(EFTargetNamespace) and $(EFOutputDir) can be used to further fine-tune the generation.
@@ -36,12 +35,12 @@ $(EFTargetNamespace) and $(EFOutputDir) can be used to further fine-tune the gen
 
 For Publish:
 
-1. If PublishAOT is true _EFPrepareDependenciesForPublishAOT in the startup project invokes _EFGenerateFilesBeforePublish on all dependencies even if they don't set EFOptimizeContext to true. Otherwise _EFGenerateFilesBeforePublish runs on the projects before Publish.
+1. If PublishAOT is true _EFPrepareDependenciesForPublishAOT in the startup project invokes _EFGenerateFilesBeforePublish on all dependencies. Otherwise _EFGenerateFilesBeforePublish runs on the projects before Publish.
 2. _EFGenerateFilesBeforePublish calls _EFGenerateFiles and the rest is similar to the Build flow.
   -->
 
   <Target Name="_EFGenerateFilesAfterBuild"
-          Condition="'$(_EFGenerationStage)'=='' And '$(EFOptimizeContext)'=='true' And ('$(EFScaffoldModelStage)'=='build' Or '$(EFPrecompileQueriesStage)'=='build')">
+          Condition="'$(_EFGenerationStage)'=='' And ('$(EFScaffoldModelStage)'=='build' Or '$(EFPrecompileQueriesStage)'=='build')">
     <MSBuild Projects="$(MSBuildProjectFullPath)"
              Targets="_EFGenerateFiles"
              BuildInParallel="$(BuildInParallel)"
@@ -52,7 +51,7 @@ For Publish:
   <Target Name="_EFGenerateFilesBeforePublish"
           AfterTargets="GetCopyToPublishDirectoryItems"
           BeforeTargets="GeneratePublishDependencyFile"
-          Condition="'$(_EFGenerationStage)'=='' And ('$(EFScaffoldModelStage)'=='publish' Or '$(EFPrecompileQueriesStage)'=='publish') And ('$(EFOptimizeContext)'=='true' Or ('$(EFOptimizeContext)'=='' And ('$(_EFPublishAOT)'=='true' Or '$(PublishAOT)'=='true')))">
+          Condition="'$(_EFGenerationStage)'=='' And ('$(EFScaffoldModelStage)'=='publish' Or '$(EFPrecompileQueriesStage)'=='publish' Or '$(_EFPublishAOT)'=='true' Or '$(PublishAOT)'=='true')">
     <MSBuild Projects="$(MSBuildProjectFullPath)"
              Targets="_EFGenerateFiles"
              BuildInParallel="$(BuildInParallel)"
@@ -133,6 +132,8 @@ For Publish:
 
   <Target Name="_EFValidateProperties"
           BeforeTargets="CoreCompile">
+    <Error Condition="'$(EFOptimizeContext)'!=''"
+           Text="%24(EFOptimizeContext) is no longer supported. Use %24(EFScaffoldModelStage) and %24(EFPrecompileQueriesStage) instead." />
     <Error Condition="'$(EFScaffoldModelStage)'=='publish' And '$(EFPrecompileQueriesStage)'=='build'"
            Text="If %24(EFScaffoldModelStage) is set to 'publish' then %24(EFPrecompileQueriesStage) must also be set to 'publish'." />
   </Target>
@@ -223,4 +224,4 @@ For Publish:
     <Delete Files="$(EFGeneratedSourcesPublishFile)" />
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/dotnet-ef/RootCommand.cs b/src/dotnet-ef/RootCommand.cs
index d019cf8c068..1e644f83875 100644
--- a/src/dotnet-ef/RootCommand.cs
+++ b/src/dotnet-ef/RootCommand.cs
@@ -84,7 +84,7 @@ protected override int Execute(string[] _)
                 && _args[0] == "dbcontext"
                 && _args[1] == "optimize"
                 && !_args.Any(a => a == "--no-scaffold");
-            startupProject.Build(skipOptimization ? new[] { "/p:EFOptimizeContext=false" } : null);
+            startupProject.Build(skipOptimization ? ["/p:EFScaffoldModelStage=none", "/p:EFPrecompileQueriesStage=none"] : null);
             Reporter.WriteInformation(Resources.BuildSucceeded);
         }