diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod
index f3ff974aa..5bf5f4fd9 100644
--- a/WORKSPACE.bzlmod
+++ b/WORKSPACE.bzlmod
@@ -165,14 +165,15 @@ zig_toolchains()
 
 nixpkgs_cc_configure(
     name = "nixpkgs_cc_toolchain",
+    cc_std = "c++14",
     # TODO(malt3): Use clang once cc-wrapper path reset bug is fixed upstream.
     # attribute_path = "clang_11",
     repository = "@nixpkgs",
-    cc_std = "c++14",
 )
 
 nixpkgs_cc_configure(
     name = "nixpkgs_cc_aarch64_darwin_x86_64_linux",
+    cc_std = "c++14",
     cross_cpu = "k8",
     exec_constraints = [
         "@platforms//os:osx",
@@ -191,7 +192,6 @@ nixpkgs_cc_configure(
         "@platforms//os:linux",
         "@rules_nixpkgs_core//constraints:support_nix",
     ],
-    cc_std = "c++14",
 )
 
 register_toolchains(
diff --git a/bootstrapper/initproto/init.pb.go b/bootstrapper/initproto/init.pb.go
index 328b6eeb1..2919d6a6e 100644
--- a/bootstrapper/initproto/init.pb.go
+++ b/bootstrapper/initproto/init.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.34.2
-// 	protoc        v3.21.7
+// 	protoc        v4.24.4
 // source: bootstrapper/initproto/init.proto
 
 package initproto
diff --git a/debugd/service/debugd.pb.go b/debugd/service/debugd.pb.go
index c60ce592f..daaa5b765 100644
--- a/debugd/service/debugd.pb.go
+++ b/debugd/service/debugd.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.34.2
-// 	protoc        v3.21.7
+// 	protoc        v4.24.4
 // source: debugd/service/debugd.proto
 
 package service
diff --git a/disk-mapper/recoverproto/recover.pb.go b/disk-mapper/recoverproto/recover.pb.go
index 3810a2a5b..f8d6b4fc5 100644
--- a/disk-mapper/recoverproto/recover.pb.go
+++ b/disk-mapper/recoverproto/recover.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.34.2
-// 	protoc        v3.21.7
+// 	protoc        v4.24.4
 // source: disk-mapper/recoverproto/recover.proto
 
 package recoverproto
diff --git a/internal/versions/components/components.pb.go b/internal/versions/components/components.pb.go
index 2147ab236..318364ffc 100644
--- a/internal/versions/components/components.pb.go
+++ b/internal/versions/components/components.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.34.2
-// 	protoc        v3.21.7
+// 	protoc        v4.24.4
 // source: internal/versions/components/components.proto
 
 package components
diff --git a/joinservice/joinproto/join.pb.go b/joinservice/joinproto/join.pb.go
index 00c5972cd..dbd10c5c9 100644
--- a/joinservice/joinproto/join.pb.go
+++ b/joinservice/joinproto/join.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.34.2
-// 	protoc        v3.21.7
+// 	protoc        v4.24.4
 // source: joinservice/joinproto/join.proto
 
 package joinproto
diff --git a/keyservice/keyserviceproto/keyservice.pb.go b/keyservice/keyserviceproto/keyservice.pb.go
index 90c2996d0..c770110f7 100644
--- a/keyservice/keyserviceproto/keyservice.pb.go
+++ b/keyservice/keyserviceproto/keyservice.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.34.2
-// 	protoc        v3.21.7
+// 	protoc        v4.24.4
 // source: keyservice/keyserviceproto/keyservice.proto
 
 package keyserviceproto
diff --git a/upgrade-agent/upgradeproto/upgrade.pb.go b/upgrade-agent/upgradeproto/upgrade.pb.go
index 2ea7d45c4..98a8f64f6 100644
--- a/upgrade-agent/upgradeproto/upgrade.pb.go
+++ b/upgrade-agent/upgradeproto/upgrade.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.34.2
-// 	protoc        v3.21.7
+// 	protoc        v4.24.4
 // source: upgrade-agent/upgradeproto/upgrade.proto
 
 package upgradeproto
diff --git a/verify/verifyproto/verify.pb.go b/verify/verifyproto/verify.pb.go
index 819fb0438..38475ac09 100644
--- a/verify/verifyproto/verify.pb.go
+++ b/verify/verifyproto/verify.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.34.2
-// 	protoc        v3.21.7
+// 	protoc        v4.24.4
 // source: verify/verifyproto/verify.proto
 
 package verifyproto