diff --git a/cmd/root.go b/cmd/root.go
index 3a22b9025..c26ec23b5 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -8,6 +8,7 @@ import (
 	v1 "github.com/flanksource/canary-checker/api/v1"
 	"github.com/flanksource/canary-checker/checks"
 	"github.com/flanksource/canary-checker/pkg/jobs/canary"
+	"github.com/flanksource/canary-checker/pkg/metrics"
 	"github.com/flanksource/canary-checker/pkg/prometheus"
 	"github.com/flanksource/canary-checker/pkg/runner"
 	"github.com/flanksource/canary-checker/pkg/telemetry"
@@ -76,6 +77,9 @@ var Root = &cobra.Command{
 				connection.HTTPConnection{URL: prometheus.PrometheusURL},
 			)
 		}
+
+		// Setup metrics since v1.AdditionalCheckMetricLabels is set now
+		metrics.SetupMetrics()
 	},
 }
 
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
index f183c1641..11109bd76 100644
--- a/pkg/metrics/metrics.go
+++ b/pkg/metrics/metrics.go
@@ -8,6 +8,7 @@ import (
 	v1 "github.com/flanksource/canary-checker/api/v1"
 	"github.com/flanksource/canary-checker/pkg"
 	"github.com/flanksource/canary-checker/pkg/runner"
+
 	"github.com/flanksource/duty/context"
 	"github.com/flanksource/duty/types"
 	cmap "github.com/orcaman/concurrent-map"
@@ -19,18 +20,12 @@ func init() {
 	CustomCounters = make(map[string]*prometheus.CounterVec)
 	CustomGauges = make(map[string]*prometheus.GaugeVec)
 	CustomHistograms = make(map[string]*prometheus.HistogramVec)
-
-	// Register the metrics with a delay because
-	// v1.AdditionalCheckMetricLabels is nil during init.
-	go func() {
-		time.Sleep(time.Second)
-
-		slices.Sort(v1.AdditionalCheckMetricLabels)
-		setupMetrics()
-	}()
 }
 
-func setupMetrics() {
+// SetupMetrics is called from cmd/root PreRun since we take v1.AdditionalCheckMetricLabels from CLI
+func SetupMetrics() {
+	slices.Sort(v1.AdditionalCheckMetricLabels)
+
 	RequestLatency = prometheus.NewHistogramVec(
 		prometheus.HistogramOpts{
 			Name:    "canary_check_duration",