diff --git a/go.mod b/go.mod
index 53348ed..6924761 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ replace github.com/elastic/gosigar => github.com/mudler/gosigar v0.14.3-0.202205
 require (
 	github.com/creack/pty v1.1.21
 	github.com/gliderlabs/ssh v0.3.7
-	github.com/ipfs/go-log v1.0.5
+	github.com/ipfs/go-log/v2 v2.5.1
 	github.com/kairos-io/go-nodepair v0.2.0
 	github.com/kairos-io/kairos-agent/v2 v2.13.0
 	github.com/kairos-io/kairos-sdk v0.3.1
@@ -20,8 +20,6 @@ require (
 	github.com/samber/lo v1.45.0
 	github.com/urfave/cli/v2 v2.27.2
 	go.uber.org/zap v1.27.0
-	gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0
-	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -115,7 +113,7 @@ require (
 	github.com/ipfs/boxo v0.10.0 // indirect
 	github.com/ipfs/go-cid v0.4.1 // indirect
 	github.com/ipfs/go-datastore v0.6.0 // indirect
-	github.com/ipfs/go-log/v2 v2.5.1 // indirect
+	github.com/ipfs/go-log v1.0.5 // indirect
 	github.com/ipld/go-ipld-prime v0.20.0 // indirect
 	github.com/itchyny/gojq v0.12.16 // indirect
 	github.com/itchyny/timefmt-go v0.1.6 // indirect
@@ -308,6 +306,8 @@ require (
 	gopkg.in/djherbis/times.v1 v1.3.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
+	gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	howett.net/plist v1.0.0 // indirect
 	k8s.io/klog/v2 v2.120.1 // indirect
 	k8s.io/mount-utils v0.30.2 // indirect
diff --git a/internal/cli/bridge.go b/internal/cli/bridge.go
index 47ec7fc..d8c6490 100644
--- a/internal/cli/bridge.go
+++ b/internal/cli/bridge.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/ipfs/go-log"
+	"github.com/ipfs/go-log/v2"
 	qr "github.com/kairos-io/go-nodepair/qrcode"
 	"github.com/kairos-io/kairos-sdk/utils"
 	"github.com/mudler/edgevpn/api"
diff --git a/internal/cli/config_test.go b/internal/cli/config_test.go
index 936d729..2dcf03f 100644
--- a/internal/cli/config_test.go
+++ b/internal/cli/config_test.go
@@ -9,12 +9,13 @@ import (
 	. "github.com/kairos-io/provider-kairos/v2/internal/cli/token"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 type TConfig struct {
 	Kairos struct {
 		NetworkToken string `yaml:"network_token"`
+		P2P          string `yaml:"p2p"`
 	} `yaml:"p2p"`
 }
 
@@ -47,14 +48,12 @@ fooz: "bar"
 			Expect(err).ToNot(HaveOccurred())
 
 			res := map[interface{}]interface{}{}
-
 			err = yaml.Unmarshal(content, &res)
 			Expect(err).ToNot(HaveOccurred())
 
-			Expect(res).To(Equal(map[interface{}]interface{}{
-				"p2p": map[interface{}]interface{}{"network_token": "baz"},
-				"bb":  map[interface{}]interface{}{"nothing": "foo"},
-			}))
+			// Check by element as they can be unordered
+			Expect(res["p2p"]).To(Equal(map[string]interface{}{"network_token": "baz"}))
+			Expect(res["bb"]).To(Equal(map[string]interface{}{"nothing": "foo"}))
 
 			hasHeader, _ := config.HasHeader(string(content), "#node-config")
 			Expect(hasHeader).To(BeTrue(), string(content))
diff --git a/internal/cli/recovery.go b/internal/cli/recovery.go
index dac8ad6..2de77a4 100644
--- a/internal/cli/recovery.go
+++ b/internal/cli/recovery.go
@@ -7,7 +7,7 @@ import (
 	"os/exec"
 	"time"
 
-	"github.com/ipfs/go-log"
+	"github.com/ipfs/go-log/v2"
 
 	"github.com/creack/pty"
 	"github.com/gliderlabs/ssh"
diff --git a/internal/cli/start.go b/internal/cli/start.go
index 0399c3e..33450b0 100644
--- a/internal/cli/start.go
+++ b/internal/cli/start.go
@@ -11,7 +11,7 @@ import (
 	"github.com/kairos-io/kairos-sdk/schema"
 	"github.com/mudler/edgevpn/pkg/node"
 	"github.com/urfave/cli/v2"
-	"gopkg.in/yaml.v1"
+	"gopkg.in/yaml.v3"
 )
 
 // do not edit version here, it is set by LDFLAGS
diff --git a/internal/provider/bootstrap.go b/internal/provider/bootstrap.go
index b37c412..de30227 100644
--- a/internal/provider/bootstrap.go
+++ b/internal/provider/bootstrap.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	edgeVPNClient "github.com/mudler/edgevpn/api/client"
 	"go.uber.org/zap"
 
diff --git a/internal/provider/bootstrap_test.go b/internal/provider/bootstrap_test.go
index 72dfe97..9c2c072 100644
--- a/internal/provider/bootstrap_test.go
+++ b/internal/provider/bootstrap_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/mudler/go-pluggable"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 var _ = Describe("Bootstrap provider", func() {
diff --git a/internal/provider/challenge_test.go b/internal/provider/challenge_test.go
index 4a80ac6..19d1340 100644
--- a/internal/provider/challenge_test.go
+++ b/internal/provider/challenge_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/mudler/go-pluggable"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 var _ = Describe("Challenge provider", func() {