diff --git a/Makefile b/Makefile
index cd6d563dc..9b577c2a9 100644
--- a/Makefile
+++ b/Makefile
@@ -31,3 +31,23 @@ endif
 .PHONY: markdown-diff-lint
 markdown-diff-lint:
 	./scripts/markdown_diff_lint.sh
+
+METRICS_DOCS_TAG_ARG=$(if $(TAG),--tag "$(TAG)",)
+
+.PHONY: update-metrics-docs
+update-metrics-docs:
+ifndef VERSION
+	@echo "VERSION needs to be specified (e.g. VERSION=v3.6 TAG=v3.6.0)" && exit 1
+else
+	bash ./scripts/update-metrics-docs.sh --version "$(VERSION)" $(METRICS_DOCS_TAG_ARG)
+	npm run build
+endif
+
+.PHONY: verify-metrics-docs
+verify-metrics-docs:
+ifndef VERSION
+	@echo "VERSION needs to be specified (e.g. VERSION=v3.6 TAG=v3.6.0)" && exit 1
+else
+	bash ./scripts/update-metrics-docs.sh --verify --version "$(VERSION)" $(METRICS_DOCS_TAG_ARG)
+	npm run build
+endif
diff --git a/content/en/docs/v3.6/metrics/etcd-metrics-latest.txt b/content/en/docs/v3.6/metrics/etcd-metrics-latest.txt
index 63f8d0d29..a9e759b62 100644
--- a/content/en/docs/v3.6/metrics/etcd-metrics-latest.txt
+++ b/content/en/docs/v3.6/metrics/etcd-metrics-latest.txt
@@ -1,9 +1,9 @@
-# server version: etcd_server_version{server_version="3.5.0-pre"}
+# server version: etcd_server_version{server_version="3.6.0"}
 
 # name: "etcd_cluster_version"
 # description: "Which version is running. 1 for 'cluster_version' label with current cluster version"
 # type: "gauge"
-etcd_cluster_version{cluster_version="3.5"}
+etcd_cluster_version{cluster_version="3.6"}
 
 # name: "etcd_debugging_auth_revision"
 # description: "The current revision of auth store."
@@ -180,16 +180,6 @@ etcd_debugging_mvcc_db_compaction_total_duration_milliseconds_bucket{le="+Inf"}
 etcd_debugging_mvcc_db_compaction_total_duration_milliseconds_sum
 etcd_debugging_mvcc_db_compaction_total_duration_milliseconds_count
 
-# name: "etcd_debugging_mvcc_db_total_size_in_bytes"
-# description: "Total size of the underlying database physically allocated in bytes."
-# type: "gauge"
-etcd_debugging_mvcc_db_total_size_in_bytes
-
-# name: "etcd_debugging_mvcc_delete_total"
-# description: "Total number of deletes seen by this member."
-# type: "counter"
-etcd_debugging_mvcc_delete_total
-
 # name: "etcd_debugging_mvcc_events_total"
 # description: "Total number of events sent by this member."
 # type: "counter"
@@ -226,16 +216,6 @@ etcd_debugging_mvcc_keys_total
 # type: "gauge"
 etcd_debugging_mvcc_pending_events_total
 
-# name: "etcd_debugging_mvcc_put_total"
-# description: "Total number of puts seen by this member."
-# type: "counter"
-etcd_debugging_mvcc_put_total
-
-# name: "etcd_debugging_mvcc_range_total"
-# description: "Total number of ranges seen by this member."
-# type: "counter"
-etcd_debugging_mvcc_range_total
-
 # name: "etcd_debugging_mvcc_slow_watcher_total"
 # description: "Total number of unsynced slow watchers."
 # type: "gauge"
@@ -246,11 +226,6 @@ etcd_debugging_mvcc_slow_watcher_total
 # type: "gauge"
 etcd_debugging_mvcc_total_put_size_in_bytes
 
-# name: "etcd_debugging_mvcc_txn_total"
-# description: "Total number of txns seen by this member."
-# type: "counter"
-etcd_debugging_mvcc_txn_total
-
 # name: "etcd_debugging_mvcc_watch_stream_total"
 # description: "Total number of watch streams."
 # type: "gauge"
@@ -399,6 +374,11 @@ etcd_disk_backend_snapshot_duration_seconds_bucket{le="+Inf"}
 etcd_disk_backend_snapshot_duration_seconds_sum
 etcd_disk_backend_snapshot_duration_seconds_count
 
