diff --git a/plugins/prometheus/info.go b/plugins/prometheus/info.go
index 3f796c110a8e5b7bfaf6656f17d18966c3a6e56c..0fe3dd25b9cbea78a2b7f6ded663c6e7132fa5a4 100644
--- a/plugins/prometheus/info.go
+++ b/plugins/prometheus/info.go
@@ -6,8 +6,7 @@ import (
 )
 
 var (
-	infoApp  *prometheus.GaugeVec
-	infoTips prometheus.Gauge
+	infoApp *prometheus.GaugeVec
 )
 
 func init() {
@@ -18,18 +17,5 @@ func init() {
 		},
 		[]string{"name", "version"},
 	)
-	infoTips = prometheus.NewGauge(prometheus.GaugeOpts{
-		Name: "iota_info_tips",
-		Help: "Number of tips.",
-	})
-
 	infoApp.WithLabelValues(banner.AppName, banner.AppVersion).Set(1)
-	registry.MustRegister(infoApp)
-	registry.MustRegister(infoTips)
-	addCollect(collectInfo)
-}
-
-func collectInfo() {
-	// Tips
-	infoTips.Set(0)
 }
diff --git a/plugins/prometheus/metrics.go b/plugins/prometheus/metrics.go
index 799379c41a7b9821b69c2f897f8e12d28a0e1ea2..7112f26e5ce97adcd56815e85f52ffaf746b585e 100644
--- a/plugins/prometheus/metrics.go
+++ b/plugins/prometheus/metrics.go
@@ -1,12 +1,16 @@
 package prometheus
 
 import (
+	"github.com/iotaledger/goshimmer/dapps/valuetransfers"
+	"github.com/iotaledger/goshimmer/plugins/messagelayer"
 	"github.com/iotaledger/goshimmer/plugins/metrics"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
 var (
 	messagesPerSecond prometheus.Gauge
+	infoMessageTips   prometheus.Gauge
+	infoValueTips     prometheus.Gauge
 )
 
 func init() {
@@ -14,12 +18,27 @@ func init() {
 		Name: "iota_messages_per_second",
 		Help: "Number of messages per second.",
 	})
+	infoMessageTips = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "iota_info_message_tips",
+		Help: "Number of message tips.",
+	})
+	infoValueTips = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "iota_info_value_tips",
+		Help: "Number of value tips.",
+	})
 
 	registry.MustRegister(messagesPerSecond)
+	registry.MustRegister(infoApp)
+	registry.MustRegister(infoMessageTips)
 
 	addCollect(collectMetrics)
 }
 
 func collectMetrics() {
+	// MPS
 	messagesPerSecond.Set(float64(metrics.ReceivedMessagesPerSecond()))
+
+	// Tips
+	infoMessageTips.Set(float64(messagelayer.TipSelector.TipCount()))
+	infoValueTips.Set(float64(valuetransfers.TipManager().Size()))
 }