diff --git a/build/artifacts.props b/build/artifacts.props
index ccb7d1e204..2a3b4201c6 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -22,6 +22,7 @@
   <ItemGroup>
     <PackageArtifact Include="dotnet-aspnet-codegenerator" Category="shipoob" />
     <PackageArtifact Include="dotnet-dev-certs" Category="shipoob" />
+    <PackageArtifact Include="dotnet-ef" Category="shipoob" />
     <PackageArtifact Include="dotnet-sql-cache" Category="shipoob" />
     <PackageArtifact Include="dotnet-user-secrets" Category="shipoob" />
     <PackageArtifact Include="dotnet-watch" Category="shipoob" />
@@ -215,7 +216,6 @@
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Category="ship" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.SqlServer" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Tools" Category="ship" AppMetapackage="true" AllMetapackage="true" />
-    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Category="ship" LZMA="true" PackageType="DotnetCliTool" />
     <PackageArtifact Include="Microsoft.Extensions.ActivatorUtilities.Sources" Category="noship" />
     <PackageArtifact Include="Microsoft.Extensions.ApplicationModelDetection" Category="noship" />
     <PackageArtifact Include="Microsoft.Extensions.Buffers.Sources" Category="noship" />
diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore
index ff51e1dc15..c87fc69d4b 160000
--- a/modules/EntityFrameworkCore
+++ b/modules/EntityFrameworkCore
@@ -1 +1 @@
-Subproject commit ff51e1dc15ae7d0470245fcc2dc7bac34d20b7d1
+Subproject commit c87fc69d4bc0c085945d22d37f99651271238f58