diff --git a/Makefile b/Makefile
index dbde38ee..fe4e8a94 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 .PHONY: build build-gui build-nogui build-launcher versioner hasher
 
 # Keep version hardcoded so app build works also without Git repository.
-BRIDGE_APP_VERSION?=2.5.14+git
+BRIDGE_APP_VERSION?=3.0.0+git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 APP_FULL_NAME:=Proton Mail Bridge
 APP_VENDOR:=Proton AG
@@ -26,8 +26,8 @@ MACOS_MIN_VERSION=11.0
 BUILD_FLAGS:=-tags='${BUILD_TAGS}'
 BUILD_FLAGS_LAUNCHER:=${BUILD_FLAGS}
 BUILD_FLAGS_GUI:=-tags='${BUILD_TAGS} build_qt'
-GO_LDFLAGS:=$(addprefix -X github.com/ProtonMail/proton-bridge/v2/internal/constants., Version=${APP_VERSION} Revision=${REVISION} BuildTime=${BUILD_TIME})
-GO_LDFLAGS+=-X "github.com/ProtonMail/proton-bridge/v2/internal/constants.FullAppName=${APP_FULL_NAME}"
+GO_LDFLAGS:=$(addprefix -X github.com/ProtonMail/proton-bridge/v3/internal/constants., Version=${APP_VERSION} Revision=${REVISION} BuildTime=${BUILD_TIME})
+GO_LDFLAGS+=-X "github.com/ProtonMail/proton-bridge/v3/internal/constants.FullAppName=${APP_FULL_NAME}"
 
 ifneq "${BUILD_LDFLAGS}" ""
 	GO_LDFLAGS+=${BUILD_LDFLAGS}
@@ -227,13 +227,13 @@ test-race: gofiles
 	go test -v -timeout=30m -p=1 -count=1 -race -failfast -run=${TESTRUN} ./internal/... ./pkg/...
 
 test-integration: gofiles
-	go test -v -timeout=10m -p=1 -count=1 github.com/ProtonMail/proton-bridge/v2/tests
+	go test -v -timeout=10m -p=1 -count=1 github.com/ProtonMail/proton-bridge/v3/tests
 
 test-integration-debug: gofiles
-	dlv test github.com/ProtonMail/proton-bridge/v2/tests -- -test.v -test.timeout=10m -test.parallel=1 -test.count=1
+	dlv test github.com/ProtonMail/proton-bridge/v3/tests -- -test.v -test.timeout=10m -test.parallel=1 -test.count=1
 
 test-integration-race: gofiles
-	go test -v -timeout=60m -p=1 -count=1 -race -failfast github.com/ProtonMail/proton-bridge/v2/tests
+	go test -v -timeout=60m -p=1 -count=1 -race -failfast github.com/ProtonMail/proton-bridge/v3/tests
 
 bench:
 	go test -run '^$$' -bench=. -memprofile bench_mem.pprof -cpuprofile bench_cpu.pprof ./internal/store
@@ -244,11 +244,11 @@ coverage: test
 	go tool cover -html=/tmp/coverage.out -o=coverage.html
 
 mocks:
-	mockgen --package mocks github.com/ProtonMail/proton-bridge/v2/internal/bridge TLSReporter,ProxyController,Autostarter > tmp
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/bridge TLSReporter,ProxyController,Autostarter > tmp
 	mv tmp internal/bridge/mocks/mocks.go
-	mockgen --package mocks github.com/ProtonMail/proton-bridge/v2/internal/async PanicHandler > internal/bridge/mocks/async_mocks.go
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/async PanicHandler > internal/bridge/mocks/async_mocks.go
 	mockgen --package mocks github.com/ProtonMail/gluon/reporter Reporter > internal/bridge/mocks/gluon_mocks.go
-	mockgen --package mocks github.com/ProtonMail/proton-bridge/v2/internal/updater Downloader,Installer > internal/updater/mocks/mocks.go
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/v3/internal/updater Downloader,Installer > internal/updater/mocks/mocks.go
 
 lint: gofiles lint-golang lint-license lint-dependencies lint-changelog
 
diff --git a/cmd/Desktop-Bridge/main.go b/cmd/Desktop-Bridge/main.go
index 56072a12..97083cfa 100644
--- a/cmd/Desktop-Bridge/main.go
+++ b/cmd/Desktop-Bridge/main.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/app"
+	"github.com/ProtonMail/proton-bridge/v3/internal/app"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/sirupsen/logrus"
 )
diff --git a/cmd/launcher/main.go b/cmd/launcher/main.go
index b8762b1b..92001806 100644
--- a/cmd/launcher/main.go
+++ b/cmd/launcher/main.go
@@ -26,14 +26,14 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/crash"
-	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
-	"github.com/ProtonMail/proton-bridge/v2/internal/logging"
-	"github.com/ProtonMail/proton-bridge/v2/internal/sentry"
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
-	"github.com/ProtonMail/proton-bridge/v2/internal/useragent"
-	"github.com/ProtonMail/proton-bridge/v2/internal/versioner"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/crash"
+	"github.com/ProtonMail/proton-bridge/v3/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
+	"github.com/ProtonMail/proton-bridge/v3/internal/sentry"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
+	"github.com/ProtonMail/proton-bridge/v3/internal/versioner"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/elastic/go-sysinfo"
 	"github.com/elastic/go-sysinfo/types"
diff --git a/go.mod b/go.mod
index 3e06254e..0cb1de2a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/ProtonMail/proton-bridge/v2
+module github.com/ProtonMail/proton-bridge/v3
 
 go 1.18
 
