diff --git a/cmd/internal/core/phone-home.go b/cmd/internal/core/phone-home.go
index 240ddda6..131f26df 100644
--- a/cmd/internal/core/phone-home.go
+++ b/cmd/internal/core/phone-home.go
@@ -46,14 +46,13 @@ func (c *Core) ConstantlyPhoneHome(ctx context.Context, interval time.Duration)
 
 		ifaceName := iface.Name
 		// constantly observe LLDP traffic on current machine and current interface
-		discoveryResultChanWG.Add(1)
-		go func() {
+		discoveryResultChanWG.Go(func() {
 			defer discoveryResultChanWG.Done()
 			err = lldpcli.Start(c.log, discoveryResultChan)
 			if err != nil {
-				c.log.Error("unable to start lldp discovery for interface", "interface", ifaceName)
+				c.log.Error("unable to start lldp discovery for interface", "interface", ifaceName, "error", err)
 			}
-		}()
+		})
 	}
 
 	// wait all lldp routines to finish to close result channel
@@ -81,7 +80,7 @@ func (c *Core) ConstantlyPhoneHome(ctx context.Context, interval time.Duration)
 		select {
 		case <-ticker.C:
 			msgs := []phoneHomeMessage{}
-			phoneHomeMessages.Range(func(key, value interface{}) bool {
+			phoneHomeMessages.Range(func(key, value any) bool {
 				msg, ok := value.(phoneHomeMessage)
 				if !ok {
 					return true