diff --git a/internal/viper.go b/internal/viper.go
index 20c2394..cbadc78 100644
--- a/internal/viper.go
+++ b/internal/viper.go
@@ -34,7 +34,7 @@ func init() {
 	viper.SetDefault(LOG_LEVEL, "info")
 	viper.SetDefault(METRICS_PORT, 2112)
 	viper.BindEnv(GITLAB_GROUP_ID)
-	viper.SetDefault(METRICS_CRON, "@every 6h")
+	viper.SetDefault(METRICS_CRON, "@every 1h")
 }
 
 func InitConfig() {
diff --git a/metrics.go b/metrics.go
index 30db283..bcbf767 100644
--- a/metrics.go
+++ b/metrics.go
@@ -2,77 +2,94 @@ package main
 
 import (
 	"fmt"
-	"net/http"
-	"strconv"
-	"strings"
-
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"github.com/robfig/cron/v3"
 	logger "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"github.com/steffakasid/trivy-scanner/internal"
+	"net/http"
+	"strconv"
+)
+
+var (
+	registeredGauges []prometheus.Gauge
+	trivyResults     internal.TrivyResults
+	reg              *prometheus.Registry
 )
 
 func startDaemon() {
-	logger.Debug("Starting metrics daemon...")
-	c := cron.New()
-	recordMetrics()
-	_, err := c.AddFunc(viper.GetString(internal.METRICS_CRON), recordMetrics)
-	c.Start()
-	if err != nil {
-		logger.Fatal(err)
-	}
-	http.Handle("/metrics", promhttp.Handler())
-	err = http.ListenAndServe(fmt.Sprintf(":%d", viper.GetInt(internal.METRICS_PORT)), nil)
+	reg = prometheus.NewRegistry()
+	initCron()
+	fetchResults()
+	promHandler := promhttp.HandlerFor(reg, promhttp.HandlerOpts{})
+	http.Handle("/metrics", promHandler)
 
+	logger.Infoln("Starting metrics daemon...")
+	err := http.ListenAndServe(fmt.Sprintf(":%d", viper.GetInt(internal.METRICS_PORT)), nil)
 	if err != nil {
 		logger.Fatal(err)
 	}
 }
 
-func recordMetrics() {
+func fetchResults() {
 	projs, err := scan.GitLabClient.GetProjects(scan.ID)
 	if err != nil {
 		logger.Errorf("failed getting projects: %v", err)
 	}
-
-	trivyResults, err := scan.ScanProjects(projs)
-
+	trivyResults, err = scan.ScanProjects(projs)
 	if err != nil {
-		logger.Error(err)
-	} else {
-		for _, trivy := range trivyResults {
-			var trivyIgnore string
-			if len(trivy.Ignore) > 0 {
-				trivyIgnore = "true"
-			} else {
-				trivyIgnore = "false"
-			}
-			projectName := strings.ReplaceAll(trivy.ProjName, "-", "_")
-			projectName = projectName + "_" + strconv.Itoa(trivy.ProjId)
+		logger.Errorf("failed scan projects: %v", err)
+	}
+	updateRegister()
+}
+
+func updateRegister() {
+	unregisterOldGauges()
+	registeredGauges = []prometheus.Gauge{}
+	for _, trivy := range trivyResults {
 
-			logger.Debugf("Add Prjoect %s\n", projectName)
+		var trivyIgnore string
+		if len(trivy.Ignore) > 0 {
+			trivyIgnore = "true"
+		} else {
+			trivyIgnore = "false"
+		}
 
-			labels := map[string]string{
-				"Project":         trivy.ProjName,
-				"Id":              strconv.Itoa(trivy.ProjId),
-				"Vulnerabilities": strconv.Itoa(trivy.Vulnerabilities.Count),
-				"High":            strconv.Itoa(trivy.Vulnerabilities.High),
-				"Critical":        strconv.Itoa(trivy.Vulnerabilities.Critical),
-				"JobState":        trivy.State,
-				"trivyignore":     trivyIgnore,
-			}
-			opts := prometheus.GaugeOpts{
-				Namespace:   "trivy",
-				Subsystem:   "exporter",
-				Name:        "findings",
-				Help:        "this is a cached result updated every 2 hours",
-				ConstLabels: labels,
-			}
-			logger.Debugf("Register metrics collector for %s", projectName)
-			promauto.NewGauge(opts).Set(1)
+		labels := map[string]string{
+			"Project":         trivy.ProjName,
+			"Id":              strconv.Itoa(trivy.ProjId),
+			"Vulnerabilities": strconv.Itoa(trivy.Vulnerabilities.Count),
+			"High":            strconv.Itoa(trivy.Vulnerabilities.High),
+			"Critical":        strconv.Itoa(trivy.Vulnerabilities.Critical),
+			"ScannedJobName":  viper.GetString(JOB_NAME),
+			"JobState":        trivy.State,
+			"trivyignore":     trivyIgnore,
 		}
+
+		gauge := prometheus.NewGauge(prometheus.GaugeOpts{
+			Namespace:   "trivy",
+			Subsystem:   "exporter",
+			Name:        "findings",
+			Help:        "this is a cached result and will updated every hour",
+			ConstLabels: labels,
+		})
+		gauge.Set(float64(trivy.Vulnerabilities.Count))
+		registeredGauges = append(registeredGauges, gauge)
+		reg.MustRegister(gauge)
+	}
+}
+
+func unregisterOldGauges() {
+	for _, gauge := range registeredGauges {
+		reg.Unregister(gauge)
 	}
 }
+
+func initCron() {
+	c := cron.New()
+	_, err := c.AddFunc(viper.GetString(internal.METRICS_CRON), fetchResults)
+	if err != nil {
+		logger.Fatal(err)
+	}
+	c.Start()
+}