+# name: "etcd_disk_defrag_inflight"
+# description: "Whether or not defrag is active on the member. 1 means active, 0 means not."
+# type: "gauge"
+etcd_disk_defrag_inflight
+
 # name: "etcd_disk_wal_fsync_duration_seconds"
 # description: "The latency distributions of fsync called by WAL."
 # type: "histogram"
@@ -425,6 +405,52 @@ etcd_disk_wal_fsync_duration_seconds_count
 # type: "gauge"
 etcd_disk_wal_write_bytes_total
 
+# name: "etcd_disk_wal_write_duration_seconds"
+# description: "The latency distributions of write called by WAL."
+# type: "histogram"
+etcd_disk_wal_write_duration_seconds_bucket{le="0.001"}
+etcd_disk_wal_write_duration_seconds_bucket{le="0.002"}
+etcd_disk_wal_write_duration_seconds_bucket{le="0.004"}
+etcd_disk_wal_write_duration_seconds_bucket{le="0.008"}
+etcd_disk_wal_write_duration_seconds_bucket{le="0.016"}
+etcd_disk_wal_write_duration_seconds_bucket{le="0.032"}
+etcd_disk_wal_write_duration_seconds_bucket{le="0.064"}
+etcd_disk_wal_write_duration_seconds_bucket{le="0.128"}
+etcd_disk_wal_write_duration_seconds_bucket{le="0.256"}
+etcd_disk_wal_write_duration_seconds_bucket{le="0.512"}
+etcd_disk_wal_write_duration_seconds_bucket{le="1.024"}
+etcd_disk_wal_write_duration_seconds_bucket{le="2.048"}
+etcd_disk_wal_write_duration_seconds_bucket{le="4.096"}
+etcd_disk_wal_write_duration_seconds_bucket{le="8.192"}
+etcd_disk_wal_write_duration_seconds_bucket{le="+Inf"}
+etcd_disk_wal_write_duration_seconds_sum
+etcd_disk_wal_write_duration_seconds_count
+
+# name: "etcd_grpc_proxy_cache_hits_total"
+# description: "Total number of cache hits"
+# type: "gauge"
+etcd_grpc_proxy_cache_hits_total
+
+# name: "etcd_grpc_proxy_cache_keys_total"
+# description: "Total number of keys/ranges cached"
+# type: "gauge"
+etcd_grpc_proxy_cache_keys_total
+
+# name: "etcd_grpc_proxy_cache_misses_total"
+# description: "Total number of cache misses"
+# type: "gauge"
+etcd_grpc_proxy_cache_misses_total
+
+# name: "etcd_grpc_proxy_events_coalescing_total"
+# description: "Total number of events coalescing"
+# type: "counter"
+etcd_grpc_proxy_events_coalescing_total
+
+# name: "etcd_grpc_proxy_watchers_coalescing_total"
+# description: "Total number of current watchers coalescing"
+# type: "gauge"
+etcd_grpc_proxy_watchers_coalescing_total
+
 # name: "etcd_mvcc_db_open_read_transactions"
 # description: "The number of currently open read transactions"
 # type: "gauge"
@@ -519,6 +545,12 @@ etcd_network_client_grpc_received_bytes_total
 # type: "counter"
 etcd_network_client_grpc_sent_bytes_total
 
+# name: "etcd_network_known_peers"
+# description: "The current number of known peers."
+# type: "gauge"
+etcd_network_known_peers{Local="7339c4e5e833c029",Remote="729934363faa4a24"}
+etcd_network_known_peers{Local="7339c4e5e833c029",Remote="7339c4e5e833c029"}
+
 # name: "etcd_network_peer_received_bytes_total"
 # description: "The total number of bytes received from peers."
 # type: "counter"
@@ -552,16 +584,125 @@ etcd_network_peer_round_trip_time_seconds_sum{To="REMOTE_PEER_NODE_ID"}
 # type: "counter"
 etcd_network_peer_sent_bytes_total{To="REMOTE_PEER_NODE_ID"}
 
