diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 4fd46f9..1f2dcc1 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -28,8 +28,8 @@ jobs:
           version: v1.50.1
           args: --timeout=10m
 
-  go-tests-on-linux:
-    runs-on: ubuntu-latest
+  go-tests:
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         golang: ['1.18', '1.19']
diff --git a/client.go b/client.go
index 03f5efd..c47c66f 100644
--- a/client.go
+++ b/client.go
@@ -11,7 +11,7 @@ import (
 	inet "github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
 
-	pb "github.com/libp2p/go-libp2p-rendezvous/pb"
+	pb "github.com/berty/go-libp2p-rendezvous/pb"
 )
 
 var (
diff --git a/client_test.go b/client_test.go
index 24ccc5a..92840d8 100644
--- a/client_test.go
+++ b/client_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
 
-	"github.com/libp2p/go-libp2p-rendezvous/test_utils"
+	"github.com/berty/go-libp2p-rendezvous/test_utils"
 	"github.com/libp2p/go-libp2p/core/host"
 )
 
diff --git a/db/sqlcipher/db.go b/db/sqlcipher/db.go
index 08aba29..04f6739 100644
--- a/db/sqlcipher/db.go
+++ b/db/sqlcipher/db.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"time"
 
-	dbi "github.com/libp2p/go-libp2p-rendezvous/db"
+	dbi "github.com/berty/go-libp2p-rendezvous/db"
 
 	_ "github.com/mutecomm/go-sqlcipher/v4"
 
diff --git a/db/sqlite/db.go b/db/sqlite/db.go
index fb1cf25..5e3a454 100644
--- a/db/sqlite/db.go
+++ b/db/sqlite/db.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"time"
 
-	dbi "github.com/libp2p/go-libp2p-rendezvous/db"
+	dbi "github.com/berty/go-libp2p-rendezvous/db"
 
 	_ "github.com/mattn/go-sqlite3"
 
diff --git a/go.mod b/go.mod
index f2a40be..f285577 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/libp2p/go-libp2p-rendezvous
+module github.com/berty/go-libp2p-rendezvous
 
 go 1.18
 
diff --git a/proto.go b/proto.go
index e62f69c..c8b5b78 100644
--- a/proto.go
+++ b/proto.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	db "github.com/libp2p/go-libp2p-rendezvous/db"
-	pb "github.com/libp2p/go-libp2p-rendezvous/pb"
+	db "github.com/berty/go-libp2p-rendezvous/db"
+	pb "github.com/berty/go-libp2p-rendezvous/pb"
 
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/libp2p/go-libp2p/core/peer"
diff --git a/svc.go b/svc.go
index 22ead3e..453479d 100644
--- a/svc.go
+++ b/svc.go
@@ -8,8 +8,8 @@ import (
 	inet "github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
 
-	db "github.com/libp2p/go-libp2p-rendezvous/db"
-	pb "github.com/libp2p/go-libp2p-rendezvous/pb"
+	db "github.com/berty/go-libp2p-rendezvous/db"
+	pb "github.com/berty/go-libp2p-rendezvous/pb"
 )
 
 const (
diff --git a/svc_test.go b/svc_test.go
index a722e7f..cfee969 100644
--- a/svc_test.go
+++ b/svc_test.go
@@ -14,9 +14,9 @@ import (
 	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
 	"github.com/stretchr/testify/require"
 
-	db "github.com/libp2p/go-libp2p-rendezvous/db/sqlite"
-	pb "github.com/libp2p/go-libp2p-rendezvous/pb"
-	"github.com/libp2p/go-libp2p-rendezvous/test_utils"
+	db "github.com/berty/go-libp2p-rendezvous/db/sqlite"
+	pb "github.com/berty/go-libp2p-rendezvous/pb"
+	"github.com/berty/go-libp2p-rendezvous/test_utils"
 )
 
 func getRendezvousHosts(t *testing.T, ctx context.Context, m mocknet.Mocknet, n int) []host.Host {
diff --git a/sync_inmem_client.go b/sync_inmem_client.go
index d1de253..d910ea5 100644
--- a/sync_inmem_client.go
+++ b/sync_inmem_client.go
@@ -13,7 +13,7 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/multiformats/go-multiaddr"
 
-	pb "github.com/libp2p/go-libp2p-rendezvous/pb"
+	pb "github.com/berty/go-libp2p-rendezvous/pb"
 )
 
 type client struct {
diff --git a/sync_inmem_provider.go b/sync_inmem_provider.go
index 88926d4..970ed1d 100644
--- a/sync_inmem_provider.go
+++ b/sync_inmem_provider.go
@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
+	pb "github.com/berty/go-libp2p-rendezvous/pb"
 	ggio "github.com/gogo/protobuf/io"
-	pb "github.com/libp2p/go-libp2p-rendezvous/pb"
 	"github.com/libp2p/go-libp2p/core/host"
 	inet "github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
diff --git a/sync_inmem_test.go b/sync_inmem_test.go
index faac6d9..583972d 100644
--- a/sync_inmem_test.go
+++ b/sync_inmem_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	rendezvous "github.com/libp2p/go-libp2p-rendezvous"
-	db "github.com/libp2p/go-libp2p-rendezvous/db/sqlite"
-	"github.com/libp2p/go-libp2p-rendezvous/test_utils"
+	rendezvous "github.com/berty/go-libp2p-rendezvous"
+	db "github.com/berty/go-libp2p-rendezvous/db/sqlite"
+	"github.com/berty/go-libp2p-rendezvous/test_utils"
 	"github.com/libp2p/go-libp2p/core/host"
 	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
 )