diff --git a/server/etcdmain/config.go b/server/etcdmain/config.go
index 15487bdf85d7..ca651e1669cb 100644
--- a/server/etcdmain/config.go
+++ b/server/etcdmain/config.go
@@ -62,8 +62,9 @@ var (
 		"snapshot-count": "--snapshot-count is deprecated in 3.6 and will be decommissioned in 3.7.",
 		"max-snapshots":  "--max-snapshots is deprecated in 3.6 and will be decommissioned in 3.7.",
 		"v2-deprecation": "--v2-deprecation is deprecated and scheduled for removal in v3.8. The default value is enforced, ignoring user input.",
-		"experimental-compact-hash-check-enabled": "--experimental-compact-hash-check-enabled is deprecated in 3.6 and will be decommissioned in 3.7. Use '--feature-gates=CompactHashCheck=true' instead.",
-		"experimental-compact-hash-check-time":    "--experimental-compact-hash-check-time is deprecated in 3.6 and will be decommissioned in 3.7. Use '--compact-hash-check-time' instead.",
+		"experimental-compact-hash-check-enabled":        "--experimental-compact-hash-check-enabled is deprecated in 3.6 and will be decommissioned in 3.7. Use '--feature-gates=CompactHashCheck=true' instead.",
+		"experimental-compact-hash-check-time":           "--experimental-compact-hash-check-time is deprecated in 3.6 and will be decommissioned in 3.7. Use '--compact-hash-check-time' instead.",
+		"experimental-txn-mode-write-with-shared-buffer": "--experimental-txn-mode-write-with-shared-buffer is deprecated in v3.6 and will be decommissioned in v3.7. Use '--feature-gates=TxnModeWriteWithSharedBuffer=true' instead.",
 	}
 )
 
diff --git a/server/etcdmain/help.go b/server/etcdmain/help.go
index a00d3195a111..aed619c548fb 100644
--- a/server/etcdmain/help.go
+++ b/server/etcdmain/help.go
@@ -293,7 +293,7 @@ Experimental feature:
     Duration of periodical watch progress notification.
   --experimental-warning-apply-duration '100ms'
     Warning is generated if requests take more than this duration.
-  --experimental-txn-mode-write-with-shared-buffer 'true'. It's deprecated, and will be decommissioned in v3.7. Use '--feature-gates=TxnModeWriteWithSharedBuffer=true' instead.
+  --experimental-txn-mode-write-with-shared-buffer 'true'. Deprecated in v3.6 and will be decommissioned in v3.7. Use '--feature-gates=TxnModeWriteWithSharedBuffer=true' instead.
     Enable the write transaction to use a shared buffer in its readonly check operations.
   --experimental-bootstrap-defrag-threshold-megabytes
     Enable the defrag during etcd server bootstrap on condition that it will free at least the provided threshold of disk space. Needs to be set to non-zero value to take effect.
diff --git a/server/etcdserver/server_test.go b/server/etcdserver/server_test.go
index a18a0fbc8df5..7db595f5fc36 100644
--- a/server/etcdserver/server_test.go
+++ b/server/etcdserver/server_test.go
@@ -160,7 +160,7 @@ func TestV2SetMemberAttributes(t *testing.T) {
 	cl := newTestClusterWithBackend(t, []*membership.Member{{ID: 1}}, be)
 
 	cfg := config.ServerConfig{
-		ServerFeatureGate: features.NewDefaultServerFeatureGate("TxnModeWriteWithSharedBuffer", nil),
+		ServerFeatureGate: features.NewDefaultServerFeatureGate("test", nil),
 	}
 
 	srv := &EtcdServer{
@@ -206,7 +206,7 @@ func TestV2SetClusterVersion(t *testing.T) {
 	cl := newTestClusterWithBackend(t, []*membership.Member{}, be)
 	cl.SetVersion(semver.New("3.4.0"), api.UpdateCapability, membership.ApplyBoth)
 	cfg := config.ServerConfig{
-		ServerFeatureGate: features.NewDefaultServerFeatureGate("TxnModeWriteWithSharedBuffer", nil),
+		ServerFeatureGate: features.NewDefaultServerFeatureGate("test", nil),
 	}
 
 	srv := &EtcdServer{
@@ -778,7 +778,7 @@ func TestSnapshotOrdering(t *testing.T) {
 		Logger:                 lg,
 		DataDir:                testdir,
 		SnapshotCatchUpEntries: DefaultSnapshotCatchUpEntries,
-		ServerFeatureGate:      features.NewDefaultServerFeatureGate("TxnModeWriteWithSharedBuffer", nil),
+		ServerFeatureGate:      features.NewDefaultServerFeatureGate("test", lg),
 	}
 
 	s := &EtcdServer{
@@ -878,7 +878,7 @@ func TestConcurrentApplyAndSnapshotV3(t *testing.T) {
 			Logger:                 lg,
 			DataDir:                testdir,
 			SnapshotCatchUpEntries: DefaultSnapshotCatchUpEntries,
-			ServerFeatureGate:      features.NewDefaultServerFeatureGate("TxnModeWriteWithSharedBuffer", nil),
+			ServerFeatureGate:      features.NewDefaultServerFeatureGate("test", lg),
 		},
 		r:                 *r,
 		v2store:           st,
diff --git a/server/features/etcd_features.go b/server/features/etcd_features.go
index 2e7ebd569578..0a63991b202d 100644
--- a/server/features/etcd_features.go
+++ b/server/features/etcd_features.go
@@ -46,7 +46,7 @@ const (
 	// main PR: https://github.com/etcd-io/etcd/pull/18279
 	StopGRPCServiceOnDefrag featuregate.Feature = "StopGRPCServiceOnDefrag"
 	// TxnModeWriteWithSharedBuffer enables the write transaction to use a shared buffer in its readonly check operations.
-	// owner: @serathius
+	// owner: @wilsonwang371
 	// alpha: v3.6
 	// main PR: https://github.com/etcd-io/etcd/pull/12896
 	TxnModeWriteWithSharedBuffer featuregate.Feature = "TxnModeWriteWithSharedBuffer"