+# name: "etcd_server_apply_duration_seconds"
+# description: "The latency distributions of v2 apply called by backend."
+# type: "histogram"
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="0.0001"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="0.0002"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="0.0004"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="0.0008"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="0.0016"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="0.0032"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="0.0064"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="0.0128"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="0.0256"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="0.0512"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="0.1024"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="0.2048"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="0.4096"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="0.8192"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="1.6384"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="3.2768"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="6.5536"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="13.1072"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="26.2144"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="52.4288"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterMemberAttrSet",success="true",version="v3",le="+Inf"}
+etcd_server_apply_duration_seconds_sum{op="ClusterMemberAttrSet",success="true",version="v3"}
+etcd_server_apply_duration_seconds_count{op="ClusterMemberAttrSet",success="true",version="v3"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="0.0001"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="0.0002"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="0.0004"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="0.0008"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="0.0016"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="0.0032"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="0.0064"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="0.0128"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="0.0256"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="0.0512"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="0.1024"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="0.2048"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="0.4096"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="0.8192"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="1.6384"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="3.2768"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="6.5536"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="13.1072"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="26.2144"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="52.4288"}
+etcd_server_apply_duration_seconds_bucket{op="ClusterVersionSet",success="true",version="v3",le="+Inf"}
+etcd_server_apply_duration_seconds_sum{op="ClusterVersionSet",success="true",version="v3"}
+etcd_server_apply_duration_seconds_count{op="ClusterVersionSet",success="true",version="v3"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="0.0001"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="0.0002"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="0.0004"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="0.0008"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="0.0016"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="0.0032"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="0.0064"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="0.0128"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="0.0256"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="0.0512"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="0.1024"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="0.2048"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="0.4096"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="0.8192"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="1.6384"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="3.2768"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="6.5536"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="13.1072"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="26.2144"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="52.4288"}
+etcd_server_apply_duration_seconds_bucket{op="DeleteRange",success="true",version="v3",le="+Inf"}
+etcd_server_apply_duration_seconds_sum{op="DeleteRange",success="true",version="v3"}
+etcd_server_apply_duration_seconds_count{op="DeleteRange",success="true",version="v3"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="0.0001"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="0.0002"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="0.0004"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="0.0008"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="0.0016"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="0.0032"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="0.0064"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="0.0128"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="0.0256"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="0.0512"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="0.1024"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="0.2048"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="0.4096"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="0.8192"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="1.6384"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="3.2768"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="6.5536"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="13.1072"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="26.2144"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="52.4288"}
+etcd_server_apply_duration_seconds_bucket{op="Put",success="true",version="v3",le="+Inf"}
+etcd_server_apply_duration_seconds_sum{op="Put",success="true",version="v3"}
+etcd_server_apply_duration_seconds_count{op="Put",success="true",version="v3"}
+
 # name: "etcd_server_client_requests_total"
 # description: "The total number of client requests per client version."
 # type: "counter"
-etcd_server_client_requests_total{client_api_version="3.5",type="stream"}
-etcd_server_client_requests_total{client_api_version="3.5",type="unary"}
+etcd_server_client_requests_total{client_api_version="3.6",type="stream"}
+etcd_server_client_requests_total{client_api_version="3.6",type="unary"}
+
+# name: "etcd_server_feature_enabled"
+# description: "Whether or not a feature is enabled. 1 is enabled, 0 is not."
+# type: "gauge"
+etcd_server_feature_enabled{name="AllAlpha",stage="ALPHA"}
+etcd_server_feature_enabled{name="AllBeta",stage="BETA"}
+etcd_server_feature_enabled{name="CompactHashCheck",stage="ALPHA"}
+etcd_server_feature_enabled{name="InitialCorruptCheck",stage="ALPHA"}
+etcd_server_feature_enabled{name="LeaseCheckpoint",stage="ALPHA"}
+etcd_server_feature_enabled{name="LeaseCheckpointPersist",stage="ALPHA"}
+etcd_server_feature_enabled{name="SetMemberLocalAddr",stage="ALPHA"}
+etcd_server_feature_enabled{name="StopGRPCServiceOnDefrag",stage="ALPHA"}
+etcd_server_feature_enabled{name="TxnModeWriteWithSharedBuffer",stage="BETA"}
 
 # name: "etcd_server_go_version"
 # description: "Which Go version server is running with. 1 for 'server_go_version' label with current version."
 # type: "gauge"
-etcd_server_go_version{server_go_version="go1.14.3"}
+etcd_server_go_version{server_go_version="go1.23.9"}
 
 # name: "etcd_server_has_leader"
 # description: "Whether or not a leader exists. 1 is existence, 0 is not."
@@ -586,8 +727,7 @@ etcd_server_heartbeat_send_failures_total
 # name: "etcd_server_id"
 # description: "Server or member ID in hexadecimal format. 1 for 'server_id' label with current ID."
 # type: "gauge"
