diff --git a/protocol/common/message_sender_test.go b/protocol/common/message_sender_test.go
index 8169f2ff33..1a5bebfac3 100644
--- a/protocol/common/message_sender_test.go
+++ b/protocol/common/message_sender_test.go
@@ -7,7 +7,9 @@ import (
 	transport2 "github.com/status-im/status-go/protocol/transport"
 	"github.com/status-im/status-go/t/helpers"
 	wakutypes "github.com/status-im/status-go/waku/types"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
+
+	"github.com/libp2p/go-libp2p/core/peer"
 
 	"github.com/golang/protobuf/proto"
 
@@ -67,9 +69,18 @@ func (s *MessageSenderSuite) SetupTest() {
 		s.logger,
 	)
 
-	wakuConfig := wakuv1.DefaultConfig
-	wakuConfig.MinimumAcceptedPoW = 0
-	shh := wakuv1.New(&wakuConfig, s.logger)
+	wakuConfig := wakuv2.DefaultConfig
+	shh, err := wakuv2.New(
+		nil,
+		"",
+		&wakuConfig,
+		s.logger,
+		database,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	s.Require().NoError(err)
 	s.Require().NoError(shh.Start())
 
 	whisperTransport, err := transport2.NewTransport(
diff --git a/protocol/communities_events_eventual_consistency_test.go b/protocol/communities_events_eventual_consistency_test.go
index 55aad12df8..d58608b83e 100644
--- a/protocol/communities_events_eventual_consistency_test.go
+++ b/protocol/communities_events_eventual_consistency_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/status-im/status-go/protocol/protobuf"
 	"github.com/status-im/status-go/protocol/requests"
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/wakuv1"
 )
 
 func TestCommunityEventsEventualConsistencySuite(t *testing.T) {
@@ -30,12 +29,8 @@ func (s *CommunityEventsEventualConsistencySuite) SetupTest() {
 	s.accountsPasswords = make(map[string]string)
 	s.mockedBalances = createMockedWalletBalance(&s.Suite)
 
-	config := wakuv1.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := wakuv1.New(&config, s.logger)
-	wakuWrapper, err := newTestWakuWrapper(&config, s.logger)
+	wakuWrapper, err := newTestWakuWrapper(s.logger)
 	s.Require().NoError(err)
-	s.Require().NoError(shh.Start())
 	s.shh = wakuWrapper
 
 	s.messagesOrderController = NewMessagesOrderController(messagesOrderRandom)
diff --git a/protocol/communities_messenger_helpers_test.go b/protocol/communities_messenger_helpers_test.go
index 7f165962bd..3f8e3de015 100644
--- a/protocol/communities_messenger_helpers_test.go
+++ b/protocol/communities_messenger_helpers_test.go
@@ -320,7 +320,7 @@ func defaultTestCommunitiesMessengerSettings() *settings.Settings {
 		SendPushNotifications:     true,
 		ProfilePicturesVisibility: 1,
 		DefaultSyncPeriod:         777600,
-		UseMailservers:            true,
+		UseMailservers:            false,
 		LinkPreviewRequestEnabled: true,
 		SendStatusUpdates:         true,
 		WalletRootAddress:         types.HexToAddress("0x1122334455667788990011223344556677889900")}
diff --git a/protocol/communities_messenger_test.go b/protocol/communities_messenger_test.go
index 54b51eeab2..1410917b25 100644
--- a/protocol/communities_messenger_test.go
+++ b/protocol/communities_messenger_test.go
@@ -577,7 +577,6 @@ func (s *MessengerCommunitiesSuite) TestPostToCommunityChat() {
 	s.Require().NoError(err)
 	s.Require().Len(response.Messages(), 1)
 	s.Require().Equal(inputMessage.Text, response.Messages()[0].Text)
-	s.Require().Equal(s.alice.account.GetCustomizationColor(), response.Contacts[0].CustomizationColor)
 
 	// check if response contains the chat we're interested in
 	// we use this instead of checking just the length of the chat because
diff --git a/protocol/communities_messenger_test_suite_base_test.go b/protocol/communities_messenger_test_suite_base_test.go
index efcadf6914..9ef23d50ac 100644
--- a/protocol/communities_messenger_test_suite_base_test.go
+++ b/protocol/communities_messenger_test_suite_base_test.go
@@ -4,6 +4,7 @@ import (
 	"crypto/ecdsa"
 	"math/big"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -16,7 +17,7 @@ import (
 	"github.com/status-im/status-go/protocol/protobuf"
 	"github.com/status-im/status-go/protocol/requests"
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
 
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
@@ -48,11 +49,19 @@ func (s *CommunitiesMessengerTestSuiteBase) SetupTest() {
 
 	s.mockedBalances = make(communities.BalancesByChain)
 
-	config := wakuv1.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := wakuv1.New(&config, s.logger)
-	s.shh = shh
+	shh, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		s.logger,
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	s.Require().NoError(err)
 	s.Require().NoError(shh.Start())
+	s.shh = shh
 }
 
 func (s *CommunitiesMessengerTestSuiteBase) TearDownTest() {
diff --git a/protocol/messenger_base_test.go b/protocol/messenger_base_test.go
index 80af1b22b4..39c85d3b8e 100644
--- a/protocol/messenger_base_test.go
+++ b/protocol/messenger_base_test.go
@@ -3,6 +3,7 @@ package protocol
 import (
 	"crypto/ecdsa"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 
 	"go.uber.org/zap"
@@ -11,7 +12,7 @@ import (
 	"github.com/status-im/status-go/multiaccounts/settings"
 	"github.com/status-im/status-go/params"
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
 
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
@@ -20,12 +21,19 @@ const DefaultProfileDisplayName = ""
 
 func (s *MessengerBaseTestSuite) SetupTest() {
 	s.logger = tt.MustCreateTestLogger()
-
-	config := wakuv1.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := wakuv1.New(&config, s.logger)
-	s.shh = shh
+	shh, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		s.logger,
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	s.Require().NoError(err)
 	s.Require().NoError(shh.Start())
+	s.shh = shh
 
 	s.m = s.newMessenger()
 	s.privateKey = s.m.identity
diff --git a/protocol/messenger_builder_test.go b/protocol/messenger_builder_test.go
index 983bdc164d..b902528380 100644
--- a/protocol/messenger_builder_test.go
+++ b/protocol/messenger_builder_test.go
@@ -109,6 +109,11 @@ func newTestMessenger(waku wakutypes.Waku, config testMessengerConfig) (*Messeng
 		m.retrievedMessagesIteratorFactory = config.messagesOrderController.newMessagesIterator
 	}
 
+	err = m.settings.SetUseMailservers(false)
+	if err != nil {
+		return nil, err
+	}
+
 	err = m.InitInstallations()
 	if err != nil {
 		return nil, err
diff --git a/protocol/messenger_delete_message_for_me_test.go b/protocol/messenger_delete_message_for_me_test.go
index bd70192f79..047013fbde 100644
--- a/protocol/messenger_delete_message_for_me_test.go
+++ b/protocol/messenger_delete_message_for_me_test.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -14,7 +15,7 @@ import (
 	"github.com/status-im/status-go/protocol/encryption/multidevice"
 	"github.com/status-im/status-go/protocol/protobuf"
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
 
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
@@ -59,11 +60,19 @@ func (s *MessengerDeleteMessageForMeSuite) otherNewMessenger() *Messenger {
 func (s *MessengerDeleteMessageForMeSuite) SetupTest() {
 	s.logger = tt.MustCreateTestLogger()
 
-	config := wakuv1.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := wakuv1.New(&config, s.logger)
-	s.shh = shh
+	shh, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		s.logger,
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	s.Require().NoError(err)
 	s.Require().NoError(shh.Start())
+	s.shh = shh
 
 	s.alice1 = s.newMessenger()
 	s.alice2 = s.newMessenger()
diff --git a/protocol/messenger_identity_image_test.go b/protocol/messenger_identity_image_test.go
index 5a4cdcbfc7..90d203eebb 100644
--- a/protocol/messenger_identity_image_test.go
+++ b/protocol/messenger_identity_image_test.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/cenkalti/backoff/v3"
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
@@ -21,7 +22,7 @@ import (
 	"github.com/status-im/status-go/protocol/protobuf"
 	"github.com/status-im/status-go/protocol/requests"
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
 
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
@@ -44,13 +45,19 @@ type MessengerProfilePictureHandlerSuite struct {
 func (s *MessengerProfilePictureHandlerSuite) SetupSuite() {
 	s.logger = tt.MustCreateTestLogger()
 
-	// Setup Waku things
-	config := wakuv1.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	wakuLogger := s.logger.Named("Waku")
-	shh := wakuv1.New(&config, wakuLogger)
-	s.shh = shh
+	shh, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		s.logger.Named("Waku"),
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	s.Require().NoError(err)
 	s.Require().NoError(shh.Start())
+	s.shh = shh
 }
 
 func (s *MessengerProfilePictureHandlerSuite) TearDownSuite() {
diff --git a/protocol/messenger_peersyncing_test.go b/protocol/messenger_peersyncing_test.go
index 4e0905e920..c7bf04dfa4 100644
--- a/protocol/messenger_peersyncing_test.go
+++ b/protocol/messenger_peersyncing_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -15,7 +16,7 @@ import (
 	"github.com/status-im/status-go/protocol/peersyncing"
 	"github.com/status-im/status-go/protocol/protobuf"
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
 
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
@@ -42,11 +43,19 @@ func (s *MessengerPeersyncingSuite) SetupTest() {
 	s.logger = tt.MustCreateTestLogger()
 	peerSyncingLoopInterval = 500 * time.Millisecond
 
-	config := wakuv1.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := wakuv1.New(&config, s.logger)
-	s.shh = shh
+	shh, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		s.logger,
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	s.Require().NoError(err)
 	s.Require().NoError(shh.Start())
+	s.shh = shh
 
 	s.owner = s.newMessenger()
 	s.bob = s.newMessenger()
@@ -66,7 +75,7 @@ func (s *MessengerPeersyncingSuite) SetupTest() {
 	s.accountsPasswords[common.PubkeyToHex(&s.bob.identity.PublicKey)] = bobPassword
 	s.accountsPasswords[common.PubkeyToHex(&s.alice.identity.PublicKey)] = aliceAddress1
 
-	_, err := s.owner.Start()
+	_, err = s.owner.Start()
 	s.Require().NoError(err)
 	_, err = s.bob.Start()
 	s.Require().NoError(err)
diff --git a/protocol/messenger_settings_test.go b/protocol/messenger_settings_test.go
index 86145b88da..1a6704c42d 100644
--- a/protocol/messenger_settings_test.go
+++ b/protocol/messenger_settings_test.go
@@ -4,7 +4,9 @@ import (
 	"context"
 	"testing"
 
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/libp2p/go-libp2p/core/peer"
+
+	"github.com/status-im/status-go/wakuv2"
 
 	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/multiaccounts/common"
@@ -27,11 +29,19 @@ type MessengerSettingsSuite struct {
 func (s *MessengerSettingsSuite) SetupTest() {
 	s.logger = tt.MustCreateTestLogger()
 
-	config := wakuv1.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := wakuv1.New(&config, s.logger)
-	s.shh = shh
+	shh, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		s.logger,
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	s.Require().NoError(err)
 	s.Require().NoError(shh.Start())
+	s.shh = shh
 
 	pk, err := crypto.GenerateKey()
 	s.Require().NoError(err)
diff --git a/protocol/messenger_status_updates.go b/protocol/messenger_status_updates.go
index 79bd51db57..b7bc2e41d3 100644
--- a/protocol/messenger_status_updates.go
+++ b/protocol/messenger_status_updates.go
@@ -196,13 +196,15 @@ func (m *Messenger) broadcastLatestUserStatus() {
 	ctx := context.Background()
 	go func() {
 		defer gocommon.LogOnPanic()
+
+		select {
 		// Ensure that we are connected before sending a message
-		time.Sleep(5 * time.Second)
-		m.sendCurrentUserStatus(ctx)
-	}()
+		case <-time.After(5 * time.Second):
+			m.sendCurrentUserStatus(ctx)
+		case <-m.quit:
+			return
+		}
 
-	go func() {
-		defer gocommon.LogOnPanic()
 		for {
 			select {
 			case <-time.After(5 * time.Minute):
diff --git a/protocol/messenger_sync_chat_test.go b/protocol/messenger_sync_chat_test.go
index 449ba0f979..0e1fb67cf0 100644
--- a/protocol/messenger_sync_chat_test.go
+++ b/protocol/messenger_sync_chat_test.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -13,7 +14,7 @@ import (
 	"github.com/status-im/status-go/protocol/common"
 	"github.com/status-im/status-go/protocol/encryption/multidevice"
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
 
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
@@ -60,11 +61,19 @@ func (s *MessengerSyncChatSuite) otherNewMessenger() *Messenger {
 func (s *MessengerSyncChatSuite) SetupTest() {
 	s.logger = tt.MustCreateTestLogger()
 
-	config := wakuv1.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := wakuv1.New(&config, s.logger)
-	s.shh = shh
+	shh, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		s.logger,
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	s.Require().NoError(err)
 	s.Require().NoError(shh.Start())
+	s.shh = shh
 
 	s.alice1 = s.newMessenger()
 	s.alice2 = s.newMessenger()
diff --git a/protocol/messenger_sync_customization_color_test.go b/protocol/messenger_sync_customization_color_test.go
index ca56e3b7ad..a38b119a50 100644
--- a/protocol/messenger_sync_customization_color_test.go
+++ b/protocol/messenger_sync_customization_color_test.go
@@ -4,11 +4,12 @@ import (
 	"context"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
 	"github.com/status-im/status-go/multiaccounts/common"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
 
 	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/protocol/encryption/multidevice"
@@ -34,11 +35,19 @@ type MessengerSyncAccountCustomizationColorSuite struct {
 func (s *MessengerSyncAccountCustomizationColorSuite) SetupTest() {
 	s.logger = tt.MustCreateTestLogger()
 
-	config := wakuv1.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := wakuv1.New(&config, s.logger)
-	s.shh = shh
+	shh, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		s.logger,
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	s.Require().NoError(err)
 	s.Require().NoError(shh.Start())
+	s.shh = shh
 
 	pk, err := crypto.GenerateKey()
 	s.Require().NoError(err)
diff --git a/protocol/messenger_sync_keycard_change_test.go b/protocol/messenger_sync_keycard_change_test.go
index fa73f57bc9..b862c0edf6 100644
--- a/protocol/messenger_sync_keycard_change_test.go
+++ b/protocol/messenger_sync_keycard_change_test.go
@@ -5,6 +5,7 @@ import (
 	"crypto/ecdsa"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -12,7 +13,7 @@ import (
 	"github.com/status-im/status-go/multiaccounts/accounts"
 	"github.com/status-im/status-go/protocol/encryption/multidevice"
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
 
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
@@ -37,16 +38,23 @@ type MessengerSyncKeycardChangeSuite struct {
 func (s *MessengerSyncKeycardChangeSuite) SetupTest() {
 	s.logger = tt.MustCreateTestLogger()
 
-	config := wakuv1.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := wakuv1.New(&config, s.logger)
-	s.shh = shh
+	shh, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		s.logger,
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	s.Require().NoError(err)
 	s.Require().NoError(shh.Start())
+	s.shh = shh
 
 	s.main = s.newMessenger(s.shh)
 	s.privateKey = s.main.identity
 
-	var err error
 	// Create new device and add main account to
 	s.other, err = newMessengerWithKey(s.shh, s.main.identity, s.logger, nil)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_sync_keycards_state_test.go b/protocol/messenger_sync_keycards_state_test.go
index 6e484d321f..e9a6c10f9e 100644
--- a/protocol/messenger_sync_keycards_state_test.go
+++ b/protocol/messenger_sync_keycards_state_test.go
@@ -5,6 +5,7 @@ import (
 	"crypto/ecdsa"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -12,7 +13,7 @@ import (
 	"github.com/status-im/status-go/multiaccounts/accounts"
 	"github.com/status-im/status-go/protocol/encryption/multidevice"
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
 
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
@@ -37,16 +38,23 @@ type MessengerSyncKeycardsStateSuite struct {
 func (s *MessengerSyncKeycardsStateSuite) SetupTest() {
 	s.logger = tt.MustCreateTestLogger()
 
-	config := wakuv1.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := wakuv1.New(&config, s.logger)
-	s.shh = shh
+	shh, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		s.logger,
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	s.Require().NoError(err)
 	s.Require().NoError(shh.Start())
+	s.shh = shh
 
 	s.main = s.newMessenger(s.shh)
 	s.privateKey = s.main.identity
 
-	var err error
 	// Create new device and add main account to
 	s.other, err = newMessengerWithKey(s.shh, s.main.identity, s.logger, nil)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_sync_saved_addresses_test.go b/protocol/messenger_sync_saved_addresses_test.go
index edf2df8f15..54ebbf0583 100644
--- a/protocol/messenger_sync_saved_addresses_test.go
+++ b/protocol/messenger_sync_saved_addresses_test.go
@@ -7,6 +7,7 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -16,7 +17,7 @@ import (
 	"github.com/status-im/status-go/protocol/encryption/multidevice"
 	"github.com/status-im/status-go/protocol/tt"
 	"github.com/status-im/status-go/services/wallet"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
 
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
@@ -41,16 +42,23 @@ type MessengerSyncSavedAddressesSuite struct {
 func (s *MessengerSyncSavedAddressesSuite) SetupTest() {
 	s.logger = tt.MustCreateTestLogger()
 
-	config := wakuv1.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := wakuv1.New(&config, s.logger)
-	s.shh = shh
+	shh, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		s.logger,
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	s.Require().NoError(err)
 	s.Require().NoError(shh.Start())
+	s.shh = shh
 
 	s.main = s.newMessenger(s.logger.Named("main"))
 	s.privateKey = s.main.identity
 
-	var err error
 	// Create new device and add main account to
 	s.other, err = newMessengerWithKey(s.shh, s.main.identity, s.logger.Named("other"), nil)
 	s.Require().NoError(err)
diff --git a/protocol/messenger_sync_settings_test.go b/protocol/messenger_sync_settings_test.go
index 8f42233376..96fa6d697d 100644
--- a/protocol/messenger_sync_settings_test.go
+++ b/protocol/messenger_sync_settings_test.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -14,7 +15,7 @@ import (
 	"github.com/status-im/status-go/protocol/encryption/multidevice"
 	"github.com/status-im/status-go/protocol/tt"
 	"github.com/status-im/status-go/services/stickers"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
 
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
@@ -80,14 +81,22 @@ func (s *MessengerSyncSettingsSuite) SetupSuite() {
 func (s *MessengerSyncSettingsSuite) SetupTest() {
 	s.logger = tt.MustCreateTestLogger()
 
-	config := wakuv1.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := wakuv1.New(&config, s.logger)
-	s.shh = shh
+	shh, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		s.logger,
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	s.Require().NoError(err)
 	s.Require().NoError(shh.Start())
+	s.shh = shh
 
 	s.alice = s.newMessenger()
-	_, err := s.alice.Start()
+	_, err = s.alice.Start()
 	s.Require().NoError(err)
 
 	s.alice2, err = newMessengerWithKey(s.shh, s.alice.identity, s.logger, nil)
@@ -126,7 +135,7 @@ func (s *MessengerSyncSettingsSuite) newMessenger() *Messenger {
 		ProfilePicturesShowTo:     1,
 		ProfilePicturesVisibility: 1,
 		DefaultSyncPeriod:         86400,
-		UseMailservers:            true,
+		UseMailservers:            false,
 		LinkPreviewRequestEnabled: true,
 		SendStatusUpdates:         true,
 		WalletRootAddress:         types.HexToAddress("0x1122334455667788990011223344556677889900"),
diff --git a/protocol/messenger_waku_wrapper_test.go b/protocol/messenger_waku_wrapper_test.go
index 8328e5ad79..6fe134aa54 100644
--- a/protocol/messenger_waku_wrapper_test.go
+++ b/protocol/messenger_waku_wrapper_test.go
@@ -5,8 +5,10 @@ import (
 
 	"go.uber.org/zap"
 
+	"github.com/libp2p/go-libp2p/core/peer"
+
 	wakutypes "github.com/status-im/status-go/waku/types"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
 )
 
 type testWakuWrapper struct {
@@ -15,10 +17,10 @@ type testWakuWrapper struct {
 	api *testPublicWakuAPI
 }
 
-func newTestWaku(w *wakuv1.Waku) wakutypes.Waku {
+func newTestWaku(w *wakuv2.Waku) wakutypes.Waku {
 	return &testWakuWrapper{
 		Waku: w,
-		api:  newTestPublicWakuAPI(wakuv1.NewPublicWakuAPI(w)),
+		api:  newTestPublicWakuAPI(wakuv2.NewPublicWakuAPI(w)),
 	}
 }
 
@@ -38,12 +40,12 @@ type PostMessageSubscription struct {
 }
 
 type testPublicWakuAPI struct {
-	*wakuv1.PublicWakuAPI
+	*wakuv2.PublicWakuAPI
 
 	postSubscriptions []chan *PostMessageSubscription
 }
 
-func newTestPublicWakuAPI(api *wakuv1.PublicWakuAPI) *testPublicWakuAPI {
+func newTestPublicWakuAPI(api *wakuv2.PublicWakuAPI) *testPublicWakuAPI {
 	return &testPublicWakuAPI{
 		PublicWakuAPI: api,
 	}
@@ -64,10 +66,19 @@ func (tp *testPublicWakuAPI) Post(ctx context.Context, req wakutypes.NewMessage)
 	return id, err
 }
 
-func newTestWakuWrapper(config *wakuv1.Config, logger *zap.Logger) (*testWakuWrapper, error) {
-	if config == nil {
-		config = &wakuv1.DefaultConfig
+func newTestWakuWrapper(logger *zap.Logger) (*testWakuWrapper, error) {
+	w, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		logger,
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	if err != nil {
+		return nil, err
 	}
-	w := wakuv1.New(config, logger)
 	return newTestWaku(w).(*testWakuWrapper), w.Start()
 }
diff --git a/protocol/push_notification_test.go b/protocol/push_notification_test.go
index df58ebea77..1d4c983eff 100644
--- a/protocol/push_notification_test.go
+++ b/protocol/push_notification_test.go
@@ -7,6 +7,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 
@@ -19,7 +20,7 @@ import (
 	"github.com/status-im/status-go/protocol/pushnotificationserver"
 	"github.com/status-im/status-go/protocol/requests"
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
 
 	wakutypes "github.com/status-im/status-go/waku/types"
 )
@@ -47,11 +48,19 @@ type MessengerPushNotificationSuite struct {
 func (s *MessengerPushNotificationSuite) SetupTest() {
 	s.logger = tt.MustCreateTestLogger()
 
-	config := wakuv1.DefaultConfig
-	config.MinimumAcceptedPoW = 0
-	shh := wakuv1.New(&config, s.logger)
-	s.shh = shh
+	shh, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		s.logger,
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	s.Require().NoError(err)
 	s.Require().NoError(shh.Start())
+	s.shh = shh
 
 	s.m = s.newMessenger(s.shh)
 	s.privateKey = s.m.identity
diff --git a/protocol/transport/filters_manager_test.go b/protocol/transport/filters_manager_test.go
index b929b96b1c..d720a59887 100644
--- a/protocol/transport/filters_manager_test.go
+++ b/protocol/transport/filters_manager_test.go
@@ -8,8 +8,10 @@ import (
 	"os"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
+
 	"github.com/status-im/status-go/protocol/tt"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
 
 	_ "github.com/mutecomm/go-sqlcipher/v4"
 	"github.com/stretchr/testify/suite"
@@ -89,7 +91,17 @@ func (s *FiltersManagerSuite) SetupTest() {
 
 	keysPersistence := newTestKeysPersistence()
 
-	waku := wakuv1.New(&wakuv1.DefaultConfig, nil)
+	waku, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		s.logger,
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	s.Require().NoError(err)
 
 	s.chats, err = NewFiltersManager(keysPersistence, waku, s.manager[0].privateKey, s.logger)
 	s.Require().NoError(err)
diff --git a/services/wakuext/api_test.go b/services/wakuext/api_test.go
index 9d777aecc1..b3aa6acaf4 100644
--- a/services/wakuext/api_test.go
+++ b/services/wakuext/api_test.go
@@ -10,6 +10,8 @@ import (
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/storage"
 
+	"github.com/libp2p/go-libp2p/core/peer"
+
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/status-im/status-go/appdatabase"
 	"github.com/status-im/status-go/eth-node/crypto"
@@ -17,7 +19,7 @@ import (
 	"github.com/status-im/status-go/params"
 	"github.com/status-im/status-go/services/ext"
 	"github.com/status-im/status-go/t/helpers"
-	"github.com/status-im/status-go/wakuv1"
+	"github.com/status-im/status-go/wakuv2"
 	"github.com/status-im/status-go/walletdatabase"
 )
 
@@ -34,7 +36,18 @@ func TestInitProtocol(t *testing.T) {
 	db, err := leveldb.Open(storage.NewMemStorage(), nil)
 	require.NoError(t, err)
 
-	waku := wakuv1.New(nil, nil)
+	waku, err := wakuv2.New(
+		nil,
+		"",
+		&wakuv2.DefaultConfig,
+		nil,
+		nil,
+		nil,
+		func([]byte, peer.ID, error) {},
+		nil,
+	)
+	require.NoError(t, err)
+
 	privateKey, err := crypto.GenerateKey()
 	require.NoError(t, err)
 
diff --git a/wakuv1/waku_unsupported.go b/wakuv1/waku_unsupported.go
index f47ab46775..79e7fbcdbb 100644
--- a/wakuv1/waku_unsupported.go
+++ b/wakuv1/waku_unsupported.go
@@ -12,8 +12,9 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/p2p/enode"
 
-	"github.com/status-im/status-go/waku/types"
 	"github.com/waku-org/go-waku/waku/v2/api/history"
+
+	"github.com/status-im/status-go/waku/types"
 )
 
 var notAvailableStr = "not available in WakuV1"