diff --git a/build/artifacts.props b/build/artifacts.props
index 6c16175e27..000ab7c8bb 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -67,6 +67,7 @@
     <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.Abstractions" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Category="ship" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Category="ship" AllMetapackage="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.Extensions" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.Redis" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.SystemWeb" Category="ship" />
@@ -198,10 +199,10 @@
     <PackageArtifact Include="Microsoft.CodeAnalysis.Remote.Razor" Category="shipoob" />
     <PackageArtifact Include="Microsoft.Data.Sqlite.Core" Category="ship" AllMetapackage="true" />
     <PackageArtifact Include="Microsoft.Data.Sqlite" Category="ship" AllMetapackage="true" />
-    <PackageArtifact Include="Microsoft.DotNet.Web.Client.ItemTemplates" Category="shipoob" />
-    <PackageArtifact Include="Microsoft.DotNet.Web.ItemTemplates" Category="shipoob" />
-    <PackageArtifact Include="Microsoft.DotNet.Web.ProjectTemplates.3.0" Category="shipoob" />
-    <PackageArtifact Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Category="shipoob" />
+    <PackageArtifact Include="Microsoft.DotNet.Web.Client.ItemTemplates" Category="ship" />
+    <PackageArtifact Include="Microsoft.DotNet.Web.ItemTemplates" Category="ship" />
+    <PackageArtifact Include="Microsoft.DotNet.Web.ProjectTemplates.3.0" Category="ship" />
+    <PackageArtifact Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Category="ship" />
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Abstractions" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Analyzers" Category="ship" Analyzer="true" AppMetapackage="true" AllMetapackage="true" />
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Cosmos.Sql" Category="ship"/>
diff --git a/modules/DataProtection b/modules/DataProtection
index 190b2bfc87..a407a047f0 160000
--- a/modules/DataProtection
+++ b/modules/DataProtection
@@ -1 +1 @@
-Subproject commit 190b2bfc87c587f8cdb6fd7f27141bf289d02f3d
+Subproject commit a407a047f0bf35095876090da4b8f00405fca40d