-etcd_server_id{server_id="451af08594378132"}
-etcd_server_id{server_id="61791325a7fedcf8"}
+etcd_server_id{server_id="7339c4e5e833c029"}
 
 # name: "etcd_server_is_leader"
 # description: "Whether or not this member is a leader. 1 if is, 0 otherwise."
@@ -634,6 +774,33 @@ etcd_server_proposals_pending
 # type: "gauge"
 etcd_server_quota_backend_bytes
 
+# name: "etcd_server_range_duration_seconds"
+# description: "The latency distributions of txn.Range"
+# type: "histogram"
+etcd_server_range_duration_seconds_bucket{success="true",le="0.0001"}
+etcd_server_range_duration_seconds_bucket{success="true",le="0.0002"}
+etcd_server_range_duration_seconds_bucket{success="true",le="0.0004"}
+etcd_server_range_duration_seconds_bucket{success="true",le="0.0008"}
+etcd_server_range_duration_seconds_bucket{success="true",le="0.0016"}
+etcd_server_range_duration_seconds_bucket{success="true",le="0.0032"}
+etcd_server_range_duration_seconds_bucket{success="true",le="0.0064"}
+etcd_server_range_duration_seconds_bucket{success="true",le="0.0128"}
+etcd_server_range_duration_seconds_bucket{success="true",le="0.0256"}
+etcd_server_range_duration_seconds_bucket{success="true",le="0.0512"}
+etcd_server_range_duration_seconds_bucket{success="true",le="0.1024"}
+etcd_server_range_duration_seconds_bucket{success="true",le="0.2048"}
+etcd_server_range_duration_seconds_bucket{success="true",le="0.4096"}
+etcd_server_range_duration_seconds_bucket{success="true",le="0.8192"}
+etcd_server_range_duration_seconds_bucket{success="true",le="1.6384"}
+etcd_server_range_duration_seconds_bucket{success="true",le="3.2768"}
+etcd_server_range_duration_seconds_bucket{success="true",le="6.5536"}
+etcd_server_range_duration_seconds_bucket{success="true",le="13.1072"}
+etcd_server_range_duration_seconds_bucket{success="true",le="26.2144"}
+etcd_server_range_duration_seconds_bucket{success="true",le="52.4288"}
+etcd_server_range_duration_seconds_bucket{success="true",le="+Inf"}
+etcd_server_range_duration_seconds_sum{success="true"}
+etcd_server_range_duration_seconds_count{success="true"}
+
 # name: "etcd_server_read_indexes_failed_total"
 # description: "The total number of failed read indexes seen."
 # type: "counter"
@@ -657,7 +824,7 @@ etcd_server_snapshot_apply_in_progress_total
 # name: "etcd_server_version"
 # description: "Which version is running. 1 for 'server_version' label with current version."
 # type: "gauge"
-etcd_server_version{server_version="3.5.0-pre"}
+etcd_server_version{server_version="3.6.0"}
 
 # name: "etcd_snap_db_fsync_duration_seconds"
 # description: "The latency distributions of fsyncing .snap.db file"
@@ -719,7 +886,7 @@ etcd_snap_fsync_duration_seconds_sum
 etcd_snap_fsync_duration_seconds_count
 
 # name: "go_gc_duration_seconds"
-# description: "A summary of the GC invocation durations."
+# description: "A summary of the wall-time pause (stop-the-world) duration in garbage collection cycles."
 # type: "summary"
 go_gc_duration_seconds{quantile="0"}
 go_gc_duration_seconds{quantile="0.25"}
@@ -729,6 +896,16 @@ go_gc_duration_seconds{quantile="1"}
 go_gc_duration_seconds_sum
 go_gc_duration_seconds_count
 
+# name: "go_gc_gogc_percent"
+# description: "Heap size target percentage configured by the user, otherwise 100. This value is set by the GOGC environment variable, and the runtime/debug.SetGCPercent function. Sourced from /gc/gogc:percent"
+# type: "gauge"
+go_gc_gogc_percent
+
+# name: "go_gc_gomemlimit_bytes"
+# description: "Go runtime memory limit configured by the user, otherwise math.MaxInt64. This value is set by the GOMEMLIMIT environment variable, and the runtime/debug.SetMemoryLimit function. Sourced from /gc/gomemlimit:bytes"
+# type: "gauge"
+go_gc_gomemlimit_bytes
+
 # name: "go_goroutines"
 # description: "Number of goroutines that currently exist."
 # type: "gauge"
