diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ece1f492b..8238f2f3a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
 
 ### Dependency updates
 
+- .NET Framework only, `Grpc.Core.Api` updated from `2.57.0` to `2.58.0`.
+
 ### Deprecated
 
 ### Removed
diff --git a/build/LibraryVersions.g.cs b/build/LibraryVersions.g.cs
index 3a06a40097..5d4db1339d 100644
--- a/build/LibraryVersions.g.cs
+++ b/build/LibraryVersions.g.cs
@@ -60,7 +60,7 @@ public static class LibraryVersion
             new List<PackageBuildInfo>
             {
                 new("2.52.0"),
-                new("2.57.0"),
+                new("2.58.0"),
             }
         },
         {
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 1b3807692d..3aff766903 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -62,7 +62,7 @@
     <PackageVersion Include="Google.Protobuf" Version="3.24.4" />
     <PackageVersion Include="Grpc" Version="2.46.6" />
     <PackageVersion Include="Grpc.Core" Version="2.46.6" />
-    <PackageVersion Include="Grpc.Core.Api" Version="2.57.0" />
+    <PackageVersion Include="Grpc.Core.Api" Version="2.58.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props
index c76704612c..01235087df 100644
--- a/test/Directory.Packages.props
+++ b/test/Directory.Packages.props
@@ -9,8 +9,8 @@
     <PackageVersion Include="GraphQL.MicrosoftDI" Version="7.6.1" />
     <PackageVersion Include="GraphQL.Server.Transports.AspNetCore" Version="7.6.0" />
     <PackageVersion Include="GraphQL.Server.Ui.Playground" Version="7.6.0" />
-    <PackageVersion Include="Grpc.Net.Client" Version="2.57.0" />
-    <PackageVersion Include="Grpc.Net.Client.Web" Version="2.57.0" />
+    <PackageVersion Include="Grpc.Net.Client" Version="2.58.0" />
+    <PackageVersion Include="Grpc.Net.Client.Web" Version="2.58.0" />
     <PackageVersion Include="Grpc.Tools" Version="2.51.0" />
     <PackageVersion Include="MassTransit" Version="8.1.1" />
     <PackageVersion Include="Microsoft.AspNetCore" Version="2.2.0" />
diff --git a/test/IntegrationTests/LibraryVersions.g.cs b/test/IntegrationTests/LibraryVersions.g.cs
index 57f644577f..05eb30fddc 100644
--- a/test/IntegrationTests/LibraryVersions.g.cs
+++ b/test/IntegrationTests/LibraryVersions.g.cs
@@ -64,7 +64,7 @@ public static class LibraryVersion
         new object[] { string.Empty }
 #else
         new object[] { "2.52.0" },
-        new object[] { "2.57.0" },
+        new object[] { "2.58.0" },
 #endif
     };
     public static readonly IReadOnlyCollection<object[]> MassTransit = new List<object[]>