diff --git a/apiserver/controllers/controllers.go b/apiserver/controllers/controllers.go
index e3495e9c..e7e5049f 100644
--- a/apiserver/controllers/controllers.go
+++ b/apiserver/controllers/controllers.go
@@ -107,19 +107,21 @@ func (a *APIController) handleWorkflowJobEvent(ctx context.Context, w http.Respo
 	hookType := r.Header.Get("X-Github-Hook-Installation-Target-Type")
 
 	if err := a.r.DispatchWorkflowJob(hookType, signature, body); err != nil {
-		if errors.Is(err, gErrors.ErrNotFound) {
+		switch {
+		case errors.Is(err, gErrors.ErrNotFound):
 			metrics.WebhooksReceived.WithLabelValues(
 				"false",         // label: valid
 				"owner_unknown", // label: reason
 			).Inc()
 			slog.With(slog.Any("error", err)).ErrorContext(ctx, "got not found error from DispatchWorkflowJob. webhook not meant for us?")
 			return
-		} else if strings.Contains(err.Error(), "signature") { // nolint:golangci-lint,godox TODO: check error type
+		case strings.Contains(err.Error(), "signature"):
+			// nolint:golangci-lint,godox TODO: check error type
 			metrics.WebhooksReceived.WithLabelValues(
 				"false",             // label: valid
 				"signature_invalid", // label: reason
 			).Inc()
-		} else {
+		default:
 			metrics.WebhooksReceived.WithLabelValues(
 				"false",   // label: valid
 				"unknown", // label: reason
diff --git a/runner/metrics/instance.go b/runner/metrics/instance.go
index 1d8fc83c..06fd4881 100644
--- a/runner/metrics/instance.go
+++ b/runner/metrics/instance.go
@@ -31,23 +31,21 @@ func CollectInstanceMetric(ctx context.Context, r *runner.Runner) error {
 
 	poolNames := make(map[string]poolInfo)
 	for _, pool := range pools {
-		if pool.EnterpriseName != "" {
+		switch {
+		case pool.OrgName != "":
 			poolNames[pool.ID] = poolInfo{
-				Name:         pool.EnterpriseName,
-				Type:         string(pool.PoolType()),
-				ProviderName: pool.ProviderName,
+				Name: pool.OrgName,
+				Type: string(pool.PoolType()),
 			}
-		} else if pool.OrgName != "" {
+		case pool.EnterpriseName != "":
 			poolNames[pool.ID] = poolInfo{
-				Name:         pool.OrgName,
-				Type:         string(pool.PoolType()),
-				ProviderName: pool.ProviderName,
+				Name: pool.EnterpriseName,
+				Type: string(pool.PoolType()),
 			}
-		} else {
+		default:
 			poolNames[pool.ID] = poolInfo{
-				Name:         pool.RepoName,
-				Type:         string(pool.PoolType()),
-				ProviderName: pool.ProviderName,
+				Name: pool.RepoName,
+				Type: string(pool.PoolType()),
 			}
 		}
 	}
diff --git a/runner/metrics/pool.go b/runner/metrics/pool.go
index fd4b6ee0..44ad27a8 100644
--- a/runner/metrics/pool.go
+++ b/runner/metrics/pool.go
@@ -30,17 +30,18 @@ func CollectPoolMetric(ctx context.Context, r *runner.Runner) error {
 
 	poolNames := make(map[string]poolInfo)
 	for _, pool := range pools {
-		if pool.EnterpriseName != "" {
-			poolNames[pool.ID] = poolInfo{
-				Name: pool.EnterpriseName,
-				Type: string(pool.PoolType()),
-			}
-		} else if pool.OrgName != "" {
+		switch {
+		case pool.OrgName != "":
 			poolNames[pool.ID] = poolInfo{
 				Name: pool.OrgName,
 				Type: string(pool.PoolType()),
 			}
-		} else {
+		case pool.EnterpriseName != "":
+			poolNames[pool.ID] = poolInfo{
+				Name: pool.EnterpriseName,
+				Type: string(pool.PoolType()),
+			}
+		default:
 			poolNames[pool.ID] = poolInfo{
 				Name: pool.RepoName,
 				Type: string(pool.PoolType()),