diff --git a/Cargo.lock b/Cargo.lock
index b084cd82..493d0d40 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -749,8 +749,8 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "h2"
-version = "0.3.18"
-source = "git+https://github.com/stackabletech/h2.git?branch=feature/grpc-uds#557dd1070dfc7ee5199a3efbaf66de4250c448b9"
+version = "0.3.26"
+source = "git+https://github.com/stackabletech/h2.git?branch=feature/grpc-uds#5438b66af85c7d871b32db8962bcd5bff849c824"
 dependencies = [
  "bytes",
  "fnv",
@@ -758,7 +758,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 1.9.3",
+ "indexmap 2.2.6",
  "slab",
  "tokio",
  "tokio-util",
diff --git a/Cargo.nix b/Cargo.nix
index 1be62490..f5ad7570 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -2192,13 +2192,13 @@ rec {
       };
       "h2" = rec {
         crateName = "h2";
-        version = "0.3.18";
+        version = "0.3.26";
         edition = "2018";
         workspace_member = null;
         src = pkgs.fetchgit {
           url = "https://github.com/stackabletech/h2.git";
-          rev = "557dd1070dfc7ee5199a3efbaf66de4250c448b9";
-          sha256 = "06nhvzn2fb3w2ry1cc9ddd7h8ffy2jrbd9gy9srxx2c3r2mnbn78";
+          rev = "5438b66af85c7d871b32db8962bcd5bff849c824";
+          sha256 = "0w5pfq633861pbkmrdll9i8vmiwkic1m43ccbvynif7cgx0ppvdz";
         };
         authors = [
           "Carl Lerche <me@carllerche.com>"
@@ -2234,7 +2234,7 @@ rec {
           }
           {
             name = "indexmap";
-            packageId = "indexmap 1.9.3";
+            packageId = "indexmap 2.2.6";
             features = [ "std" ];
           }
           {
@@ -2249,7 +2249,7 @@ rec {
           {
             name = "tokio-util";
             packageId = "tokio-util";
-            features = [ "codec" ];
+            features = [ "codec" "io" ];
           }
           {
             name = "tracing";
@@ -3152,7 +3152,6 @@ rec {
           "serde" = [ "dep:serde" ];
           "serde-1" = [ "serde" ];
         };
-        resolvedDefaultFeatures = [ "std" ];
       };
       "indexmap 2.2.6" = rec {
         crateName = "indexmap";
diff --git a/Cargo.toml b/Cargo.toml
index 9f29dde9..6136968f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ anyhow = "1.0"
 built = { version = "0.7", features = ["chrono", "git2"] }
 clap = "4.3"
 futures = { version = "0.3", features = ["compat"] }
-h2 = "=0.3.18" # We need to keep this in sync with our patched h2 build
+h2 = "=0.3.26" # We need to keep this in sync with our patched h2 build
 libc = "0.2"
 pin-project = "1.1"
 prost = "0.11"
@@ -35,4 +35,5 @@ tonic-reflection = "0.9"
 
 [patch.crates-io]
 # Workaround for https://github.com/hyperium/tonic/issues/243
+# Can be removed once we no longer support K8s 1.25.x (and OpenShift 4.12.x)
 h2 = { git = "https://github.com/stackabletech/h2.git", branch = "feature/grpc-uds" }
diff --git a/crate-hashes.json b/crate-hashes.json
index 1f33b7f1..a9935980 100644
--- a/crate-hashes.json
+++ b/crate-hashes.json
@@ -1,5 +1,5 @@
 {
-  "git+https://github.com/stackabletech/h2.git?branch=feature%2Fgrpc-uds#h2@0.3.18": "06nhvzn2fb3w2ry1cc9ddd7h8ffy2jrbd9gy9srxx2c3r2mnbn78",
+  "git+https://github.com/stackabletech/h2.git?branch=feature%2Fgrpc-uds#h2@0.3.26": "0w5pfq633861pbkmrdll9i8vmiwkic1m43ccbvynif7cgx0ppvdz",
   "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.0#stackable-operator-derive@0.2.0": "07qn20a20kkym8spc15wvqw97rblq0hcl2x2sn6wxhjfajjfjzp9",
   "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.67.0#stackable-operator@0.67.0": "07qn20a20kkym8spc15wvqw97rblq0hcl2x2sn6wxhjfajjfjzp9",
   "git+https://github.com/stackabletech/product-config.git?tag=0.6.0#product-config@0.6.0": "1ixc2x7540sxdmc92hqdcwm24rj8i1ivjsvwk2d57pdsq03j2x41"
diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml
index 4ee4c295..701a54b4 100644
--- a/rust/operator-binary/Cargo.toml
+++ b/rust/operator-binary/Cargo.toml
@@ -9,9 +9,6 @@ repository.workspace = true
 publish = false
 
 [dependencies]
-# We need to keep this in sync with our patched h2 build
-h2 = "=0.3.18"
-
 csi-grpc = { path = "../csi-grpc" }
 
 clap.workspace = true
@@ -29,6 +26,7 @@ anyhow.workspace = true
 serde.workspace = true
 snafu.workspace = true
 strum.workspace = true
+h2.workspace = true
 
 [build-dependencies]
 built.workspace = true