diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 454ee8f6f..f2edbd637 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -218,8 +218,12 @@ jobs:
       - name: Install EF Core Tools
         shell: pwsh
         run: |
-          dotnet tool restore
-          dotnet ef --version
+          dotnet tool restore --no-cache --verbosity diag
+          "Exit code: $lastexitcode"
+          dotnet tool run dotnet-ef
+          "Exit code: $lastexitcode"
+          dotnet dotnet-ef --version
+          "Exit code: $lastexitcode"
       - name: Restore dependencies
         shell: pwsh
         run: dotnet restore
diff --git a/NuGet.config b/NuGet.config
index 6986ec247..5ed0beed0 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="Pomelo" value="https://pkgs.dev.azure.com/pomelo-efcore/Pomelo.EntityFrameworkCore.MySql/_packaging/pomelo-efcore-public/nuget/v3/index.json" />
-    <!--<add key="myget.org" value="https://www.myget.org/F/pomelo/api/v3/index.json" />-->
-    <!-- Package sources used by EF Core: -->
-    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
-    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
-    <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
-    <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
-    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
-    <add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
+    <!-- <add key="Pomelo" value="https://pkgs.dev.azure.com/pomelo-efcore/Pomelo.EntityFrameworkCore.MySql/_packaging/pomelo-efcore-public/nuget/v3/index.json" /> -->
+    <!-- ~1~<add key="myget.org" value="https://www.myget.org/F/pomelo/api/v3/index.json" />@1@ -->
+    <!-- ~1~ Package sources used by EF Core: @1@ -->
+    <!-- <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" /> -->
+    <!-- <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" /> -->
+    <!-- <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" /> -->
+    <!-- <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" /> -->
+    <!-- <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" /> -->
+    <!-- <add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" /> -->
 
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>