diff --git a/Makefile b/Makefile
index 57e2e4f6e..063dd2daf 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ SED?=$(shell command -v gsed || command -v sed)
 
 
 GO_VERSION_MIN=1.19.2
-PROTOC_VERSION_MIN=3.21.5
+PROTOC_VERSION_MIN=3.21.7
 GO_CMD?=go
 CGO_ENABLED?=0
 ifneq ($(FDB_ENABLED), )
diff --git a/changelog/17499.txt b/changelog/17499.txt
new file mode 100644
index 000000000..f3b1831d6
--- /dev/null
+++ b/changelog/17499.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+core: Update protoc from 3.21.5 to 3.21.7
+```
\ No newline at end of file
diff --git a/helper/forwarding/types.pb.go b/helper/forwarding/types.pb.go
index c610a3e3e..2182e12cb 100644
--- a/helper/forwarding/types.pb.go
+++ b/helper/forwarding/types.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: helper/forwarding/types.proto
 
 package forwarding
diff --git a/helper/identity/mfa/types.pb.go b/helper/identity/mfa/types.pb.go
index 59d989e86..8de54d5f9 100644
--- a/helper/identity/mfa/types.pb.go
+++ b/helper/identity/mfa/types.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: helper/identity/mfa/types.proto
 
 package mfa
diff --git a/helper/identity/types.pb.go b/helper/identity/types.pb.go
index 7a88a7477..e19edfbde 100644
--- a/helper/identity/types.pb.go
+++ b/helper/identity/types.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: helper/identity/types.proto
 
 package identity
diff --git a/helper/storagepacker/types.pb.go b/helper/storagepacker/types.pb.go
index 6bed81c48..1d4d87b6b 100644
--- a/helper/storagepacker/types.pb.go
+++ b/helper/storagepacker/types.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: helper/storagepacker/types.proto
 
 package storagepacker
diff --git a/physical/raft/types.pb.go b/physical/raft/types.pb.go
index 6b9e4c4b3..b35293109 100644
--- a/physical/raft/types.pb.go
+++ b/physical/raft/types.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: physical/raft/types.proto
 
 package raft
diff --git a/sdk/database/dbplugin/database.pb.go b/sdk/database/dbplugin/database.pb.go
index c916c861e..df7a138e0 100644
--- a/sdk/database/dbplugin/database.pb.go
+++ b/sdk/database/dbplugin/database.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: sdk/database/dbplugin/database.proto
 
 package dbplugin
diff --git a/sdk/database/dbplugin/v5/proto/database.pb.go b/sdk/database/dbplugin/v5/proto/database.pb.go
index f814c60bc..dd595c904 100644
--- a/sdk/database/dbplugin/v5/proto/database.pb.go
+++ b/sdk/database/dbplugin/v5/proto/database.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: sdk/database/dbplugin/v5/proto/database.proto
 
 package proto
diff --git a/sdk/helper/pluginutil/multiplexing.pb.go b/sdk/helper/pluginutil/multiplexing.pb.go
index d7073b10e..96963af3e 100644
--- a/sdk/helper/pluginutil/multiplexing.pb.go
+++ b/sdk/helper/pluginutil/multiplexing.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: sdk/helper/pluginutil/multiplexing.proto
 
 package pluginutil
diff --git a/sdk/logical/identity.pb.go b/sdk/logical/identity.pb.go
index 6c1c4b2c9..18af6e682 100644
--- a/sdk/logical/identity.pb.go
+++ b/sdk/logical/identity.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: sdk/logical/identity.proto
 
 package logical
diff --git a/sdk/logical/plugin.pb.go b/sdk/logical/plugin.pb.go
index 03be5d3cb..9be723e14 100644
--- a/sdk/logical/plugin.pb.go
+++ b/sdk/logical/plugin.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: sdk/logical/plugin.proto
 
 package logical
diff --git a/sdk/logical/version.pb.go b/sdk/logical/version.pb.go
index 7845aeaf5..415970f19 100644
--- a/sdk/logical/version.pb.go
+++ b/sdk/logical/version.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: sdk/logical/version.proto
 
 package logical
diff --git a/sdk/plugin/pb/backend.pb.go b/sdk/plugin/pb/backend.pb.go
index 8b764b5fd..88d55809c 100644
--- a/sdk/plugin/pb/backend.pb.go
+++ b/sdk/plugin/pb/backend.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: sdk/plugin/pb/backend.proto
 
 package pb
diff --git a/vault/activity/activity_log.pb.go b/vault/activity/activity_log.pb.go
index 3fe3f2fac..b61e76aad 100644
--- a/vault/activity/activity_log.pb.go
+++ b/vault/activity/activity_log.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: vault/activity/activity_log.proto
 
 package activity
diff --git a/vault/hcp_link/proto/node_status/status.pb.go b/vault/hcp_link/proto/node_status/status.pb.go
index 7e85b3a6d..216158efb 100644
--- a/vault/hcp_link/proto/node_status/status.pb.go
+++ b/vault/hcp_link/proto/node_status/status.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: vault/hcp_link/proto/node_status/status.proto
 
 package node_status
diff --git a/vault/request_forwarding_service.pb.go b/vault/request_forwarding_service.pb.go
index 86d334751..aed50fab9 100644
--- a/vault/request_forwarding_service.pb.go
+++ b/vault/request_forwarding_service.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: vault/request_forwarding_service.proto
 
 package vault
diff --git a/vault/tokens/token.pb.go b/vault/tokens/token.pb.go
index 7c8c53392..e6ab0dd39 100644
--- a/vault/tokens/token.pb.go
+++ b/vault/tokens/token.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.5
+// 	protoc        v3.21.7
 // source: vault/tokens/token.proto
 
 package tokens