@@ -737,65 +914,60 @@ go_goroutines
 # name: "go_info"
 # description: "Information about the Go environment."
 # type: "gauge"
-go_info{version="go1.14.3"}
+go_info{version="go1.23.9"}
 
 # name: "go_memstats_alloc_bytes"
-# description: "Number of bytes allocated and still in use."
+# description: "Number of bytes allocated in heap and currently in use. Equals to /memory/classes/heap/objects:bytes."
 # type: "gauge"
 go_memstats_alloc_bytes
 
 # name: "go_memstats_alloc_bytes_total"
-# description: "Total number of bytes allocated, even if freed."
+# description: "Total number of bytes allocated in heap until now, even if released already. Equals to /gc/heap/allocs:bytes."
 # type: "counter"
 go_memstats_alloc_bytes_total
 
 # name: "go_memstats_buck_hash_sys_bytes"
-# description: "Number of bytes used by the profiling bucket hash table."
+# description: "Number of bytes used by the profiling bucket hash table. Equals to /memory/classes/profiling/buckets:bytes."
 # type: "gauge"
 go_memstats_buck_hash_sys_bytes
 
 # name: "go_memstats_frees_total"
-# description: "Total number of frees."
+# description: "Total number of heap objects frees. Equals to /gc/heap/frees:objects + /gc/heap/tiny/allocs:objects."
 # type: "counter"
 go_memstats_frees_total
 
-# name: "go_memstats_gc_cpu_fraction"
-# description: "The fraction of this program's available CPU time used by the GC since the program started."
-# type: "gauge"
-go_memstats_gc_cpu_fraction
-
 # name: "go_memstats_gc_sys_bytes"
-# description: "Number of bytes used for garbage collection system metadata."
+# description: "Number of bytes used for garbage collection system metadata. Equals to /memory/classes/metadata/other:bytes."
 # type: "gauge"
 go_memstats_gc_sys_bytes
 
 # name: "go_memstats_heap_alloc_bytes"
-# description: "Number of heap bytes allocated and still in use."
+# description: "Number of heap bytes allocated and currently in use, same as go_memstats_alloc_bytes. Equals to /memory/classes/heap/objects:bytes."
 # type: "gauge"
 go_memstats_heap_alloc_bytes
 
 # name: "go_memstats_heap_idle_bytes"
-# description: "Number of heap bytes waiting to be used."
+# description: "Number of heap bytes waiting to be used. Equals to /memory/classes/heap/released:bytes + /memory/classes/heap/free:bytes."
 # type: "gauge"
 go_memstats_heap_idle_bytes
 
 # name: "go_memstats_heap_inuse_bytes"
-# description: "Number of heap bytes that are in use."
+# description: "Number of heap bytes that are in use. Equals to /memory/classes/heap/objects:bytes + /memory/classes/heap/unused:bytes"
 # type: "gauge"
 go_memstats_heap_inuse_bytes
 
 # name: "go_memstats_heap_objects"
-# description: "Number of allocated objects."
+# description: "Number of currently allocated objects. Equals to /gc/heap/objects:objects."
 # type: "gauge"
 go_memstats_heap_objects
 
 # name: "go_memstats_heap_released_bytes"
-# description: "Number of heap bytes released to OS."
+# description: "Number of heap bytes released to OS. Equals to /memory/classes/heap/released:bytes."
 # type: "gauge"
 go_memstats_heap_released_bytes
 
 # name: "go_memstats_heap_sys_bytes"
-# description: "Number of heap bytes obtained from system."
+# description: "Number of heap bytes obtained from system. Equals to /memory/classes/heap/objects:bytes + /memory/classes/heap/unused:bytes + /memory/classes/heap/released:bytes + /memory/classes/heap/free:bytes."
 # type: "gauge"
 go_memstats_heap_sys_bytes
 
@@ -804,61 +976,61 @@ go_memstats_heap_sys_bytes
 # type: "gauge"
 go_memstats_last_gc_time_seconds
 
-# name: "go_memstats_lookups_total"
-# description: "Total number of pointer lookups."
-# type: "counter"
-go_memstats_lookups_total
-
 # name: "go_memstats_mallocs_total"
-# description: "Total number of mallocs."
+# description: "Total number of heap objects allocated, both live and gc-ed. Semantically a counter version for go_memstats_heap_objects gauge. Equals to /gc/heap/allocs:objects + /gc/heap/tiny/allocs:objects."
 # type: "counter"
 go_memstats_mallocs_total
 
 # name: "go_memstats_mcache_inuse_bytes"