diff --git a/internal/app/app.go b/internal/app/app.go
index 671d6c71..55093e46 100644
--- a/internal/app/app.go
+++ b/internal/app/app.go
@@ -26,18 +26,18 @@ import (
 	"runtime"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/cookies"
-	"github.com/ProtonMail/proton-bridge/v2/internal/crash"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/focus"
-	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
-	"github.com/ProtonMail/proton-bridge/v2/internal/logging"
-	"github.com/ProtonMail/proton-bridge/v2/internal/sentry"
-	"github.com/ProtonMail/proton-bridge/v2/internal/useragent"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/restarter"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/cookies"
+	"github.com/ProtonMail/proton-bridge/v3/internal/crash"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/focus"
+	"github.com/ProtonMail/proton-bridge/v3/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
+	"github.com/ProtonMail/proton-bridge/v3/internal/sentry"
+	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/restarter"
 	"github.com/pkg/profile"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
diff --git a/internal/app/bridge.go b/internal/app/bridge.go
index a7504eb8..e26e0797 100644
--- a/internal/app/bridge.go
+++ b/internal/app/bridge.go
@@ -25,17 +25,17 @@ import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/go-autostart"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/crash"
-	"github.com/ProtonMail/proton-bridge/v2/internal/dialer"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
-	"github.com/ProtonMail/proton-bridge/v2/internal/sentry"
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
-	"github.com/ProtonMail/proton-bridge/v2/internal/useragent"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
-	"github.com/ProtonMail/proton-bridge/v2/internal/versioner"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/crash"
+	"github.com/ProtonMail/proton-bridge/v3/internal/dialer"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v3/internal/sentry"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/versioner"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
diff --git a/internal/app/frontend.go b/internal/app/frontend.go
index 01b0d655..f7ea53e8 100644
--- a/internal/app/frontend.go
+++ b/internal/app/frontend.go
@@ -20,13 +20,13 @@ package app
 import (
 	"fmt"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/v2/internal/crash"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	bridgeCLI "github.com/ProtonMail/proton-bridge/v2/internal/frontend/cli"
-	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/grpc"
-	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/restarter"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/crash"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	bridgeCLI "github.com/ProtonMail/proton-bridge/v3/internal/frontend/cli"
+	"github.com/ProtonMail/proton-bridge/v3/internal/frontend/grpc"
+	"github.com/ProtonMail/proton-bridge/v3/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/restarter"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
diff --git a/internal/app/migration.go b/internal/app/migration.go
index c458768f..127ca35e 100644
--- a/internal/app/migration.go
+++ b/internal/app/migration.go
@@ -28,11 +28,11 @@ import (
 	"time"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/ProtonMail/proton-bridge/v2/internal/legacy/credentials"
-	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/keychain"
+	"github.com/ProtonMail/proton-bridge/v3/internal/legacy/credentials"
+	"github.com/ProtonMail/proton-bridge/v3/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
 	"github.com/allan-simon/go-singleinstance"
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
diff --git a/internal/app/migration_test.go b/internal/app/migration_test.go
index 5d8b9416..ce811d34 100644
--- a/internal/app/migration_test.go
+++ b/internal/app/migration_test.go
@@ -24,9 +24,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/cookies"
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/cookies"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/internal/app/singleinstance.go b/internal/app/singleinstance.go
index 0009a88f..86ca163f 100644
--- a/internal/app/singleinstance.go
+++ b/internal/app/singleinstance.go
@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/ProtonMail/proton-bridge/v2/internal/focus"
+	"github.com/ProtonMail/proton-bridge/v3/internal/focus"
 	"github.com/allan-simon/go-singleinstance"
 	"github.com/sirupsen/logrus"
 )
diff --git a/internal/app/vault.go b/internal/app/vault.go
index b219ffed..f477ac6c 100644
--- a/internal/app/vault.go
+++ b/internal/app/vault.go
@@ -23,11 +23,11 @@ import (
 	"path"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/internal/certs"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/keychain"
+	"github.com/ProtonMail/proton-bridge/v3/internal/certs"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/exp/slices"
 )
diff --git a/internal/bridge/api.go b/internal/bridge/api.go
index 33512d1f..17d42d87 100644
--- a/internal/bridge/api.go
+++ b/internal/bridge/api.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/go-proton-api"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/internal/bridge/bridge.go b/internal/bridge/bridge.go
index 3872264b..22259835 100644
--- a/internal/bridge/bridge.go
+++ b/internal/bridge/bridge.go
@@ -33,13 +33,13 @@ import (
 	"github.com/ProtonMail/gluon/reporter"
 	"github.com/ProtonMail/gluon/watcher"
 	"github.com/ProtonMail/go-proton-api"
-	"github.com/ProtonMail/proton-bridge/v2/internal/async"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/focus"
-	"github.com/ProtonMail/proton-bridge/v2/internal/safe"
-	"github.com/ProtonMail/proton-bridge/v2/internal/user"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/async"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/focus"
+	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
+	"github.com/ProtonMail/proton-bridge/v3/internal/user"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/emersion/go-smtp"
 	"github.com/go-resty/resty/v2"
diff --git a/internal/bridge/bridge_test.go b/internal/bridge/bridge_test.go
index 59d840df..fc5e8629 100644
--- a/internal/bridge/bridge_test.go
+++ b/internal/bridge/bridge_test.go
@@ -32,17 +32,17 @@ import (
 	"github.com/ProtonMail/go-proton-api/server"
 	"github.com/ProtonMail/go-proton-api/server/backend"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/v2/internal/certs"
-	"github.com/ProtonMail/proton-bridge/v2/internal/cookies"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/focus"
-	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
-	"github.com/ProtonMail/proton-bridge/v2/internal/user"
-	"github.com/ProtonMail/proton-bridge/v2/internal/useragent"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
-	"github.com/ProtonMail/proton-bridge/v2/tests"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/certs"
+	"github.com/ProtonMail/proton-bridge/v3/internal/cookies"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/focus"
+	"github.com/ProtonMail/proton-bridge/v3/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/user"
+	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/tests"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
diff --git a/internal/bridge/bug_report.go b/internal/bridge/bug_report.go
index fc2ac7a8..5b8d5442 100644
--- a/internal/bridge/bug_report.go
+++ b/internal/bridge/bug_report.go
@@ -27,9 +27,9 @@ import (
 	"sort"
 
 	"github.com/ProtonMail/go-proton-api"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/logging"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 )
 
 const (
diff --git a/internal/bridge/configure.go b/internal/bridge/configure.go
index 0ca8d113..37c413ba 100644
--- a/internal/bridge/configure.go
+++ b/internal/bridge/configure.go
@@ -20,12 +20,12 @@ package bridge
 import (
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/clientconfig"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/logging"
-	"github.com/ProtonMail/proton-bridge/v2/internal/safe"
-	"github.com/ProtonMail/proton-bridge/v2/internal/useragent"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/clientconfig"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
+	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
+	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/internal/bridge/imap.go b/internal/bridge/imap.go
index 224c208e..6cf36bf6 100644
--- a/internal/bridge/imap.go
+++ b/internal/bridge/imap.go
@@ -33,11 +33,11 @@ import (
 	imapEvents "github.com/ProtonMail/gluon/events"
 	"github.com/ProtonMail/gluon/reporter"
 	"github.com/ProtonMail/gluon/store"
-	"github.com/ProtonMail/proton-bridge/v2/internal/async"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/logging"
-	"github.com/ProtonMail/proton-bridge/v2/internal/user"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/async"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
+	"github.com/ProtonMail/proton-bridge/v3/internal/user"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/internal/bridge/mocks.go b/internal/bridge/mocks.go
index bbaf586d..564b94af 100644
--- a/internal/bridge/mocks.go
+++ b/internal/bridge/mocks.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge/mocks"
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge/mocks"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
 	"github.com/golang/mock/gomock"
 )
 
diff --git a/internal/bridge/mocks/async_mocks.go b/internal/bridge/mocks/async_mocks.go
index 30ab47d3..a528a205 100644
--- a/internal/bridge/mocks/async_mocks.go
+++ b/internal/bridge/mocks/async_mocks.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ProtonMail/proton-bridge/v2/internal/async (interfaces: PanicHandler)
+// Source: github.com/ProtonMail/proton-bridge/v3/internal/async (interfaces: PanicHandler)
 
 // Package mocks is a generated GoMock package.
 package mocks
diff --git a/internal/bridge/mocks/mocks.go b/internal/bridge/mocks/mocks.go
index d519ee43..71e861dc 100644
--- a/internal/bridge/mocks/mocks.go
+++ b/internal/bridge/mocks/mocks.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ProtonMail/proton-bridge/v2/internal/bridge (interfaces: TLSReporter,ProxyController,Autostarter)
+// Source: github.com/ProtonMail/proton-bridge/v3/internal/bridge (interfaces: TLSReporter,ProxyController,Autostarter)
 
 // Package mocks is a generated GoMock package.
 package mocks
diff --git a/internal/bridge/refresh_test.go b/internal/bridge/refresh_test.go
index d787cf3c..eec9a7fa 100644
--- a/internal/bridge/refresh_test.go
+++ b/internal/bridge/refresh_test.go
@@ -24,9 +24,9 @@ import (
 
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/go-proton-api/server"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
 	"github.com/bradenaw/juniper/iterator"
 	"github.com/emersion/go-imap/client"
 	"github.com/golang/mock/gomock"
diff --git a/internal/bridge/send_test.go b/internal/bridge/send_test.go
index da6746c3..e514a34c 100644
--- a/internal/bridge/send_test.go
+++ b/internal/bridge/send_test.go
@@ -28,8 +28,8 @@ import (
 
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/go-proton-api/server"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/emersion/go-imap"
 	"github.com/emersion/go-imap/client"
 	"github.com/emersion/go-sasl"
diff --git a/internal/bridge/settings.go b/internal/bridge/settings.go
index 22c70337..7bd2af29 100644
--- a/internal/bridge/settings.go
+++ b/internal/bridge/settings.go
@@ -23,11 +23,11 @@ import (
 	"net"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/safe"
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/keychain"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/internal/bridge/settings_test.go b/internal/bridge/settings_test.go
index a44ffc44..7bd95911 100644
--- a/internal/bridge/settings_test.go
+++ b/internal/bridge/settings_test.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/go-proton-api/server"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/internal/bridge/smtp.go b/internal/bridge/smtp.go
index f9240a32..0df6ed2f 100644
--- a/internal/bridge/smtp.go
+++ b/internal/bridge/smtp.go
@@ -22,9 +22,9 @@ import (
 	"crypto/tls"
 	"fmt"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/logging"
+	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/emersion/go-sasl"
 	"github.com/emersion/go-smtp"
 	"github.com/sirupsen/logrus"
diff --git a/internal/bridge/smtp_backend.go b/internal/bridge/smtp_backend.go
index b8df5569..b36c20f3 100644
--- a/internal/bridge/smtp_backend.go
+++ b/internal/bridge/smtp_backend.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/safe"
+	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
 	"github.com/emersion/go-smtp"
 )
 
diff --git a/internal/bridge/sync_test.go b/internal/bridge/sync_test.go
index 8ba4232d..54b727ec 100644
--- a/internal/bridge/sync_test.go
+++ b/internal/bridge/sync_test.go
@@ -28,9 +28,9 @@ import (
 
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/go-proton-api/server"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
 	"github.com/bradenaw/juniper/iterator"
 	"github.com/bradenaw/juniper/stream"
 	"github.com/emersion/go-imap/client"
diff --git a/internal/bridge/types.go b/internal/bridge/types.go
index b308322c..2454543e 100644
--- a/internal/bridge/types.go
+++ b/internal/bridge/types.go
@@ -20,7 +20,7 @@ package bridge
 import (
 	"context"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
 )
 
 type Locator interface {
diff --git a/internal/bridge/updates.go b/internal/bridge/updates.go
index 564d8247..b97a00c7 100644
--- a/internal/bridge/updates.go
+++ b/internal/bridge/updates.go
@@ -21,9 +21,9 @@ import (
 	"context"
 	"errors"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/safe"
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/internal/bridge/user.go b/internal/bridge/user.go
index 570185a0..951c3c9f 100644
--- a/internal/bridge/user.go
+++ b/internal/bridge/user.go
@@ -25,13 +25,13 @@ import (
 
 	"github.com/ProtonMail/gluon/imap"
 	"github.com/ProtonMail/go-proton-api"
-	"github.com/ProtonMail/proton-bridge/v2/internal/async"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/logging"
-	"github.com/ProtonMail/proton-bridge/v2/internal/safe"
-	"github.com/ProtonMail/proton-bridge/v2/internal/try"
-	"github.com/ProtonMail/proton-bridge/v2/internal/user"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/async"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
+	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
+	"github.com/ProtonMail/proton-bridge/v3/internal/try"
+	"github.com/ProtonMail/proton-bridge/v3/internal/user"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/go-resty/resty/v2"
 	"github.com/sirupsen/logrus"
 )
diff --git a/internal/bridge/user_events.go b/internal/bridge/user_events.go
index 4fdf0d3a..6d844b4a 100644
--- a/internal/bridge/user_events.go
+++ b/internal/bridge/user_events.go
@@ -21,10 +21,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/safe"
-	"github.com/ProtonMail/proton-bridge/v2/internal/user"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
+	"github.com/ProtonMail/proton-bridge/v3/internal/user"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 )
 
 func (bridge *Bridge) handleUserEvent(ctx context.Context, user *user.User, event events.Event) error {
diff --git a/internal/bridge/user_test.go b/internal/bridge/user_test.go
index e4d71743..b57e73c7 100644
--- a/internal/bridge/user_test.go
+++ b/internal/bridge/user_test.go
@@ -25,10 +25,10 @@ import (
 
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/go-proton-api/server"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	mocksPkg "github.com/ProtonMail/proton-bridge/v2/internal/bridge/mocks"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	mocksPkg "github.com/ProtonMail/proton-bridge/v3/internal/bridge/mocks"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 )
diff --git a/internal/clientconfig/applemail.go b/internal/clientconfig/applemail.go
index 4951098f..7feb8304 100644
--- a/internal/clientconfig/applemail.go
+++ b/internal/clientconfig/applemail.go
@@ -23,8 +23,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/useragent"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/mobileconfig"
+	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/mobileconfig"
 	"golang.org/x/sys/execabs"
 )
 
diff --git a/internal/crash/handler.go b/internal/crash/handler.go
index df4a4478..15d5aead 100644
--- a/internal/crash/handler.go
+++ b/internal/crash/handler.go
@@ -19,7 +19,7 @@
 package crash
 
 import (
-	"github.com/ProtonMail/proton-bridge/v2/internal/sentry"
+	"github.com/ProtonMail/proton-bridge/v3/internal/sentry"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/internal/dialer/dialer_pinning_checker.go b/internal/dialer/dialer_pinning_checker.go
index 7e9463ce..44faa22f 100644
--- a/internal/dialer/dialer_pinning_checker.go
+++ b/internal/dialer/dialer_pinning_checker.go
@@ -22,7 +22,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ProtonMail/proton-bridge/v2/pkg/algo"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/algo"
 )
 
 // ErrTLSMismatch indicates that no TLS fingerprint match could be found.
diff --git a/internal/dialer/dialer_pinning_reporter.go b/internal/dialer/dialer_pinning_reporter.go
index 3de9e4b8..e3734dd5 100644
--- a/internal/dialer/dialer_pinning_reporter.go
+++ b/internal/dialer/dialer_pinning_reporter.go
@@ -24,7 +24,7 @@ import (
 	"encoding/pem"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/useragent"
+	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
 	"github.com/google/go-cmp/cmp"
 	"github.com/sirupsen/logrus"
 )
diff --git a/internal/dialer/dialer_pinning_reporter_test.go b/internal/dialer/dialer_pinning_reporter_test.go
index 75d5c136..e9512d54 100644
--- a/internal/dialer/dialer_pinning_reporter_test.go
+++ b/internal/dialer/dialer_pinning_reporter_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/useragent"
+	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/dialer/dialer_pinning_test.go b/internal/dialer/dialer_pinning_test.go
index e839e20c..367ee386 100644
--- a/internal/dialer/dialer_pinning_test.go
+++ b/internal/dialer/dialer_pinning_test.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/go-proton-api/server"
-	"github.com/ProtonMail/proton-bridge/v2/internal/useragent"
+	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
 	a "github.com/stretchr/testify/assert"
 	r "github.com/stretchr/testify/require"
 )
diff --git a/internal/dialer/dialer_proxy_provider_test.go b/internal/dialer/dialer_proxy_provider_test.go
index 97df0607..c15044dd 100644
--- a/internal/dialer/dialer_proxy_provider_test.go
+++ b/internal/dialer/dialer_proxy_provider_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/useragent"
+	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
 	r "github.com/stretchr/testify/require"
 )
 
diff --git a/internal/events/address.go b/internal/events/address.go
index f9ee75f4..44dad4cc 100644
--- a/internal/events/address.go
+++ b/internal/events/address.go
@@ -20,7 +20,7 @@ package events
 import (
 	"fmt"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/logging"
+	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
 )
 
 type UserAddressCreated struct {
diff --git a/internal/events/label.go b/internal/events/label.go
index a2074f41..20c08ceb 100644
--- a/internal/events/label.go
+++ b/internal/events/label.go
@@ -20,7 +20,7 @@ package events
 import (
 	"fmt"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/logging"
+	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
 )
 
 type UserLabelCreated struct {
diff --git a/internal/events/update.go b/internal/events/update.go
index 0d3a15ed..c09ee975 100644
--- a/internal/events/update.go
+++ b/internal/events/update.go
@@ -20,7 +20,7 @@ package events
 import (
 	"fmt"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
 )
 
 // UpdateLatest is published when the latest version of bridge is known.
diff --git a/internal/events/user.go b/internal/events/user.go
index e039cd50..d5b12e8c 100644
--- a/internal/events/user.go
+++ b/internal/events/user.go
@@ -20,7 +20,7 @@ package events
 import (
 	"fmt"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 )
 
 type AllUsersLoaded struct {
diff --git a/internal/focus/client.go b/internal/focus/client.go
index a90a79ca..bde01cd6 100644
--- a/internal/focus/client.go
+++ b/internal/focus/client.go
@@ -23,7 +23,7 @@ import (
 	"net"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/ProtonMail/proton-bridge/v2/internal/focus/proto"
+	"github.com/ProtonMail/proton-bridge/v3/internal/focus/proto"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
diff --git a/internal/focus/proto/focus.proto b/internal/focus/proto/focus.proto
index bbe5c6aa..22fccf7c 100644
--- a/internal/focus/proto/focus.proto
+++ b/internal/focus/proto/focus.proto
@@ -19,7 +19,7 @@ syntax = "proto3";
 
 import "google/protobuf/empty.proto";
 
-option go_package = "github.com/ProtonMail/proton-bridge/v2/internal/focus/proto";
+option go_package = "github.com/ProtonMail/proton-bridge/v3/internal/focus/proto";
 
 package focus; // ignored by Go, used as namespace name in C++.
 
diff --git a/internal/focus/service.go b/internal/focus/service.go
index cf42096e..a5ab1d9f 100644
--- a/internal/focus/service.go
+++ b/internal/focus/service.go
@@ -24,7 +24,7 @@ import (
 	"net"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/ProtonMail/proton-bridge/v2/internal/focus/proto"
+	"github.com/ProtonMail/proton-bridge/v3/internal/focus/proto"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/types/known/emptypb"
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Bridge_test.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Bridge_test.qml
index 1e74c4ea..ed4fe703 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/Bridge_test.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/Bridge_test.qml
@@ -853,7 +853,7 @@ Window {
     property url logsPath: StandardPaths.standardLocations(StandardPaths.HomeLocation)[0]
     property url licensePath: StandardPaths.standardLocations(StandardPaths.HomeLocation)[0]
     property url releaseNotesLink: Qt.resolvedUrl("https://proton.me/download/bridge/early_releases.html")
-    property url dependencyLicensesLink: Qt.resolvedUrl("https://github.com/ProtonMail/proton-bridge/v2/blob/master/COPYING_NOTES.md#dependencies")
+    property url dependencyLicensesLink: Qt.resolvedUrl("https://github.com/ProtonMail/proton-bridge/v3/blob/master/COPYING_NOTES.md#dependencies")
     property url landingPageLink: Qt.resolvedUrl("https://proton.me/mail/bridge#download")
 
     property string colorSchemeName: "light"
diff --git a/internal/frontend/bridge-gui/bridgepp/bridgepp/FocusGRPC/focus.pb.cc b/internal/frontend/bridge-gui/bridgepp/bridgepp/FocusGRPC/focus.pb.cc
index 95fb29e5..44aa751a 100644
--- a/internal/frontend/bridge-gui/bridgepp/bridgepp/FocusGRPC/focus.pb.cc
+++ b/internal/frontend/bridge-gui/bridgepp/bridgepp/FocusGRPC/focus.pb.cc
@@ -63,7 +63,7 @@ const char descriptor_table_protodef_focus_2eproto[] PROTOBUF_SECTION_VARIABLE(p
   "f.Empty\032\026.google.protobuf.Empty\0229\n\007Versi"
   "on\022\026.google.protobuf.Empty\032\026.focus.Versi"
   "onResponseB=Z;github.com/ProtonMail/prot"
-  "on-bridge/v2/internal/focus/protob\006proto"
+  "on-bridge/v3/internal/focus/protob\006proto"
   "3"
   ;
 static const ::_pbi::DescriptorTable* const descriptor_table_focus_2eproto_deps[1] = {
diff --git a/internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/bridge.pb.cc b/internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/bridge.pb.cc
index 44ca928a..6c7454cb 100644
--- a/internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/bridge.pb.cc
+++ b/internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/bridge.pb.cc
@@ -1528,7 +1528,7 @@ const char descriptor_table_protodef_bridge_2eproto[] PROTOBUF_SECTION_VARIABLE(
   "treamRequest\032\021.grpc.StreamEvent0\001\022A\n\017Sto"
   "pEventStream\022\026.google.protobuf.Empty\032\026.g"
   "oogle.protobuf.EmptyB6Z4github.com/Proto"
-  "nMail/proton-bridge/v2/internal/grpcb\006pr"
+  "nMail/proton-bridge/v3/internal/grpcb\006pr"
   "oto3"
   ;
 static const ::_pbi::DescriptorTable* const descriptor_table_bridge_2eproto_deps[2] = {
diff --git a/internal/frontend/cli/account_utils.go b/internal/frontend/cli/account_utils.go
index 78f0e8e5..f2da46d0 100644
--- a/internal/frontend/cli/account_utils.go
+++ b/internal/frontend/cli/account_utils.go
@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
 	"github.com/abiosoft/ishell"
 )
 
diff --git a/internal/frontend/cli/accounts.go b/internal/frontend/cli/accounts.go
index 6f15680c..00fa69ee 100644
--- a/internal/frontend/cli/accounts.go
+++ b/internal/frontend/cli/accounts.go
@@ -22,9 +22,9 @@ import (
 	"strings"
 
 	"github.com/ProtonMail/go-proton-api"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/abiosoft/ishell"
 )
 
diff --git a/internal/frontend/cli/frontend.go b/internal/frontend/cli/frontend.go
index 971b3188..a058fb52 100644
--- a/internal/frontend/cli/frontend.go
+++ b/internal/frontend/cli/frontend.go
@@ -21,10 +21,10 @@ package cli
 import (
 	"errors"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/restarter"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/restarter"
 
 	"github.com/abiosoft/ishell"
 	"github.com/sirupsen/logrus"
diff --git a/internal/frontend/cli/system.go b/internal/frontend/cli/system.go
index aa185bd3..6f41ea4b 100644
--- a/internal/frontend/cli/system.go
+++ b/internal/frontend/cli/system.go
@@ -26,8 +26,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/ports"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/ports"
 	"github.com/abiosoft/ishell"
 )
 
diff --git a/internal/frontend/cli/updates.go b/internal/frontend/cli/updates.go
index c7beecf8..908069d9 100644
--- a/internal/frontend/cli/updates.go
+++ b/internal/frontend/cli/updates.go
@@ -18,8 +18,8 @@
 package cli
 
 import (
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
 	"github.com/abiosoft/ishell"
 )
 
diff --git a/internal/frontend/grpc/bridge.proto b/internal/frontend/grpc/bridge.proto
index 520cb682..c30b02a1 100644
--- a/internal/frontend/grpc/bridge.proto
+++ b/internal/frontend/grpc/bridge.proto
@@ -20,7 +20,7 @@ syntax = "proto3";
 import "google/protobuf/empty.proto";
 import "google/protobuf/wrappers.proto";
 
-option go_package = "github.com/ProtonMail/proton-bridge/v2/internal/grpc";
+option go_package = "github.com/ProtonMail/proton-bridge/v3/internal/grpc";
 
 package grpc; // ignored by Go, used as namespace name in C++.
 
diff --git a/internal/frontend/grpc/service.go b/internal/frontend/grpc/service.go
index ab02fc14..55a7aa79 100644
--- a/internal/frontend/grpc/service.go
+++ b/internal/frontend/grpc/service.go
@@ -30,11 +30,11 @@ import (
 	"time"
 
 	"github.com/ProtonMail/go-proton-api"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/v2/internal/certs"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/safe"
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/certs"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/elastic/go-sysinfo"
 	sysinfotypes "github.com/elastic/go-sysinfo/types"
diff --git a/internal/frontend/grpc/service_methods.go b/internal/frontend/grpc/service_methods.go
index 60fc84a5..627ecd12 100644
--- a/internal/frontend/grpc/service_methods.go
+++ b/internal/frontend/grpc/service_methods.go
@@ -25,14 +25,14 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/go-proton-api"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/theme"
-	"github.com/ProtonMail/proton-bridge/v2/internal/safe"
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/keychain"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/ports"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/frontend/theme"
+	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/keychain"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/ports"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/exp/maps"
 	"google.golang.org/grpc/codes"
diff --git a/internal/frontend/grpc/service_user.go b/internal/frontend/grpc/service_user.go
index 589b24a7..b54b3fb7 100644
--- a/internal/frontend/grpc/service_user.go
+++ b/internal/frontend/grpc/service_user.go
@@ -20,7 +20,7 @@ package grpc
 import (
 	"context"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/emptypb"
diff --git a/internal/frontend/grpc/utils.go b/internal/frontend/grpc/utils.go
index b249ddce..9f520f5d 100644
--- a/internal/frontend/grpc/utils.go
+++ b/internal/frontend/grpc/utils.go
@@ -21,8 +21,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/internal/locations/locations.go b/internal/locations/locations.go
index 7198b21b..edc9ec11 100644
--- a/internal/locations/locations.go
+++ b/internal/locations/locations.go
@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/ProtonMail/proton-bridge/v2/pkg/files"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/files"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/internal/logging/crash.go b/internal/logging/crash.go
index 904f208c..591963fb 100644
--- a/internal/logging/crash.go
+++ b/internal/logging/crash.go
@@ -25,8 +25,8 @@ import (
 	"runtime/pprof"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/crash"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/crash"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/internal/logging/logging.go b/internal/logging/logging.go
index c5e3b9c5..a523e2f9 100644
--- a/internal/logging/logging.go
+++ b/internal/logging/logging.go
@@ -26,7 +26,7 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/internal/sentry/reporter.go b/internal/sentry/reporter.go
index c16764d8..61533576 100644
--- a/internal/sentry/reporter.go
+++ b/internal/sentry/reporter.go
@@ -25,7 +25,7 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/getsentry/sentry-go"
 	"github.com/sirupsen/logrus"
 )
diff --git a/internal/sentry/reporter_test.go b/internal/sentry/reporter_test.go
index 36e17683..47ddf8e0 100644
--- a/internal/sentry/reporter_test.go
+++ b/internal/sentry/reporter_test.go
@@ -35,30 +35,30 @@ func TestSkipDuringUnwind(t *testing.T) {
 	}()
 
 	wantSkippedFunctions := []string{
-		"github.com/ProtonMail/proton-bridge/v2/internal/sentry.TestSkipDuringUnwind",
-		"github.com/ProtonMail/proton-bridge/v2/internal/sentry.TestSkipDuringUnwind.func1",
+		"github.com/ProtonMail/proton-bridge/v3/internal/sentry.TestSkipDuringUnwind",
+		"github.com/ProtonMail/proton-bridge/v3/internal/sentry.TestSkipDuringUnwind.func1",
 	}
 	r.Equal(t, wantSkippedFunctions, skippedFunctions)
 }
 
 func TestFilterOutPanicHandlers(t *testing.T) {
 	skippedFunctions = []string{
-		"github.com/ProtonMail/proton-bridge/v2/pkg/config.(*PanicHandler).HandlePanic",
-		"github.com/ProtonMail/proton-bridge/v2/pkg/config.HandlePanic",
-		"github.com/ProtonMail/proton-bridge/v2/internal/sentry.ReportSentryCrash",
-		"github.com/ProtonMail/proton-bridge/v2/internal/sentry.ReportSentryCrash.func1",
+		"github.com/ProtonMail/proton-bridge/v3/pkg/config.(*PanicHandler).HandlePanic",
+		"github.com/ProtonMail/proton-bridge/v3/pkg/config.HandlePanic",
+		"github.com/ProtonMail/proton-bridge/v3/internal/sentry.ReportSentryCrash",
+		"github.com/ProtonMail/proton-bridge/v3/internal/sentry.ReportSentryCrash.func1",
 	}
 
 	frames := []sentry.Frame{
-		{Module: "github.com/ProtonMail/proton-bridge/v2/internal/cmd", Function: "main"},
+		{Module: "github.com/ProtonMail/proton-bridge/v3/internal/cmd", Function: "main"},
 		{Module: "github.com/urfave/cli", Function: "(*App).Run"},
-		{Module: "github.com/ProtonMail/proton-bridge/v2/internal/cmd", Function: "RegisterHandlePanic"},
+		{Module: "github.com/ProtonMail/proton-bridge/v3/internal/cmd", Function: "RegisterHandlePanic"},
 		{Module: "github.com/ProtonMail/pkg", Function: "HandlePanic"},
 		{Module: "main", Function: "run"},
-		{Module: "github.com/ProtonMail/proton-bridge/v2/pkg/config", Function: "(*PanicHandler).HandlePanic"},
-		{Module: "github.com/ProtonMail/proton-bridge/v2/pkg/config", Function: "HandlePanic"},
-		{Module: "github.com/ProtonMail/proton-bridge/v2/internal/sentry", Function: "ReportSentryCrash"},
-		{Module: "github.com/ProtonMail/proton-bridge/v2/internal/sentry", Function: "ReportSentryCrash.func1"},
+		{Module: "github.com/ProtonMail/proton-bridge/v3/pkg/config", Function: "(*PanicHandler).HandlePanic"},
+		{Module: "github.com/ProtonMail/proton-bridge/v3/pkg/config", Function: "HandlePanic"},
+		{Module: "github.com/ProtonMail/proton-bridge/v3/internal/sentry", Function: "ReportSentryCrash"},
+		{Module: "github.com/ProtonMail/proton-bridge/v3/internal/sentry", Function: "ReportSentryCrash.func1"},
 	}
 
 	gotFrames := filterOutPanicHandlers(frames)
diff --git a/internal/updater/install_darwin.go b/internal/updater/install_darwin.go
index 002c5f92..0bcce3f7 100644
--- a/internal/updater/install_darwin.go
+++ b/internal/updater/install_darwin.go
@@ -24,8 +24,8 @@ import (
 	"path/filepath"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/ProtonMail/proton-bridge/v2/internal/versioner"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/tar"
+	"github.com/ProtonMail/proton-bridge/v3/internal/versioner"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/tar"
 	"github.com/pkg/errors"
 )
 
diff --git a/internal/updater/install_default.go b/internal/updater/install_default.go
index 9cfaeaf2..7eecc2d8 100644
--- a/internal/updater/install_default.go
+++ b/internal/updater/install_default.go
@@ -24,7 +24,7 @@ import (
 	"io"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/ProtonMail/proton-bridge/v2/internal/versioner"
+	"github.com/ProtonMail/proton-bridge/v3/internal/versioner"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/internal/updater/mocks/mocks.go b/internal/updater/mocks/mocks.go
index 4c340152..9c1b8c4e 100644
--- a/internal/updater/mocks/mocks.go
+++ b/internal/updater/mocks/mocks.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/ProtonMail/proton-bridge/v2/internal/updater (interfaces: Downloader,Installer)
+// Source: github.com/ProtonMail/proton-bridge/v3/internal/updater (interfaces: Downloader,Installer)
 
 // Package mocks is a generated GoMock package.
 package mocks
diff --git a/internal/user/events.go b/internal/user/events.go
index 4137975f..d027db89 100644
--- a/internal/user/events.go
+++ b/internal/user/events.go
@@ -25,10 +25,10 @@ import (
 	"github.com/ProtonMail/gluon/queue"
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/logging"
-	"github.com/ProtonMail/proton-bridge/v2/internal/safe"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
+	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/internal/user/imap.go b/internal/user/imap.go
index e19a47d4..ec8de275 100644
--- a/internal/user/imap.go
+++ b/internal/user/imap.go
@@ -28,9 +28,9 @@ import (
 	"github.com/ProtonMail/gluon/rfc822"
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/internal/safe"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/message"
 	"github.com/bradenaw/juniper/stream"
 	"github.com/bradenaw/juniper/xslices"
 	"golang.org/x/exp/slices"
diff --git a/internal/user/smtp.go b/internal/user/smtp.go
index 774eb46b..5bb231a7 100644
--- a/internal/user/smtp.go
+++ b/internal/user/smtp.go
@@ -32,11 +32,11 @@ import (
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/go-rfc5322"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/internal/logging"
-	"github.com/ProtonMail/proton-bridge/v2/internal/safe"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/message/parser"
+	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
+	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/message/parser"
 	"github.com/bradenaw/juniper/parallel"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/sirupsen/logrus"
diff --git a/internal/user/smtp_packages.go b/internal/user/smtp_packages.go
index b58980c4..c228581e 100644
--- a/internal/user/smtp_packages.go
+++ b/internal/user/smtp_packages.go
@@ -21,7 +21,7 @@ import (
 	"github.com/ProtonMail/gluon/rfc822"
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/message"
 	"github.com/bradenaw/juniper/xslices"
 	"golang.org/x/exp/maps"
 	"golang.org/x/exp/slices"
diff --git a/internal/user/sync.go b/internal/user/sync.go
index 6755aca3..1b288bec 100644
--- a/internal/user/sync.go
+++ b/internal/user/sync.go
@@ -28,9 +28,9 @@ import (
 	"github.com/ProtonMail/gluon/queue"
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/safe"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/bradenaw/juniper/parallel"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/google/uuid"
diff --git a/internal/user/sync_build.go b/internal/user/sync_build.go
index 5445d3d0..897474a0 100644
--- a/internal/user/sync_build.go
+++ b/internal/user/sync_build.go
@@ -23,7 +23,7 @@ import (
 	"github.com/ProtonMail/gluon/imap"
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/message"
 )
 
 type buildRes struct {
diff --git a/internal/user/sync_reporter.go b/internal/user/sync_reporter.go
index 98cefe58..3149e8cc 100644
--- a/internal/user/sync_reporter.go
+++ b/internal/user/sync_reporter.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/ProtonMail/gluon/queue"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
 )
 
 type reporter struct {
diff --git a/internal/user/user.go b/internal/user/user.go
index 9ae4954e..28aebc0c 100644
--- a/internal/user/user.go
+++ b/internal/user/user.go
@@ -31,11 +31,11 @@ import (
 	"github.com/ProtonMail/gluon/queue"
 	gluonReporter "github.com/ProtonMail/gluon/reporter"
 	"github.com/ProtonMail/go-proton-api"
-	"github.com/ProtonMail/proton-bridge/v2/internal/async"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/logging"
-	"github.com/ProtonMail/proton-bridge/v2/internal/safe"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/async"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/logging"
+	"github.com/ProtonMail/proton-bridge/v3/internal/safe"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/go-resty/resty/v2"
 	"github.com/sirupsen/logrus"
diff --git a/internal/user/user_test.go b/internal/user/user_test.go
index a87bc455..524c5297 100644
--- a/internal/user/user_test.go
+++ b/internal/user/user_test.go
@@ -26,11 +26,11 @@ import (
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/go-proton-api/server"
 	"github.com/ProtonMail/go-proton-api/server/backend"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge/mocks"
-	"github.com/ProtonMail/proton-bridge/v2/internal/certs"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
-	"github.com/ProtonMail/proton-bridge/v2/tests"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge/mocks"
+	"github.com/ProtonMail/proton-bridge/v3/internal/certs"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/tests"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
diff --git a/internal/vault/settings.go b/internal/vault/settings.go
index 33042b37..a9ba4a08 100644
--- a/internal/vault/settings.go
+++ b/internal/vault/settings.go
@@ -19,7 +19,7 @@ package vault
 
 import (
 	"github.com/Masterminds/semver/v3"
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
 )
 
 // GetIMAPPort sets the port that the IMAP server should listen on.
diff --git a/internal/vault/settings_test.go b/internal/vault/settings_test.go
index 163a7e47..365912b6 100644
--- a/internal/vault/settings_test.go
+++ b/internal/vault/settings_test.go
@@ -21,8 +21,8 @@ import (
 	"testing"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/internal/vault/types_certs.go b/internal/vault/types_certs.go
index db7031b8..838f73d1 100644
--- a/internal/vault/types_certs.go
+++ b/internal/vault/types_certs.go
@@ -17,7 +17,7 @@
 
 package vault
 
-import "github.com/ProtonMail/proton-bridge/v2/internal/certs"
+import "github.com/ProtonMail/proton-bridge/v3/internal/certs"
 
 type Certs struct {
 	Bridge    Cert
diff --git a/internal/vault/types_settings.go b/internal/vault/types_settings.go
index 252f9b35..172605d4 100644
--- a/internal/vault/types_settings.go
+++ b/internal/vault/types_settings.go
@@ -21,7 +21,7 @@ import (
 	"math/rand"
 	"runtime"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
 )
 
 type Settings struct {
diff --git a/internal/vault/user_test.go b/internal/vault/user_test.go
index 9cb4172e..2e01f014 100644
--- a/internal/vault/user_test.go
+++ b/internal/vault/user_test.go
@@ -21,7 +21,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/internal/vault/vault_bench_test.go b/internal/vault/vault_bench_test.go
index 2c83b2d3..6265c116 100644
--- a/internal/vault/vault_bench_test.go
+++ b/internal/vault/vault_bench_test.go
@@ -22,7 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 )
diff --git a/internal/vault/vault_test.go b/internal/vault/vault_test.go
index 1c61a047..f8418030 100644
--- a/internal/vault/vault_test.go
+++ b/internal/vault/vault_test.go
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/internal/versioner/install.go b/internal/versioner/install.go
index 6fb7d4ba..43956f49 100644
--- a/internal/versioner/install.go
+++ b/internal/versioner/install.go
@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/tar"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/tar"
 )
 
 // InstallNewVersion installs a tgz update package of the given version.
diff --git a/internal/versioner/remove.go b/internal/versioner/remove.go
index f8a45ef9..a0b1900a 100644
--- a/internal/versioner/remove.go
+++ b/internal/versioner/remove.go
@@ -24,7 +24,7 @@ import (
 	"os"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/internal/versioner/version.go b/internal/versioner/version.go
index a8cce75a..9ca70563 100644
--- a/internal/versioner/version.go
+++ b/internal/versioner/version.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/sum"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/sum"
 )
 
 const sumFile = ".sum"
diff --git a/internal/versioner/version_test.go b/internal/versioner/version_test.go
index c15ccefd..dd493a5b 100644
--- a/internal/versioner/version_test.go
+++ b/internal/versioner/version_test.go
@@ -25,8 +25,8 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/sum"
-	"github.com/ProtonMail/proton-bridge/v2/utils"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/sum"
+	"github.com/ProtonMail/proton-bridge/v3/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/pkg/message/build.go b/pkg/message/build.go
index 6c88e2d3..42ad61e1 100644
--- a/pkg/message/build.go
+++ b/pkg/message/build.go
@@ -30,7 +30,7 @@ import (
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/go-rfc5322"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/algo"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/algo"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/emersion/go-message"
 	"github.com/emersion/go-message/textproto"
diff --git a/pkg/message/build_framework_test.go b/pkg/message/build_framework_test.go
index b8462040..3172fb89 100644
--- a/pkg/message/build_framework_test.go
+++ b/pkg/message/build_framework_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/ProtonMail/gluon/rfc822"
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/message/parser"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/message/parser"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/text/encoding/htmlindex"
 )
diff --git a/pkg/message/build_test.go b/pkg/message/build_test.go
index c35b3541..91134351 100644
--- a/pkg/message/build_test.go
+++ b/pkg/message/build_test.go
@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/utils"
+	"github.com/ProtonMail/proton-bridge/v3/utils"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/pkg/message/parser.go b/pkg/message/parser.go
index f9bac117..ca2a7485 100644
--- a/pkg/message/parser.go
+++ b/pkg/message/parser.go
@@ -29,8 +29,8 @@ import (
 	"github.com/ProtonMail/gluon/rfc822"
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/go-rfc5322"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/message/parser"
-	pmmime "github.com/ProtonMail/proton-bridge/v2/pkg/mime"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/message/parser"
+	pmmime "github.com/ProtonMail/proton-bridge/v3/pkg/mime"
 	"github.com/emersion/go-message"
 	"github.com/jaytaylor/html2text"
 	"github.com/pkg/errors"
diff --git a/pkg/message/parser/part.go b/pkg/message/parser/part.go
index 2b52a554..65b4e891 100644
--- a/pkg/message/parser/part.go
+++ b/pkg/message/parser/part.go
@@ -23,7 +23,7 @@ import (
 	"mime"
 	"unicode/utf8"
 
-	pmmime "github.com/ProtonMail/proton-bridge/v2/pkg/mime"
+	pmmime "github.com/ProtonMail/proton-bridge/v3/pkg/mime"
 	"github.com/PuerkitoBio/goquery"
 	"github.com/emersion/go-message"
 	"github.com/sirupsen/logrus"
diff --git a/pkg/message/parser_test.go b/pkg/message/parser_test.go
index e2958db1..d6722b3e 100644
--- a/pkg/message/parser_test.go
+++ b/pkg/message/parser_test.go
@@ -25,7 +25,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/ProtonMail/proton-bridge/v2/pkg/message/parser"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/message/parser"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/text/encoding/charmap"
diff --git a/pkg/ports/ports.go b/pkg/ports/ports.go
index c3acfd65..d008a406 100644
--- a/pkg/ports/ports.go
+++ b/pkg/ports/ports.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 )
 
 const (
diff --git a/tests/bridge_test.go b/tests/bridge_test.go
index 6c8ae0be..720d8d25 100644
--- a/tests/bridge_test.go
+++ b/tests/bridge_test.go
@@ -25,8 +25,8 @@ import (
 	"time"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/golang/mock/gomock"
 )
 
diff --git a/tests/collector_test.go b/tests/collector_test.go
index 2bbe842b..7cbb3ca7 100644
--- a/tests/collector_test.go
+++ b/tests/collector_test.go
@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/ProtonMail/gluon/queue"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
 )
 
 type eventCollector struct {
diff --git a/tests/ctx_bridge_test.go b/tests/ctx_bridge_test.go
index e148b80e..a076580e 100644
--- a/tests/ctx_bridge_test.go
+++ b/tests/ctx_bridge_test.go
@@ -31,13 +31,13 @@ import (
 
 	"github.com/ProtonMail/gluon/queue"
 	"github.com/ProtonMail/go-proton-api"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
-	"github.com/ProtonMail/proton-bridge/v2/internal/cookies"
-	"github.com/ProtonMail/proton-bridge/v2/internal/events"
-	frontend "github.com/ProtonMail/proton-bridge/v2/internal/frontend/grpc"
-	"github.com/ProtonMail/proton-bridge/v2/internal/useragent"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/cookies"
+	"github.com/ProtonMail/proton-bridge/v3/internal/events"
+	frontend "github.com/ProtonMail/proton-bridge/v3/internal/frontend/grpc"
+	"github.com/ProtonMail/proton-bridge/v3/internal/useragent"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
diff --git a/tests/ctx_imap_test.go b/tests/ctx_imap_test.go
index 151c7b39..f3098dda 100644
--- a/tests/ctx_imap_test.go
+++ b/tests/ctx_imap_test.go
@@ -20,7 +20,7 @@ package tests
 import (
 	"fmt"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/emersion/go-imap/client"
 )
 
diff --git a/tests/ctx_smtp_test.go b/tests/ctx_smtp_test.go
index 9aa95f09..b7a41a7d 100644
--- a/tests/ctx_smtp_test.go
+++ b/tests/ctx_smtp_test.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"net/smtp"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 )
 
 func (t *testCtx) newSMTPClient(userID, clientID string) error {
diff --git a/tests/ctx_test.go b/tests/ctx_test.go
index abb96225..9eb4ca0e 100644
--- a/tests/ctx_test.go
+++ b/tests/ctx_test.go
@@ -29,9 +29,9 @@ import (
 	"github.com/ProtonMail/gluon/queue"
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/go-proton-api/server"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
-	frontend "github.com/ProtonMail/proton-bridge/v2/internal/frontend/grpc"
-	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
+	frontend "github.com/ProtonMail/proton-bridge/v3/internal/frontend/grpc"
+	"github.com/ProtonMail/proton-bridge/v3/internal/locations"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/emersion/go-imap/client"
 	"github.com/golang/mock/gomock"
diff --git a/tests/fast.go b/tests/fast.go
index 39af5e21..1805b339 100644
--- a/tests/fast.go
+++ b/tests/fast.go
@@ -21,7 +21,7 @@ import (
 	"crypto/x509"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/internal/certs"
+	"github.com/ProtonMail/proton-bridge/v3/internal/certs"
 )
 
 var (
diff --git a/tests/init_test.go b/tests/init_test.go
index a09a04c5..7aca5ad5 100644
--- a/tests/init_test.go
+++ b/tests/init_test.go
@@ -21,8 +21,8 @@ import (
 	"time"
 
 	"github.com/ProtonMail/go-proton-api/server/backend"
-	"github.com/ProtonMail/proton-bridge/v2/internal/certs"
-	"github.com/ProtonMail/proton-bridge/v2/internal/user"
+	"github.com/ProtonMail/proton-bridge/v3/internal/certs"
+	"github.com/ProtonMail/proton-bridge/v3/internal/user"
 )
 
 func init() {
diff --git a/tests/smtp_test.go b/tests/smtp_test.go
index e4247fe6..df7c5961 100644
--- a/tests/smtp_test.go
+++ b/tests/smtp_test.go
@@ -22,7 +22,7 @@ import (
 	"net/smtp"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/cucumber/godog"
 )
 
diff --git a/tests/types_test.go b/tests/types_test.go
index e42ace4b..6901d5d2 100644
--- a/tests/types_test.go
+++ b/tests/types_test.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/ProtonMail/gluon/rfc822"
-	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/message"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/cucumber/messages-go/v16"
 	"github.com/emersion/go-imap"
diff --git a/tests/user_test.go b/tests/user_test.go
index fdfae03c..08cc3f76 100644
--- a/tests/user_test.go
+++ b/tests/user_test.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
 	"github.com/bradenaw/juniper/iterator"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/cucumber/godog"
diff --git a/utils/hasher/main.go b/utils/hasher/main.go
index 38e44847..c37bf4b4 100644
--- a/utils/hasher/main.go
+++ b/utils/hasher/main.go
@@ -20,7 +20,7 @@ package main
 import (
 	"os"
 
-	"github.com/ProtonMail/proton-bridge/v2/pkg/sum"
+	"github.com/ProtonMail/proton-bridge/v3/pkg/sum"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
diff --git a/utils/vault-editor/main.go b/utils/vault-editor/main.go
index caadbcfe..f2fffb9d 100644
--- a/utils/vault-editor/main.go
+++ b/utils/vault-editor/main.go
@@ -24,9 +24,9 @@ import (
 	"io"
 	"os"
 
-	"github.com/ProtonMail/proton-bridge/v2/internal/app"
-	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
-	"github.com/ProtonMail/proton-bridge/v2/internal/vault"
+	"github.com/ProtonMail/proton-bridge/v3/internal/app"
+	"github.com/ProtonMail/proton-bridge/v3/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/utils/versioner/main.go b/utils/versioner/main.go
index 734c80aa..f2ea136c 100644
--- a/utils/versioner/main.go
+++ b/utils/versioner/main.go
@@ -24,7 +24,7 @@ import (
 	"os"
 
 	"github.com/Masterminds/semver/v3"
-	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v3/internal/updater"
 	"github.com/go-resty/resty/v2"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"