diff --git a/_assets/scripts/upgrade_module_version.sh b/_assets/scripts/upgrade_module_version.sh
index 57ae6e010..7b3f23631 100755
--- a/_assets/scripts/upgrade_module_version.sh
+++ b/_assets/scripts/upgrade_module_version.sh
@@ -1,19 +1,16 @@
 #!/bin/bash
 
 version=3
-oldVersion=$((version - 1))
 
-echo "Upgrading from version ${oldVersion} to ${version}"
+echo "Upgrading from version to ${version}"
 
 # Remove sub-modules
-#rm extkeys/go.sum
-#rm extkeys/go.mod
 rm exchanges/go.sum
 rm exchanges/go.mod
 
 # Update template files
-sed -i '' "s|github.com/status-im/status-go/v${oldVersion}|github.com/status-im/status-go/v${version}|g" cmd/generate_handlers/generate_handlers_template.txt
-sed -i '' "s|github.com/status-im/status-go/v${oldVersion}|github.com/status-im/status-go/v${version}|g" cmd/status-backend/server/parse-api/endpoints_template.txt
+sed -i '' "s|github.com/status-im/status-go|github.com/status-im/status-go/v${version}|g" cmd/generate_handlers/generate_handlers_template.txt
+sed -i '' "s|github.com/status-im/status-go|github.com/status-im/status-go/v${version}|g" cmd/status-backend/server/parse-api/endpoints_template.txt
 
 # Run upgrade tool
 mod upgrade -tag ${version}
@@ -22,4 +19,4 @@ mod upgrade -tag ${version}
 find . -name "*.go" -exec sed -i '' "s/\/v${version}\/v${version}/\/v${version}/g" {} +
 
 # Fallback "/v3/extkeys" to "/extkeys"
-sed -i '' "s|github.com/status-im/status-go/v${oldVersion}|github.com/status-im/status-go/v${version}|g"
\ No newline at end of file
+find . -name "*.go" -exec sed -i '' "s|github.com/status-im/status-go/v${version}extkeys|github.com/status-im/status-go/extkeys|g" {} \;
\ No newline at end of file
diff --git a/cmd/generate_handlers/generate_handlers_template.txt b/cmd/generate_handlers/generate_handlers_template.txt
index bbed00684..ca24c130f 100644
--- a/cmd/generate_handlers/generate_handlers_template.txt
+++ b/cmd/generate_handlers/generate_handlers_template.txt
@@ -10,10 +10,10 @@ import (
 	"github.com/golang/protobuf/proto"
 	"go.uber.org/zap"
 
-	"github.com/status-im/status-go/v2/protocol/common"
-	"github.com/status-im/status-go/v2/protocol/protobuf"
-	"github.com/status-im/status-go/v2/protocol/transport"
-	v1protocol "github.com/status-im/status-go/v2/protocol/v1"
+	"github.com/status-im/status-go/protocol/common"
+	"github.com/status-im/status-go/protocol/protobuf"
+	"github.com/status-im/status-go/protocol/transport"
+	v1protocol "github.com/status-im/status-go/protocol/v1"
 )
 
 func (m *Messenger) dispatchToHandler(messageState *ReceivedMessageState, protoBytes []byte, msg *v1protocol.StatusMessage, filter transport.Filter, fromArchive bool) error {
diff --git a/cmd/status-backend/server/parse-api/endpoints_template.txt b/cmd/status-backend/server/parse-api/endpoints_template.txt
index 53ea2ca56..0cbafd32f 100644
--- a/cmd/status-backend/server/parse-api/endpoints_template.txt
+++ b/cmd/status-backend/server/parse-api/endpoints_template.txt
@@ -3,7 +3,7 @@
 
 package server
 
-import statusgo "github.com/status-im/status-go/v2/mobile"
+import statusgo "github.com/status-im/status-go/mobile"
 
 var EndpointsWithRequest = map[string]func(string) string{
 	{{- range .FunctionsWithResp }}