-# description: "Number of bytes in use by mcache structures."
+# description: "Number of bytes in use by mcache structures. Equals to /memory/classes/metadata/mcache/inuse:bytes."
 # type: "gauge"
 go_memstats_mcache_inuse_bytes
 
 # name: "go_memstats_mcache_sys_bytes"
-# description: "Number of bytes used for mcache structures obtained from system."
+# description: "Number of bytes used for mcache structures obtained from system. Equals to /memory/classes/metadata/mcache/inuse:bytes + /memory/classes/metadata/mcache/free:bytes."
 # type: "gauge"
 go_memstats_mcache_sys_bytes
 
 # name: "go_memstats_mspan_inuse_bytes"
-# description: "Number of bytes in use by mspan structures."
+# description: "Number of bytes in use by mspan structures. Equals to /memory/classes/metadata/mspan/inuse:bytes."
 # type: "gauge"
 go_memstats_mspan_inuse_bytes
 
 # name: "go_memstats_mspan_sys_bytes"
-# description: "Number of bytes used for mspan structures obtained from system."
+# description: "Number of bytes used for mspan structures obtained from system. Equals to /memory/classes/metadata/mspan/inuse:bytes + /memory/classes/metadata/mspan/free:bytes."
 # type: "gauge"
 go_memstats_mspan_sys_bytes
 
 # name: "go_memstats_next_gc_bytes"
-# description: "Number of heap bytes when next garbage collection will take place."
+# description: "Number of heap bytes when next garbage collection will take place. Equals to /gc/heap/goal:bytes."
 # type: "gauge"
 go_memstats_next_gc_bytes
 
 # name: "go_memstats_other_sys_bytes"
-# description: "Number of bytes used for other system allocations."
+# description: "Number of bytes used for other system allocations. Equals to /memory/classes/other:bytes."
 # type: "gauge"
 go_memstats_other_sys_bytes
 
 # name: "go_memstats_stack_inuse_bytes"
-# description: "Number of bytes in use by the stack allocator."
+# description: "Number of bytes obtained from system for stack allocator in non-CGO environments. Equals to /memory/classes/heap/stacks:bytes."
 # type: "gauge"
 go_memstats_stack_inuse_bytes
 
 # name: "go_memstats_stack_sys_bytes"
-# description: "Number of bytes obtained from system for stack allocator."
+# description: "Number of bytes obtained from system for stack allocator. Equals to /memory/classes/heap/stacks:bytes + /memory/classes/os-stacks:bytes."
 # type: "gauge"
 go_memstats_stack_sys_bytes
 
 # name: "go_memstats_sys_bytes"
-# description: "Number of bytes obtained from system."
+# description: "Number of bytes obtained from system. Equals to /memory/classes/total:byte."
 # type: "gauge"
 go_memstats_sys_bytes
 
+# name: "go_sched_gomaxprocs_threads"
+# description: "The current runtime.GOMAXPROCS setting, or the number of operating system threads that can execute user-level Go code simultaneously. Sourced from /sched/gomaxprocs:threads"
+# type: "gauge"
+go_sched_gomaxprocs_threads
+
 # name: "go_threads"
 # description: "Number of OS threads created."
 # type: "gauge"
@@ -1090,6 +1262,16 @@ process_cpu_seconds_total
 # type: "gauge"
 process_max_fds
 
+# name: "process_network_receive_bytes_total"
+# description: "Number of bytes received by the process over the network."
+# type: "counter"
+process_network_receive_bytes_total
+
+# name: "process_network_transmit_bytes_total"
+# description: "Number of bytes sent by the process over the network."
+# type: "counter"
+process_network_transmit_bytes_total
+
 # name: "process_open_fds"
 # description: "Number of open file descriptors."
 # type: "gauge"
diff --git a/layouts/_default/metrics-entry.html b/layouts/_default/metrics-entry.html
index d20732e5a..8f585b24d 100644
--- a/layouts/_default/metrics-entry.html
+++ b/layouts/_default/metrics-entry.html
@@ -2,31 +2,18 @@
 <div class="td-content">
   <h1>{{ .Title }}</h1>
 
-  {{- $txtURL := printf "%s.txt" (strings.TrimSuffix "/" .RelPermalink) -}}
-  <p><a href="{{ $txtURL }}">View txt file</a></p>
-
   {{- $content := readFile .Params.metricsFilePath -}}
   {{- $lines := split $content "\n" -}}
