diff --git a/package.json b/package.json
index c530a01..a11b1b6 100644
--- a/package.json
+++ b/package.json
@@ -138,11 +138,16 @@
     "release": "aegir release"
   },
   "dependencies": {
-    "@libp2p/interfaces": "^2.0.0",
-    "@libp2p/logger": "^1.1.0",
+    "@libp2p/components": "^1.0.0",
+    "@libp2p/interface-peer-id": "^1.0.2",
+    "@libp2p/interface-peer-info": "^1.0.1",
+    "@libp2p/interface-peer-store": "^1.0.0",
+    "@libp2p/interface-record": "^1.0.1",
+    "@libp2p/interfaces": "^3.0.2",
+    "@libp2p/logger": "^1.1.6",
     "@libp2p/peer-id": "^1.1.0",
-    "@libp2p/peer-record": "^1.0.0",
-    "@multiformats/multiaddr": "^10.1.5",
+    "@libp2p/peer-record": "^2.0.0",
+    "@multiformats/multiaddr": "^10.2.0",
     "err-code": "^3.0.1",
     "interface-datastore": "^6.1.0",
     "it-all": "^1.0.6",
diff --git a/src/address-book.ts b/src/address-book.ts
index 34df045..a3df6e5 100644
--- a/src/address-book.ts
+++ b/src/address-book.ts
@@ -10,11 +10,11 @@ import map from 'it-map'
 import each from 'it-foreach'
 import { peerIdFromPeerId } from '@libp2p/peer-id'
 import { CustomEvent } from '@libp2p/interfaces/events'
-import type { AddressFilter, Peer, PeerMultiaddrsChangeData, PeerStore } from '@libp2p/interfaces/peer-store'
+import type { AddressFilter, Peer, PeerMultiaddrsChangeData, PeerStore } from '@libp2p/interface-peer-store'
 import type { Store } from './store.js'
-import type { Envelope } from '@libp2p/interfaces/record'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
-import type { PeerInfo } from '@libp2p/interfaces/peer-info'
+import type { Envelope } from '@libp2p/interface-record'
+import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerInfo } from '@libp2p/interface-peer-info'
 
 const log = logger('libp2p:peer-store:address-book')
 const EVENT_NAME = 'change:multiaddrs'
diff --git a/src/index.ts b/src/index.ts
index 8ec502f..35a4a02 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -5,9 +5,9 @@ import { PeerStoreKeyBook } from './key-book.js'
 import { PeerStoreMetadataBook } from './metadata-book.js'
 import { PeerStoreProtoBook } from './proto-book.js'
 import { PersistentStore, Store } from './store.js'
-import type { PeerStore, AddressBook, KeyBook, MetadataBook, ProtoBook, PeerStoreEvents, PeerStoreInit, Peer } from '@libp2p/interfaces/peer-store'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
-import { Components, Initializable } from '@libp2p/interfaces/components'
+import type { PeerStore, AddressBook, KeyBook, MetadataBook, ProtoBook, PeerStoreEvents, PeerStoreInit, Peer } from '@libp2p/interface-peer-store'
+import type { PeerId } from '@libp2p/interface-peer-id'
+import { Components, Initializable } from '@libp2p/components'
 
 const log = logger('libp2p:peer-store')
 
diff --git a/src/key-book.ts b/src/key-book.ts
index 04f71ab..ff06028 100644
--- a/src/key-book.ts
+++ b/src/key-book.ts
@@ -5,8 +5,8 @@ import { peerIdFromPeerId } from '@libp2p/peer-id'
 import { equals as uint8arrayEquals } from 'uint8arrays/equals'
 import { CustomEvent } from '@libp2p/interfaces/events'
 import type { Store } from './store.js'
-import type { PeerStore, KeyBook, PeerPublicKeyChangeData, Peer } from '@libp2p/interfaces/peer-store'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerStore, KeyBook, PeerPublicKeyChangeData, Peer } from '@libp2p/interface-peer-store'
+import type { PeerId } from '@libp2p/interface-peer-id'
 
 const log = logger('libp2p:peer-store:key-book')
 
diff --git a/src/metadata-book.ts b/src/metadata-book.ts
index 7282027..84fc535 100644
--- a/src/metadata-book.ts
+++ b/src/metadata-book.ts
@@ -5,8 +5,8 @@ import { peerIdFromPeerId } from '@libp2p/peer-id'
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
 import { CustomEvent } from '@libp2p/interfaces/events'
 import type { Store } from './store.js'
-import type { PeerStore, MetadataBook, PeerMetadataChangeData, Peer } from '@libp2p/interfaces/peer-store'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerStore, MetadataBook, PeerMetadataChangeData, Peer } from '@libp2p/interface-peer-store'
+import type { PeerId } from '@libp2p/interface-peer-id'
 
 const log = logger('libp2p:peer-store:metadata-book')
 
diff --git a/src/proto-book.ts b/src/proto-book.ts
index 5cf288a..067758c 100644
--- a/src/proto-book.ts
+++ b/src/proto-book.ts
@@ -4,8 +4,8 @@ import { codes } from './errors.js'
 import { peerIdFromPeerId } from '@libp2p/peer-id'
 import { CustomEvent } from '@libp2p/interfaces/events'
 import type { Store } from './store.js'
