diff --git a/src/NuGetGallery.Core/NuGetGallery.Core.csproj b/src/NuGetGallery.Core/NuGetGallery.Core.csproj
index f431a94ec7..271f8b1407 100644
--- a/src/NuGetGallery.Core/NuGetGallery.Core.csproj
+++ b/src/NuGetGallery.Core/NuGetGallery.Core.csproj
@@ -202,11 +202,8 @@
     <EmbeddedResource Include="Infrastructure\MigrateUserToOrganization.sql" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NuGet.Services.Entities">
-      <Version>2.31.0</Version>
-    </PackageReference>
-    <PackageReference Include="NuGet.Services.Messaging">
-      <Version>2.31.0</Version>
+    <PackageReference Include="NuGet.Services.Messaging.Email">
+      <Version>2.36.0-master-2190850</Version>
     </PackageReference>
     <PackageReference Include="NuGet.StrongName.AnglicanGeek.MarkdownMailer">
       <Version>1.2.0</Version>
@@ -241,12 +238,6 @@
     <PackageReference Include="NuGet.Packaging">
       <Version>4.8.0</Version>
     </PackageReference>
-    <PackageReference Include="NuGet.Services.Validation">
-      <Version>2.31.0</Version>
-    </PackageReference>
-    <PackageReference Include="NuGet.Services.Validation.Issues">
-      <Version>2.31.0</Version>
-    </PackageReference>
     <PackageReference Include="WindowsAzure.Storage">
       <Version>7.1.2</Version>
     </PackageReference>
diff --git a/src/NuGetGallery/NuGetGallery.csproj b/src/NuGetGallery/NuGetGallery.csproj
index 686caab8c1..0d017b612a 100644
--- a/src/NuGetGallery/NuGetGallery.csproj
+++ b/src/NuGetGallery/NuGetGallery.csproj
@@ -1982,15 +1982,6 @@
     <PackageReference Include="Markdig.Signed">
       <Version>0.15.4</Version>
     </PackageReference>
-    <PackageReference Include="NuGet.Services.Entities">
-      <Version>2.31.0</Version>
-    </PackageReference>
-    <PackageReference Include="NuGet.Services.Messaging">
-      <Version>2.31.0</Version>
-    </PackageReference>
-    <PackageReference Include="NuGet.Services.Messaging.Email">
-      <Version>2.31.0</Version>
-    </PackageReference>
     <PackageReference Include="NuGet.StrongName.AnglicanGeek.MarkdownMailer">
       <Version>1.2.0</Version>
     </PackageReference>