diff --git a/go.mod b/go.mod
index 3364885..359f74a 100644
--- a/go.mod
+++ b/go.mod
@@ -2,11 +2,13 @@ module github.com/pilot-protocol/webhook
 
 go 1.25.10
 
+require github.com/pilot-protocol/handshake v0.1.0
+
 require (
-	github.com/TeoSlayer/pilotprotocol v0.0.0
-	github.com/pilot-protocol/handshake v0.1.0
+	github.com/TeoSlayer/pilotprotocol v0.0.0 // indirect
+	github.com/pilot-protocol/common v0.2.0
 )
 
-require github.com/pilot-protocol/common v0.1.0 // indirect
-
 replace github.com/TeoSlayer/pilotprotocol => ../web4
+
+replace github.com/pilot-protocol/common => ../common
diff --git a/go.sum b/go.sum
index de93175..6a4dd03 100644
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,5 @@
 github.com/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9g=
 github.com/coder/websocket v1.8.14/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg=
-github.com/pilot-protocol/common v0.1.0 h1:m8mZZATgeBiFoqhWXPnskw2u0lNkWxHp0IagZK35V1g=
-github.com/pilot-protocol/common v0.1.0/go.mod h1:4YZWHK5nhM+4RLmYTspLxxAFbyBII7yzQDAHq3Ul2ck=
 github.com/pilot-protocol/handshake v0.1.0 h1:TmqIglsimTynKtE5hLpCt/SZmmBYs8OCn4qn755fmew=
 github.com/pilot-protocol/handshake v0.1.0/go.mod h1:FIIMTgRcMIMEim/1d7F5f6YenJC+3xl53QMEmnnJY+0=
 github.com/pilot-protocol/rendezvous v0.1.0 h1:vOBD7CnRY8uU8vma0Vfcr0aPSQ54qNuxppNUiljzk9Y=
diff --git a/service.go b/service.go
index 7923228..dca26fa 100644
--- a/service.go
+++ b/service.go
@@ -10,7 +10,7 @@ import (
 	"log/slog"
 	"sync"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 // Service is the L11 plugin that delivers core daemon events to an
diff --git a/service_disabled.go b/service_disabled.go
index bde35a0..ea5c88e 100644
--- a/service_disabled.go
+++ b/service_disabled.go
@@ -13,7 +13,7 @@ package webhook
 import (
 	"context"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 // Stats mirrors the real Stats so cmd/daemon's webhookManagerAdapter
diff --git a/webhook.go b/webhook.go
index 27304cc..d3ec66e 100644
--- a/webhook.go
+++ b/webhook.go
@@ -28,7 +28,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/urlvalidate"
+	"github.com/pilot-protocol/common/urlvalidate"
 )
 
 // urlPath is the file where the last-set webhook URL is persisted so
diff --git a/zz_coverage_ceiling_test.go b/zz_coverage_ceiling_test.go
index 7c76d31..c9b2480 100644
--- a/zz_coverage_ceiling_test.go
+++ b/zz_coverage_ceiling_test.go
@@ -43,7 +43,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 // ---------------------------------------------------------------------------
diff --git a/zz_more_test.go b/zz_more_test.go
index 853dd5d..68e93d9 100644
--- a/zz_more_test.go
+++ b/zz_more_test.go
@@ -14,7 +14,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 func TestValidate_DelegatesToUrlvalidate(t *testing.T) {