diff --git a/_assets/scripts/upgrade_module_version.sh b/_assets/scripts/upgrade_module_version.sh
index 7b3f23631..d2ee1131c 100755
--- a/_assets/scripts/upgrade_module_version.sh
+++ b/_assets/scripts/upgrade_module_version.sh
@@ -19,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"
-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
+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 ca24c130f..083e84265 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/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"
+	"github.com/status-im/status-go/v3/protocol/common"
+	"github.com/status-im/status-go/v3/protocol/protobuf"
+	"github.com/status-im/status-go/v3/protocol/transport"
+	v1protocol "github.com/status-im/status-go/v3/protocol/v1"
 )
 
 func (m *Messenger) dispatchToHandler(messageState *ReceivedMessageState, protoBytes []byte, msg *v1protocol.StatusMessage, filter transport.Filter, fromArchive bool) error {