-import type { Peer, PeerProtocolsChangeData, PeerStore, ProtoBook } from '@libp2p/interfaces/peer-store'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { Peer, PeerProtocolsChangeData, PeerStore, ProtoBook } from '@libp2p/interface-peer-store'
+import type { PeerId } from '@libp2p/interface-peer-id'
 
 const log = logger('libp2p:peer-store:proto-book')
 
diff --git a/src/store.ts b/src/store.ts
index c511a9c..aa13621 100644
--- a/src/store.ts
+++ b/src/store.ts
@@ -8,9 +8,9 @@ import { Multiaddr } from '@multiformats/multiaddr'
 import { Metadata, Peer as PeerPB } from './pb/peer.js'
 import mortice from 'mortice'
 import { equals as uint8arrayEquals } from 'uint8arrays/equals'
-import type { Peer } from '@libp2p/interfaces/peer-store'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
-import { Components } from '@libp2p/interfaces/components'
+import type { Peer } from '@libp2p/interface-peer-store'
+import type { PeerId } from '@libp2p/interface-peer-id'
+import { Components } from '@libp2p/components'
 
 const log = logger('libp2p:peer-store:store')
 
diff --git a/test/address-book.spec.ts b/test/address-book.spec.ts
index f170bc0..cc785ac 100644
--- a/test/address-book.spec.ts
+++ b/test/address-book.spec.ts
@@ -4,16 +4,16 @@
 import { expect } from 'aegir/chai'
 import { Multiaddr } from '@multiformats/multiaddr'
 import { arrayEquals } from '@libp2p/utils/array-equals'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { PeerId } from '@libp2p/interface-peer-id'
 import pDefer from 'p-defer'
 import { MemoryDatastore } from 'datastore-core/memory'
 import { PersistentPeerStore } from '../src/index.js'
 import { RecordEnvelope, PeerRecord } from '@libp2p/peer-record'
 import { codes } from '../src/errors.js'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
-import type { AddressBook } from '@libp2p/interfaces/peer-store'
+import type { AddressBook } from '@libp2p/interface-peer-store'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { Components } from '@libp2p/interfaces/components'
+import { Components } from '@libp2p/components'
 
 const addr1 = new Multiaddr('/ip4/127.0.0.1/tcp/8000')
 const addr2 = new Multiaddr('/ip4/20.0.0.1/tcp/8001')
diff --git a/test/key-book.spec.ts b/test/key-book.spec.ts
index 3bde0f3..a24c245 100644
--- a/test/key-book.spec.ts
+++ b/test/key-book.spec.ts
@@ -7,9 +7,9 @@ import { PersistentPeerStore } from '../src/index.js'
 import pDefer from 'p-defer'
 import { codes } from '../src/errors.js'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
-import type { KeyBook } from '@libp2p/interfaces/peer-store'
-import { Components } from '@libp2p/interfaces/components'
+import type { PeerId } from '@libp2p/interface-peer-id'
+import type { KeyBook } from '@libp2p/interface-peer-store'
+import { Components } from '@libp2p/components'
 
 describe('keyBook', () => {
   let peerId: PeerId
diff --git a/test/metadata-book.spec.ts b/test/metadata-book.spec.ts
index cf76029..7cec0ed 100644
--- a/test/metadata-book.spec.ts
+++ b/test/metadata-book.spec.ts
@@ -8,9 +8,9 @@ import pDefer from 'p-defer'
 import { PersistentPeerStore } from '../src/index.js'
 import { codes } from '../src/errors.js'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
-import type { MetadataBook } from '@libp2p/interfaces/peer-store'
-import { Components } from '@libp2p/interfaces/components'
+import type { PeerId } from '@libp2p/interface-peer-id'
+import type { MetadataBook } from '@libp2p/interface-peer-store'
+import { Components } from '@libp2p/components'
 
 describe('metadataBook', () => {
   let peerId: PeerId
diff --git a/test/peer-store.spec.ts b/test/peer-store.spec.ts
index 144e998..0e9d3d8 100644
--- a/test/peer-store.spec.ts
+++ b/test/peer-store.spec.ts
@@ -6,8 +6,8 @@ import { Multiaddr } from '@multiformats/multiaddr'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { MemoryDatastore } from 'datastore-core/memory'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
-import { Components } from '@libp2p/interfaces/components'
+import type { PeerId } from '@libp2p/interface-peer-id'
+import { Components } from '@libp2p/components'
 
 const addr1 = new Multiaddr('/ip4/127.0.0.1/tcp/8000')
 const addr2 = new Multiaddr('/ip4/127.0.0.1/tcp/8001')
diff --git a/test/proto-book.spec.ts b/test/proto-book.spec.ts
index 7177cb2..bf11466 100644
--- a/test/proto-book.spec.ts
+++ b/test/proto-book.spec.ts
@@ -8,9 +8,9 @@ import pWaitFor from 'p-wait-for'
 import { PersistentPeerStore } from '../src/index.js'
 import { codes } from '../src/errors.js'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
-import type { ProtoBook } from '@libp2p/interfaces/peer-store'
-import { Components } from '@libp2p/interfaces/components'
+import type { PeerId } from '@libp2p/interface-peer-id'
+import type { ProtoBook } from '@libp2p/interface-peer-store'
+import { Components } from '@libp2p/components'
 
 const arraysAreEqual = (a: string[], b: string[]) => {
   if (a.length !== b.length) {