diff --git a/go.mod b/go.mod
index 25af1c4..9559a69 100644
--- a/go.mod
+++ b/go.mod
@@ -3,9 +3,10 @@ module github.com/pilot-protocol/policy
 go 1.25.10
 
 require (
-	github.com/TeoSlayer/pilotprotocol v0.0.0
 	github.com/expr-lang/expr v1.17.8
-	github.com/pilot-protocol/common v0.1.0
+	github.com/pilot-protocol/common v0.2.0
 )
 
 replace github.com/TeoSlayer/pilotprotocol => ../web4
+
+replace github.com/pilot-protocol/common => ../common
diff --git a/go.sum b/go.sum
index 9a3f2d6..5c0c3bd 100644
--- a/go.sum
+++ b/go.sum
@@ -1,4 +1,2 @@
 github.com/expr-lang/expr v1.17.8 h1:W1loDTT+0PQf5YteHSTpju2qfUfNoBt4yw9+wOEU9VM=
 github.com/expr-lang/expr v1.17.8/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
-github.com/pilot-protocol/common v0.1.0 h1:m8mZZATgeBiFoqhWXPnskw2u0lNkWxHp0IagZK35V1g=
-github.com/pilot-protocol/common v0.1.0/go.mod h1:4YZWHK5nhM+4RLmYTspLxxAFbyBII7yzQDAHq3Ul2ck=
diff --git a/policylang/policy.go b/policylang/policy.go
index c756ca5..41d8cde 100644
--- a/policylang/policy.go
+++ b/policylang/policy.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 // Version is the current policy document schema version.
diff --git a/service.go b/service.go
index c2c5ab0..c1c328a 100644
--- a/service.go
+++ b/service.go
@@ -16,7 +16,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 // Service is the L11 plugin adapter for the policy runtime. It owns
diff --git a/service_disabled.go b/service_disabled.go
index af93f6d..a9bf0d1 100644
--- a/service_disabled.go
+++ b/service_disabled.go
@@ -16,7 +16,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 // Service is a no-op replacement for the real plugin Service.
diff --git a/zz_coverage_holes_test.go b/zz_coverage_holes_test.go
index e5e3c85..dc987fc 100644
--- a/zz_coverage_holes_test.go
+++ b/zz_coverage_holes_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 // -----------------------------------------------------------------------------
diff --git a/zz_service_busreact_test.go b/zz_service_busreact_test.go
index ae7bd48..ed17a60 100644
--- a/zz_service_busreact_test.go
+++ b/zz_service_busreact_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 // stubBus is the minimal coreapi.EventBus used by the bus-reaction
diff --git a/zz_service_more_test.go b/zz_service_more_test.go
index 115e3b1..a61219b 100644
--- a/zz_service_more_test.go
+++ b/zz_service_more_test.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 const minimalPolicyJSON = `{