diff --git a/gateway.go b/gateway.go
index a4b30d6..ab2bf47 100644
--- a/gateway.go
+++ b/gateway.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"sync"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 // DefaultPorts is the default set of ports the gateway proxies.
diff --git a/go.mod b/go.mod
index 0d4f1bd..a24cc9b 100644
--- a/go.mod
+++ b/go.mod
@@ -2,6 +2,8 @@ module github.com/pilot-protocol/gateway
 
 go 1.25.10
 
-require github.com/TeoSlayer/pilotprotocol v0.0.0
+require github.com/pilot-protocol/common v0.1.0
 
 replace github.com/TeoSlayer/pilotprotocol => ../web4
+
+replace github.com/pilot-protocol/common => ../common
diff --git a/mapping.go b/mapping.go
index 2dec0d4..004cba7 100644
--- a/mapping.go
+++ b/mapping.go
@@ -7,7 +7,7 @@ import (
 	"net"
 	"sync"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 // MappingTable maps local IPs to Pilot addresses and vice versa.
diff --git a/service.go b/service.go
index 277f182..2e7e8bf 100644
--- a/service.go
+++ b/service.go
@@ -8,7 +8,7 @@ package gateway
 import (
 	"context"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 // Service is the L11 plugin lifecycle adapter for the gateway. The
diff --git a/service_disabled.go b/service_disabled.go
index 0a39782..2feb299 100644
--- a/service_disabled.go
+++ b/service_disabled.go
@@ -13,7 +13,7 @@ package gateway
 import (
 	"context"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
+	"github.com/pilot-protocol/common/coreapi"
 )
 
 // Service is a no-op replacement for the (today-unused) plugin
diff --git a/zz_bridge_test.go b/zz_bridge_test.go
index 4abbad1..dcd76af 100644
--- a/zz_bridge_test.go
+++ b/zz_bridge_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 // pipeDialer returns one end of a net.Pipe per DialAddr call and stashes
diff --git a/zz_coverage_test.go b/zz_coverage_test.go
index c3f2382..4ae7454 100644
--- a/zz_coverage_test.go
+++ b/zz_coverage_test.go
@@ -15,8 +15,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/coreapi"
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/coreapi"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 // ---------------------------------------------------------------------------
diff --git a/zz_fuzz_gateway_test.go b/zz_fuzz_gateway_test.go
index 2318709..8c48e3b 100644
--- a/zz_fuzz_gateway_test.go
+++ b/zz_fuzz_gateway_test.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 	"github.com/pilot-protocol/gateway"
 )
 
diff --git a/zz_gateway_test.go b/zz_gateway_test.go
index b7e4d08..c0d9b65 100644
--- a/zz_gateway_test.go
+++ b/zz_gateway_test.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 	"github.com/pilot-protocol/gateway"
 )
 
diff --git a/zz_log_test.go b/zz_log_test.go
index 464ffd0..83dbc66 100644
--- a/zz_log_test.go
+++ b/zz_log_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 // TestListenPortWarnOnBindFailure regression-tests the log level for a
diff --git a/zz_mapping_test.go b/zz_mapping_test.go
index f61dbd4..1dfde84 100644
--- a/zz_mapping_test.go
+++ b/zz_mapping_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
+	"github.com/pilot-protocol/common/protocol"
 )
 
 func TestNewMappingTable_InvalidCIDR(t *testing.T) {