-
-  {{/*
-    Parse the metrics file line by line.
-    Each metric block starts with a "# name:" comment and is followed by
-    optional "# description:" and "# type:" comments, then one or more
-    sample lines whose label set (the "{key=value,...}" part) we extract.
-
-    Variables hold the current metric's fields while iterating over file lines.
-  */}}
   {{- $metrics := slice -}}
   {{- $metricName := "" -}}
   {{- $metricDesc := "" -}}
   {{- $metricType := "" -}}
-  {{- $metricLabels := "" -}}
+  {{- $metricLabels := slice -}}
 
   {{- range $lines -}}
-    {{- $t := trim . " " -}}
+    {{- $t := trim . " \r" -}}
 
     {{- if hasPrefix $t "# name:" -}}
-      {{/* Starting a new metric block — append the previous one (if any) first. */}}
       {{- if ne $metricName "" -}}
         {{- $metrics = $metrics | append (dict
           "name" $metricName
@@ -38,7 +25,7 @@ <h1>{{ .Title }}</h1>
       {{- $metricName = replaceRE `^# name: "(.*)"$` "$1" $t -}}
       {{- $metricDesc = "" -}}
       {{- $metricType = "" -}}
-      {{- $metricLabels = "" -}}
+      {{- $metricLabels = slice -}}
 
     {{- else if hasPrefix $t "# description:" -}}
       {{- $metricDesc = replaceRE `^# description: "(.*)"$` "$1" $t -}}
@@ -46,13 +33,17 @@ <h1>{{ .Title }}</h1>
     {{- else if hasPrefix $t "# type:" -}}
       {{- $metricType = replaceRE `^# type: "(.*)"$` "$1" $t -}}
 
-    {{- else if and (ne $metricName "") (eq $metricLabels "") (hasPrefix $t $metricName) (in $t "{") (in $t "}") -}}
-      {{/* First sample line for this metric: extract the label set from {…}. */}}
-      {{- $metricLabels = replaceRE `^[^{]*\{([^}]*)\}.*$` "$1" $t -}}
+    {{- else if and (ne $metricName "") (hasPrefix $t $metricName) (in $t "{") (in $t "}") -}}
+      {{- $labelSet := replaceRE `^[^{]*\{([^}]*)\}.*$` "$1" $t -}}
+      {{- range split $labelSet "," -}}
+        {{- $labelName := replaceRE `^([^=]+)=.*$` "$1" (trim . " \r") -}}
+        {{- if and (ne $labelName "") (ne $labelName "le") (ne $labelName "quantile") (not (in $metricLabels $labelName)) -}}
+          {{- $metricLabels = $metricLabels | append $labelName -}}
+        {{- end -}}
+      {{- end -}}
     {{- end -}}
   {{- end -}}
 
-  {{/* Append the final metric block after the loop ends. */}}
   {{- if ne $metricName "" -}}
     {{- $metrics = $metrics | append (dict
       "name" $metricName
@@ -62,20 +53,24 @@ <h1>{{ .Title }}</h1>
     ) -}}
   {{- end -}}
 
-
-  {{/* Display the parsed metrics in a table. */}}
-  <table>
-    <thead><tr><th>Name</th><th>Type</th><th>Description</th><th>Labels</th></tr></thead>
-    <tbody>
-    {{- range $metrics -}}
-    <tr>
-      <td><code>{{ .name }}</code></td>
-      <td>{{ .type }}</td>
-      <td>{{ .description }}</td>
-      <td>{{ if .labels }}<code>{{ .labels }}</code>{{ else }}-{{ end }}</td>
-    </tr>
-    {{- end -}}
-    </tbody>
-  </table>
+  {{- range $i, $metric := $metrics }}
+    <section class="mb-4 p-3 {{ if modBool $i 2 }}bg-light{{ end }}">
+      <div id="{{ $metric.name | anchorize }}" class="h5 font-weight-bold text-dark text-monospace" style="font-weight: 700;">{{ $metric.name }}</div>
+      {{- with $metric.description }}
+        <p>{{ . }}</p>
+      {{- end }}
+      <ul>
+        <li><strong>Type:</strong> {{ $metric.type | title }}</li>
+        {{- if $metric.labels }}
+          <li>
+            <strong>Labels:</strong>
+            {{- range $metric.labels }}
+              <code class="d-inline-block bg-white border text-dark text-monospace px-1 mr-1">{{ . }}</code>
+            {{- end }}
+          </li>
+        {{- end }}
+      </ul>
+    </section>
+  {{- end }}
 </div>
 {{ end }}
diff --git a/scripts/update-metrics-docs.sh b/scripts/update-metrics-docs.sh
new file mode 100644
index 000000000..f0d819ae4
--- /dev/null
+++ b/scripts/update-metrics-docs.sh
@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+website_root="$(cd "${script_dir}/.." && pwd)"
+etcd_repo_url="${ETCD_REPO_URL:-https://github.com/etcd-io/etcd.git}"
+etcd_source="${ETCD_SOURCE:-}"
+
+usage() {
+  echo "Usage: $0 --version <vX.Y> [--tag <tag-or-branch>] [--name <slug>] [--verify]"
+  exit 1
+}
+
+doc_tag() {
+  sed -n 's/^[[:space:]]*git_version_tag:[[:space:]]*//p' "${website_root}/content/en/docs/${version}/_index.md" | head -n1
+}
+
+version=""
+tag=""
+name="etcd-metrics-latest"
+verify=false
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    --version) version="$2"; shift 2 ;;
+    --tag) tag="$2"; shift 2 ;;
+    --name) name="$2"; shift 2 ;;
+    --verify) verify=true; shift ;;
+    *) usage ;;
+  esac
+done
+
+[ -n "${version}" ] || usage
+if [ -z "${tag}" ]; then
+  tag="$(doc_tag)"
+fi
+[ -n "${tag}" ] || { echo "error: could not resolve git_version_tag for ${version}" >&2; exit 1; }
+if [ "${tag}" = "main" ] || [ "${tag}" = "master" ]; then
+  echo "error: metrics docs can only be generated for released etcd tags" >&2
+  exit 1
+fi
+
+output_dir="${website_root}/content/en/docs/${version}/metrics"
+output_file="${output_dir}/${name}.txt"
+[ -d "${output_dir}" ] || { echo "error: output directory '${output_dir}' missing" >&2; exit 1; }
+
+tmpdir="$(mktemp -d)"
+trap 'rm -rf "${tmpdir}"' EXIT
+
+if [ -z "${etcd_source}" ]; then
+  etcd_source="${tmpdir}/etcd"
+  git clone --depth 1 --branch "${tag}" "${etcd_repo_url}" "${etcd_source}" >/dev/null
+elif [ -d "${etcd_source}/.git" ]; then
+  tagged_source="${tmpdir}/etcd-${tag}"
+  mkdir -p "${tagged_source}"
+  git -C "${etcd_source}" archive "${tag}" | tar -x -C "${tagged_source}"
+  etcd_source="${tagged_source}"
+fi
+
+generated="${output_file}"
+if [ "${verify}" = true ]; then
+  generated="${tmpdir}/${name}.txt"
+fi
+
+(cd "${etcd_source}" && go run ./tools/etcd-dump-metrics --download-ver "${tag}") >"${generated}"
+
+if [ "${verify}" = true ]; then
+  diff -u "${output_file}" "${generated}"
+else
+  echo "Generated ${output_file}"
+fi
diff --git a/scripts/update_release_version.sh b/scripts/update_release_version.sh
index d7c9a9230..c636ff93b 100755
--- a/scripts/update_release_version.sh
+++ b/scripts/update_release_version.sh
@@ -12,6 +12,7 @@ fi
 new_version="$1"
 release_minor=$(echo "${new_version}" | cut -d. -f1-2)
 index_file=content/en/docs/"${release_minor}"/_index.md
+metrics_file=content/en/docs/"${release_minor}"/metrics/etcd-metrics-latest.txt
 git_remote="${GIT_REMOTE:-origin}"
 branch="release-${release_minor}-update-latest-release-to-${new_version}"
 current_branch=$(git symbolic-ref HEAD --short)
@@ -49,9 +50,10 @@ trap 'git checkout "${current_branch}"' EXIT
 
 # Update the release version in the release file.
 sed -i 's/git_version_tag:\sv\([0-9]\+\.\)\{2\}[0-9]\+/git_version_tag: '"${new_version}"'/' "${index_file}"
+make update-metrics-docs VERSION="${release_minor}" TAG="${new_version}"
 
 # Commit the changes, push and create a PR.
-git add "${index_file}"
+git add "${index_file}" "${metrics_file}"
 git -c user.name="${git_author}" -c user.email="${git_email}" commit --file=- <<EOL
 [${release_minor}] Update installation version to latest tag (${new_version})