diff --git a/MODULE.bazel b/MODULE.bazel
index 3bcbbdf26..c00b56677 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -19,6 +19,14 @@
 bazel_dep(name = "rules_jvm_external", version = "5.3")
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
+
+# https://github.com/grpc/grpc-java/issues/10576
+maven.artifact(
+    artifact = "grpc-core",
+    exclusions = ["io.grpc:grpc-util"],
+    group = "io.grpc",
+    version = "1.58.0",  # Keep version in sync with below!
+)
 maven.install(
     artifacts = [
         "junit:junit:4.13.2",
@@ -31,8 +39,8 @@ maven.install(
         "com.google.protobuf:protobuf-java-util:4.0.0-rc-2",
         # gRPC
         "com.google.api.grpc:proto-google-common-protos:2.25.1",
-        "io.grpc:grpc-netty:1.54.1",  # Alternative: grpc-netty-shaded
-        "io.grpc:grpc-stub:1.54.1",
+        "io.grpc:grpc-netty:1.58.0",  # Alternative: grpc-netty-shaded
+        "io.grpc:grpc-stub:1.58.0",  # Keep version in sync with above!
         "org.apache.tomcat:annotations-api:6.0.53",  # NOT :tomcat-annotations-api
         # kubernetes:client-java also depends on Protobuf (+gRPC?), version may need to be upgraded together
         "io.kubernetes:client-java:18.0.1",
diff --git a/maven_install.json b/maven_install.json
index 716b92ae3..49bcbcca2 100644
--- a/maven_install.json
+++ b/maven_install.json
@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -1408292160,
-  "__RESOLVED_ARTIFACTS_HASH": -1683949065,
+  "__INPUT_ARTIFACTS_HASH": 1014685976,
+  "__RESOLVED_ARTIFACTS_HASH": 551857096,
   "artifacts": {
     "aopalliance:aopalliance": {
       "shasums": {
@@ -243,38 +243,45 @@
     },
     "io.grpc:grpc-api": {
       "shasums": {
-        "jar": "7fbc4beb922f40e6a84987c8dfbc833ee12e332849161f13f32928a728bb5597",
-        "sources": "99452a0e8b40d989e085f7d8a8a91a907488cc8844213884ed2bbf1cba5f1e6a"
+        "jar": "d688d25f4f533979df2fcd0881e1e30c2928e5b654ff09bf1440923282b0d945",
+        "sources": "885eb674b58dd92c904feaa27518a3c06440e71929ef0d2092248d6230f56085"
       },
-      "version": "1.54.1"
+      "version": "1.58.0"
     },
     "io.grpc:grpc-context": {
       "shasums": {
-        "jar": "9ea99708e2ae3bf4befaaad8efe216fec8734a497f3dccf8750bd5db007b3bce",
-        "sources": "771aad84995fd80e434525cf00824da2d3507eb539676d78be75c01d12db5e95"
+        "jar": "3a7626d13084958bcdeab59412e4ec873f07c8315ff2510d363856fac7fadc51",
+        "sources": "40d2e2427ff9a9b6b4acb0906231f4a809a293adb3d42e130fea7a13d2222ef0"
       },
-      "version": "1.54.1"
+      "version": "1.58.0"
     },
     "io.grpc:grpc-core": {
       "shasums": {
-        "jar": "296844ad5e022fc988b49210804bf7c92f56fc9f9b22cdbaef02c69b9bed1945",
-        "sources": "5b4e174b222606b4eea20ca71eaff13057cac2abc5b4d7dee7aeaa3e5973e81f"
+        "jar": "93c8880824ee124b91c31f0f1052f86372719d6ece6e4be1c591b7d6dc639f5f",
+        "sources": "558cd3e6c04299028ed264530e7a49838e5d49c9595641f1b6397dbf6ea0a3f2"
       },
-      "version": "1.54.1"
+      "version": "1.58.0"
     },
     "io.grpc:grpc-netty": {
       "shasums": {
-        "jar": "79d3953d3ff6e105e6a694855bd357f18770cd2d0536080e7a4436354e067838",
-        "sources": "c87f4fa00d2ecc26620d28c581bfca14246d064deba966aabaef8c5f08ea2af8"
+        "jar": "31ffea0cf52351657c34cd476050cea41f61cb2d15863d3424fe457e7d7cac0a",
+        "sources": "60fec101d04ded6de64c99c0cb05518e34f4d90cee5939cc8402199d5895387f"
       },
-      "version": "1.54.1"
+      "version": "1.58.0"
     },
     "io.grpc:grpc-stub": {
       "shasums": {
-        "jar": "630a97d7521ef6f10e686141a4a659ba8cddb6f2e5f3bafe15b0517531fea9d8",
-        "sources": "ee700229e4f629d5a5f184f4a51b3db1b707828065feef21d8580aba14ea6f79"
+        "jar": "1af7bbc56be7b1131c1322ba183126dd050306f91128193f4b9bd5ea71ac8c88",
+        "sources": "336a14266920cb6e7f39833221b8624a6f18dc3e84bb124f72fa6a04a2e00d6b"
       },
-      "version": "1.54.1"
+      "version": "1.58.0"
+    },
+    "io.grpc:grpc-util": {
+      "shasums": {
+        "jar": "9e8999d98523fb975c7a316bd524671576c1c638b1b1fd357340bb90be14b5db",
+        "sources": "3175d21175ee82763d248cadd08d9a7ead4f47822acfcada5e873d6ab47d761a"
+      },
+      "version": "1.58.0"
     },
     "io.gsonfire:gson-fire": {
       "shasums": {
@@ -306,87 +313,87 @@
     },
     "io.netty:netty-buffer": {
       "shasums": {
-        "jar": "4e3abdf4ddb8810f5fb4a2b57c9144407873b359faa1894007673ed1465dd3e8",
-        "sources": "9b7e313923c37d2467726a9fcf247bc128535cc2c5533c6ec4026d662c746945"
+        "jar": "007c7d9c378df02d390567d0d7ddf542ffddb021b7313dbf502392113ffabb08",
+        "sources": "689543654ae399e4e52ef5b612268482941ed34c98a2cb394dc53b1bbc5bb9c1"
       },
-      "version": "4.1.87.Final"
+      "version": "4.1.93.Final"
     },
     "io.netty:netty-codec": {
       "shasums": {
-        "jar": "c643fe8318b7c7405acec13ed98e8f634f917960b20486295efbc5a690bac694",
-        "sources": "39a397c6636288eadaf1366e0f0da3e53a9e15bf35df252bbc36532ccf415547"
+        "jar": "990c378168dc6364c6ff569701f4f2f122fffe8998b3e189eba4c4d868ed1084",
+        "sources": "790ee3ed189de490bd392a005eadacd37ba5ab4af14d48a1a1ee44494001e85d"
       },
-      "version": "4.1.87.Final"
+      "version": "4.1.93.Final"
     },
     "io.netty:netty-codec-http": {
       "shasums": {
-        "jar": "39368c15595b791dbe26e7639cf2e71b6647bab8838fa5781cf7a80762eac927",
-        "sources": "f8cd7ba87346f5e70cf4cfc1c018ad682f7a7c099f802dac805dcb0614c67f19"
+        "jar": "dacf78ce78ab2d29570325db4cd2451ea589639807de95881a0fa7155a9e6b55",
+        "sources": "e0bc37f5e1a9a91381e626891555f9e2c49864bc724bdf1c8d55c68ba9c0ac99"
       },
-      "version": "4.1.87.Final"
+      "version": "4.1.93.Final"
     },
     "io.netty:netty-codec-http2": {
       "shasums": {
-        "jar": "e5d01b8db385b23103de67d3666c6fa9fa144d42217a3c8266b2a5efe425f093",
-        "sources": "e4454eaed6d09569885b9f8bac0561c0db1896eaa32e5ccd60afea490569591a"
+        "jar": "d96cc09045a1341c6d47494352aa263b87b72fb1d2ea9eca161aa73820bfe8bb",
+        "sources": "1583bdc713446bf2cddcc4da7edda3b99e44d2074d568f73eb8f4aa41ce6ae77"
       },
-      "version": "4.1.87.Final"
+      "version": "4.1.93.Final"
     },
     "io.netty:netty-codec-socks": {
       "shasums": {
-        "jar": "41a76a64514f8f8f50ab8527254073521394138e8a96191905e8c143368b2006",
-        "sources": "bc90f881572fafc3abdf38c6905e848173cedb5d54f0920380b52a4bb03fa4a9"
+        "jar": "0ea47b5ba23ca1da8eb9146c8fc755c1271414633b1e2be2ce1df764ba0fff2a",
+        "sources": "ec9b5dc6aeeedf1e43e67c15ec4ef1245abe1f1ea83cc6db28fe8a9b3eabecee"
       },
-      "version": "4.1.87.Final"
+      "version": "4.1.93.Final"
     },
     "io.netty:netty-common": {
       "shasums": {
-        "jar": "811443fc1411a9ef7c1f7b02a750e2a6688f1eec0ae7361ed07812a85d982c86",
-        "sources": "679c23349089a12edeb0dbd6a4b05e1c7f527db69e33be8b98fb482c8c24db64"
+        "jar": "443bb316599fb16e3baeba2fb58881814d7ff0b7af176fe76e38071a6e86f8c0",
+        "sources": "93da9f7c62f4e0f001c3d0fed0e1ea27c35556a6ea732c0796cae24a8cee59b5"
       },
-      "version": "4.1.87.Final"
+      "version": "4.1.93.Final"
     },
     "io.netty:netty-handler": {
       "shasums": {
-        "jar": "31a20e1de13b06a677a4719fd5aa95635982114a32c1d034739a48cceada2383",
-        "sources": "e07bc5906414d522eb10cee0ce9162ab6382d05a71bf14ecb53630e3ebff5067"
+        "jar": "4e5f563ae14ed713381816d582f5fcfd0615aefb29203486cdfb782d8a00a02b",
+        "sources": "6a9419d175a543e96e1dc67d4bc1ce61790f05561b39281ac15d937476cdabe7"
       },
-      "version": "4.1.87.Final"
+      "version": "4.1.93.Final"
     },
     "io.netty:netty-handler-proxy": {
       "shasums": {
-        "jar": "65276b2ab687b1b7c1ceabcc941d6e2cce1038f35b581218d7dbf46b16c5b4ac",
-        "sources": "b6c10bc43044cb3b53c601a9ffc75ffb3d6af7b9c218e6bff72f5beb22993947"
+        "jar": "2ac5f7fbefa0b73ef783889069344d5515505a14b2303be693c5002c486df2b4",
+        "sources": "097f1cc9d2d2fb54611de1912ad9b456a8fff5a15a554744035e9e5f06eb6d3e"
       },
-      "version": "4.1.87.Final"
+      "version": "4.1.93.Final"
     },
     "io.netty:netty-resolver": {
       "shasums": {
-        "jar": "ee11d22d240b4b125edaed23ec7cc35ad9241b1b8fdd50630de20411ec345fc7",
-        "sources": "5c2ee5e9e26e10e1d94faaf7ee12fd021f967144eb630ef779aa81dd4d72da3e"
+        "jar": "e59770b66e81822e5d111ac4e544d7eb0c543e0a285f52628e53941acd8ed759",
+        "sources": "95a4155e8015cca8444e27a76fd670c6f0c007f82bd1e05f7ad4d174e724125d"
       },
-      "version": "4.1.87.Final"
+      "version": "4.1.93.Final"
     },
     "io.netty:netty-transport": {
       "shasums": {
-        "jar": "17ed465cf5b1579b72379e47be3ba7fccb09dda8d95d47c8d668118483b08f43",
-        "sources": "f0f3423820aa0bf83dcef001a8343c742c69b0bd0041e2228a2c8d67ce0cacd8"
+        "jar": "a5a78019bc1cd43dbc3c7b7cdd3801912ca26d1f498fb560514fee497864ba96",
+        "sources": "5e51186247d36155478b4c110795c7ff86aaafbe77532ef7b1e485eb089892f6"
       },
-      "version": "4.1.87.Final"
+      "version": "4.1.93.Final"
     },
     "io.netty:netty-transport-native-unix-common": {
       "shasums": {
-        "jar": "cc2d013c933c206605da01be39f4c2c1f4586a1b9103a665bd724bdd46d9cd0c",
-        "sources": "4a9b81c8dc1497038d1a6b4c01ba9fb8a86aa538dd2b8c6f47dc360ec09f6c94"
+        "jar": "774165a1c4dbaacb17f9c1ad666b3569a6a59715ae828e7c3d47703f479a53e7",
+        "sources": "b67655288cb23af26490e9aeb89f78b11d0dd5f63f0490e56cdd7c024f4cd16c"
       },
-      "version": "4.1.87.Final"
+      "version": "4.1.93.Final"
     },
     "io.perfmark:perfmark-api": {
       "shasums": {
-        "jar": "2044542933fcdf40ad18441bec37646d150c491871157f288847e29cb81de4cb",
-        "sources": "007b6b6beaba11fabb025d79b8774b6a7583596a8ec0a28157570304642b0e72"
+        "jar": "b7d23e93a34537ce332708269a0d1404788a5b5e1949e82f5535fce51b3ea95b",
+        "sources": "7379e0fef0c32d69f3ebae8f271f426fc808613f1cfbc29e680757f348ba8aa4"
       },
-      "version": "0.25.0"
+      "version": "0.26.0"
     },
     "io.swagger:swagger-annotations": {
       "shasums": {
@@ -509,10 +516,10 @@
     },
     "org.codehaus.mojo:animal-sniffer-annotations": {
       "shasums": {
-        "jar": "2f25841c937e24959a57b630e2c4b8525b3d0f536f2e511c9b2bed30b1651d54",
-        "sources": "b96c0e3e96686e4ace91f416ff2f7c5a53a53f25be6e404fc71bfcf20e9c253e"
+        "jar": "9ffe526bf43a6348e9d8b33b9cd6f580a7f5eed0cf055913007eda263de974d0",
+        "sources": "4878fcc6808dbc88085a4622db670e703867754bc4bc40312c52bf3a3510d019"
       },
-      "version": "1.21"
+      "version": "1.23"
     },
     "org.hamcrest:hamcrest-core": {
       "shasums": {
@@ -740,8 +747,10 @@
     "io.grpc:grpc-api": [
       "com.google.code.findbugs:jsr305",
       "com.google.errorprone:error_prone_annotations",
-      "com.google.guava:guava",
-      "io.grpc:grpc-context"
+      "com.google.guava:guava"
+    ],
+    "io.grpc:grpc-context": [
+      "io.grpc:grpc-api"
     ],
     "io.grpc:grpc-core": [
       "com.google.android:annotations",
@@ -749,6 +758,7 @@
       "com.google.errorprone:error_prone_annotations",
       "com.google.guava:guava",
       "io.grpc:grpc-api",
+      "io.grpc:grpc-context",
       "io.perfmark:perfmark-api",
       "org.codehaus.mojo:animal-sniffer-annotations"
     ],
@@ -766,6 +776,11 @@
       "com.google.guava:guava",
       "io.grpc:grpc-api"
     ],
+    "io.grpc:grpc-util": [
+      "com.google.guava:guava",
+      "io.grpc:grpc-core",
+      "org.codehaus.mojo:animal-sniffer-annotations"
+    ],
     "io.gsonfire:gson-fire": [
       "com.google.code.gson:gson"
     ],
@@ -1201,13 +1216,8 @@
     "io.grpc:grpc-api": [
       "io.grpc"
     ],
-    "io.grpc:grpc-context": [
-      "io.grpc"
-    ],
     "io.grpc:grpc-core": [
-      "io.grpc.inprocess",
-      "io.grpc.internal",
-      "io.grpc.util"
+      "io.grpc.internal"
     ],
     "io.grpc:grpc-netty": [
       "io.grpc.netty"
@@ -1216,6 +1226,9 @@
       "io.grpc.stub",
       "io.grpc.stub.annotations"
     ],
+    "io.grpc:grpc-util": [
+      "io.grpc.util"
+    ],
     "io.gsonfire:gson-fire": [
       "io.gsonfire",
       "io.gsonfire.annotations",
@@ -2030,6 +2043,8 @@
       "io.grpc:grpc-netty:jar:sources",
       "io.grpc:grpc-stub",
       "io.grpc:grpc-stub:jar:sources",
+      "io.grpc:grpc-util",
+      "io.grpc:grpc-util:jar:sources",
       "io.gsonfire:gson-fire",
       "io.gsonfire:gson-fire:jar:sources",
       "io.kubernetes:client-java",