diff --git a/client/internal/peer/conn.go b/client/internal/peer/conn.go
index e853631cb..d8f436f32 100644
--- a/client/internal/peer/conn.go
+++ b/client/internal/peer/conn.go
@@ -21,6 +21,7 @@ import (
 	"github.com/netbirdio/netbird/client/internal/peer/guard"
 	icemaker "github.com/netbirdio/netbird/client/internal/peer/ice"
 	"github.com/netbirdio/netbird/client/internal/peer/id"
+	"github.com/netbirdio/netbird/client/internal/peer/metricsstages"
 	"github.com/netbirdio/netbird/client/internal/peer/signaling"
 	"github.com/netbirdio/netbird/client/internal/peer/state_dump"
 	"github.com/netbirdio/netbird/client/internal/peer/status"
@@ -175,7 +176,7 @@ type Conn struct {
 
 	// Connection stage timestamps for metrics
 	metricsRecorder MetricsRecorder
-	metricsStages   *MetricsStages
+	metricsStages   *metricsstages.MetricsStages
 
 	// pendingFirstPacket is the lazyconn-captured handshake init, replayed once the real
 	// transport is up.
@@ -234,7 +235,7 @@ func (conn *Conn) open(engineCtx context.Context, firstPacket []byte) error {
 	}
 
 	// Allocate new metrics stages so old goroutines don't corrupt new state
-	conn.metricsStages = &MetricsStages{}
+	conn.metricsStages = &metricsstages.MetricsStages{}
 
 	conn.ctx, conn.ctxCancel = context.WithCancel(engineCtx)
 
diff --git a/client/internal/peer/conn_test.go b/client/internal/peer/conn_test.go
index bcb6be5ba..39bbf175f 100644
--- a/client/internal/peer/conn_test.go
+++ b/client/internal/peer/conn_test.go
@@ -15,6 +15,7 @@ import (
 	"github.com/netbirdio/netbird/client/iface"
 	"github.com/netbirdio/netbird/client/internal/peer/guard"
 	"github.com/netbirdio/netbird/client/internal/peer/ice"
+	"github.com/netbirdio/netbird/client/internal/peer/metricsstages"
 	"github.com/netbirdio/netbird/client/internal/peer/signaling"
 	"github.com/netbirdio/netbird/client/internal/peer/status"
 	"github.com/netbirdio/netbird/client/internal/stdnet"
@@ -269,7 +270,7 @@ func newWGTimeoutTestConn(rosenpassEnabled bool, disconnected *[]string) *Conn {
 		ctx:           context.Background(),
 		config:        cfg,
 		Log:           log.WithField("peer", cfg.Key),
-		metricsStages: &MetricsStages{},
+		metricsStages: &metricsstages.MetricsStages{},
 	}
 	conn.SetOnDisconnected(func(remotePeer string) {
 		*disconnected = append(*disconnected, remotePeer)
diff --git a/client/internal/peer/metrics_saver.go b/client/internal/peer/metricsstages/metrics_saver.go
similarity index 99%
rename from client/internal/peer/metrics_saver.go
rename to client/internal/peer/metricsstages/metrics_saver.go
index e32afbfe5..d46b770f6 100644
--- a/client/internal/peer/metrics_saver.go
+++ b/client/internal/peer/metricsstages/metrics_saver.go
@@ -1,4 +1,4 @@
-package peer
+package metricsstages
 
 import (
 	"sync"
diff --git a/client/internal/peer/metrics_saver_test.go b/client/internal/peer/metricsstages/metrics_saver_test.go
similarity index 99%
rename from client/internal/peer/metrics_saver_test.go
rename to client/internal/peer/metricsstages/metrics_saver_test.go
index 01c0aa9ac..a468b38e1 100644
--- a/client/internal/peer/metrics_saver_test.go
+++ b/client/internal/peer/metricsstages/metrics_saver_test.go
@@ -1,4 +1,4 @@
-package peer
+package metricsstages
 
 import (
 	"testing"