diff --git a/waku/v2/discv5/discover.go b/waku/v2/discv5/discover.go
index 0d7c790b..f29de566 100644
--- a/waku/v2/discv5/discover.go
+++ b/waku/v2/discv5/discover.go
@@ -8,9 +8,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/enr"
-	"github.com/ethereum/go-ethereum/p2p/nat"
 	"github.com/libp2p/go-libp2p/core/discovery"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/peer"
@@ -18,6 +15,10 @@ import (
 	"github.com/waku-org/go-waku/logging"
 	"github.com/waku-org/go-waku/waku/v2/utils"
 	"go.uber.org/zap"
+
+	"github.com/ethereum/go-ethereum/p2p/enode"
+	"github.com/ethereum/go-ethereum/p2p/enr"
+	"github.com/ethereum/go-ethereum/p2p/nat"
 )
 
 type DiscoveryV5 struct {
@@ -208,7 +209,7 @@ func (d *DiscoveryV5) Start() error {
 }
 
 func (d *DiscoveryV5) SetBootnodes(nodes []*enode.Node) error {
-  return d.listener.SetFallbackNodes(nodes)
+	return d.listener.SetFallbackNodes(nodes)
 }
 
 func (d *DiscoveryV5) Stop() {
diff --git a/waku/v2/node/wakunode2.go b/waku/v2/node/wakunode2.go
index 46869ca0..92bd4661 100644
--- a/waku/v2/node/wakunode2.go
+++ b/waku/v2/node/wakunode2.go
@@ -8,11 +8,12 @@ import (
 	"sync"
 	"time"
 
+	"github.com/libp2p/go-libp2p"
+	"go.uber.org/zap"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/libp2p/go-libp2p"
-	"go.uber.org/zap"
 
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/libp2p/go-libp2p/core/event"
@@ -673,6 +674,12 @@ func (w *WakuNode) PeerStats() PeerStats {
 	return p
 }
 
+// Set the bootnodes on discv5
+func (w *WakuNode) SetDiscV5Bootnodes(nodes []*enode.Node) error {
+	w.opts.discV5bootnodes = nodes
+	return w.discoveryV5.SetBootnodes(nodes)
+}
+
 // Peers return the list of peers, addresses, protocols supported and connection status
 func (w *WakuNode) Peers() ([]*Peer, error) {
 	var peers []*Peer