diff --git a/staging/src/k8s.io/apiserver/pkg/server/flagz/flagz.go b/staging/src/k8s.io/apiserver/pkg/server/flagz/flagz.go
index ae0d4d82285..95d38744add 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/flagz/flagz.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/flagz/flagz.go
@@ -148,10 +148,10 @@ func handleFlagz(componentName string, reg *registry, serializer runtime.Negotia
 		var deprecated bool
 		defer func() {
 			metrics.MonitorRequest(r, "GET", group, version,
-				"",               // resource
-				DefaultFlagzPath, // subresource
-				"",               // scope
-				"",               // component
+				"flagz",       // resource
+				"",            // subresource
+				"",            // scope
+				componentName, // component
 				deprecated,
 				"", // removedRelease
 				delegate.Status(), delegate.ContentLength(), time.Since(requestReceivedTimestamp))
diff --git a/staging/src/k8s.io/apiserver/pkg/server/flagz/flagz_test.go b/staging/src/k8s.io/apiserver/pkg/server/flagz/flagz_test.go
index 3917deb5403..26489dc28fe 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/flagz/flagz_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/flagz/flagz_test.go
@@ -415,8 +415,8 @@ func TestMetrics(t *testing.T) {
 	expected := strings.NewReader(`
         # HELP apiserver_request_total [STABLE] Counter of apiserver requests broken out for each verb, dry run value, group, version, resource, scope, component, and HTTP response code.
         # TYPE apiserver_request_total counter
-        apiserver_request_total{code="200",component="",dry_run="",group="",resource="",scope="",subresource="/flagz",verb="GET",version=""} 1
-        apiserver_request_total{code="200",component="",dry_run="",group="config.k8s.io",resource="",scope="",subresource="/flagz",verb="GET",version="v1alpha1"} 1
+        apiserver_request_total{code="200",component="test-server",dry_run="",group="",resource="flagz",scope="",subresource="",verb="GET",version=""} 1
+        apiserver_request_total{code="200",component="test-server",dry_run="",group="config.k8s.io",resource="flagz",scope="",subresource="",verb="GET",version="v1alpha1"} 1
 `)
 	if err := testutil.GatherAndCompare(legacyregistry.DefaultGatherer, expected, "apiserver_request_total"); err != nil {
 		t.Error(err)
diff --git a/staging/src/k8s.io/apiserver/pkg/server/statusz/statusz.go b/staging/src/k8s.io/apiserver/pkg/server/statusz/statusz.go
index a234f828ce0..1b533fce0c1 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/statusz/statusz.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/statusz/statusz.go
@@ -172,10 +172,10 @@ func handleStatusz(componentName string, reg statuszRegistry, serializer runtime
 		var deprecated bool
 		defer func() {
 			metrics.MonitorRequest(r, "GET", group, version,
-				"",                 // resource
-				DefaultStatuszPath, // subresource
-				"",                 // scope
-				"",                 // component
+				"statusz",     // resource
+				"",            // subresource
+				"",            // scope
+				componentName, // component
 				deprecated,
 				"", // removedRelease
 				delegate.Status(), delegate.ContentLength(), time.Since(requestReceivedTimestamp))
diff --git a/staging/src/k8s.io/apiserver/pkg/server/statusz/statusz_test.go b/staging/src/k8s.io/apiserver/pkg/server/statusz/statusz_test.go
index 90043f7ac65..a3673f84060 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/statusz/statusz_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/statusz/statusz_test.go
@@ -501,8 +501,8 @@ func TestMetrics(t *testing.T) {
 	expected := strings.NewReader(`
         # HELP apiserver_request_total [STABLE] Counter of apiserver requests broken out for each verb, dry run value, group, version, resource, scope, component, and HTTP response code.
         # TYPE apiserver_request_total counter
-        apiserver_request_total{code="200",component="",dry_run="",group="",resource="",scope="",subresource="/statusz",verb="GET",version=""} 1
-        apiserver_request_total{code="200",component="",dry_run="",group="config.k8s.io",resource="",scope="",subresource="/statusz",verb="GET",version="v1alpha1"} 1
+        apiserver_request_total{code="200",component="test-server",dry_run="",group="",resource="statusz",scope="",subresource="",verb="GET",version=""} 1
+        apiserver_request_total{code="200",component="test-server",dry_run="",group="config.k8s.io",resource="statusz",scope="",subresource="",verb="GET",version="v1alpha1"} 1
 `)
 	if err := testutil.GatherAndCompare(legacyregistry.DefaultGatherer, expected, "apiserver_request_total"); err != nil {
 		t.Error(err)