diff --git a/package-lock.json b/package-lock.json
index c18c604880..e2e1f2475b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18461,18 +18461,20 @@
       }
     },
     "node_modules/libp2p": {
-      "version": "2.0.2",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/libp2p/-/libp2p-2.1.8.tgz",
+      "integrity": "sha512-OzUUgAs6983lP2FDqc3oABeUAyvd3iJ/BlYjwmjddpUwQO6gemuJFpWujagj2Vtj+oPosGrrPGWqv+WPnTkHUA==",
       "license": "Apache-2.0 OR MIT",
       "dependencies": {
-        "@libp2p/crypto": "^5.0.1",
-        "@libp2p/interface": "^2.0.1",
-        "@libp2p/interface-internal": "^2.0.1",
-        "@libp2p/logger": "^5.0.1",
-        "@libp2p/multistream-select": "^6.0.1",
-        "@libp2p/peer-collections": "^6.0.1",
-        "@libp2p/peer-id": "^5.0.1",
-        "@libp2p/peer-store": "^11.0.1",
-        "@libp2p/utils": "^6.0.1",
+        "@libp2p/crypto": "^5.0.5",
+        "@libp2p/interface": "^2.1.3",
+        "@libp2p/interface-internal": "^2.0.8",
+        "@libp2p/logger": "^5.1.1",
+        "@libp2p/multistream-select": "^6.0.6",
+        "@libp2p/peer-collections": "^6.0.8",
+        "@libp2p/peer-id": "^5.0.5",
+        "@libp2p/peer-store": "^11.0.8",
+        "@libp2p/utils": "^6.1.1",
         "@multiformats/dns": "^1.0.6",
         "@multiformats/multiaddr": "^12.2.3",
         "@multiformats/multiaddr-matcher": "^1.2.1",
@@ -33686,7 +33688,7 @@
       },
       "peerDependencies": {
         "@multiformats/multiaddr": "^12.0.0",
-        "libp2p": "2.0.2"
+        "libp2p": "2.1.8"
       },
       "peerDependenciesMeta": {
         "@multiformats/multiaddr": {
@@ -33818,7 +33820,7 @@
         "@chainsafe/libp2p-gossipsub": "^14.1.0",
         "@multiformats/multiaddr": "^12.0.0",
         "cspell": "^8.6.1",
-        "libp2p": "2.0.2",
+        "libp2p": "2.1.8",
         "npm-run-all": "^4.1.5"
       },
       "engines": {
@@ -33986,7 +33988,7 @@
         "@waku/proto": "^0.0.8",
         "@waku/utils": "0.0.20",
         "async-mutex": "^0.5.0",
-        "libp2p": "2.0.2"
+        "libp2p": "2.1.8"
       },
       "devDependencies": {
         "@rollup/plugin-commonjs": "^25.0.7",
@@ -34142,7 +34144,7 @@
         "datastore-core": "^10.0.2",
         "debug": "^4.3.4",
         "interface-datastore": "^8.2.10",
-        "libp2p": "2.0.2",
+        "libp2p": "2.1.8",
         "mocha": "^10.3.0",
         "mocha-multi-reporters": "^1.5.1",
         "npm-run-all": "^4.1.5"
diff --git a/packages/core/package.json b/packages/core/package.json
index fba0e7b17a..d675056e6e 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -104,7 +104,7 @@
   },
   "peerDependencies": {
     "@multiformats/multiaddr": "^12.0.0",
-    "libp2p": "2.0.2"
+    "libp2p": "2.1.8"
   },
   "peerDependenciesMeta": {
     "@multiformats/multiaddr": {
diff --git a/packages/discovery/src/local-peer-cache/index.spec.ts b/packages/discovery/src/local-peer-cache/index.spec.ts
index 03f84b7217..798c6c4c23 100644
--- a/packages/discovery/src/local-peer-cache/index.spec.ts
+++ b/packages/discovery/src/local-peer-cache/index.spec.ts
@@ -4,7 +4,7 @@ import { TypedEventEmitter } from "@libp2p/interface";
 import tests from "@libp2p/interface-compliance-tests/peer-discovery";
 import { prefixLogger } from "@libp2p/logger";
 import { peerIdFromPrivateKey, peerIdFromString } from "@libp2p/peer-id";
-import { PersistentPeerStore } from "@libp2p/peer-store";
+import { persistentPeerStore } from "@libp2p/peer-store";
 import { multiaddr } from "@multiformats/multiaddr";
 import { Libp2pComponents } from "@waku/interfaces";
 import { LocalStoragePeerInfo } from "@waku/interfaces";
@@ -53,7 +53,7 @@ describe("Local Storage Discovery", function () {
   beforeEach(async function () {
     localStorage.clear();
     components = {
-      peerStore: new PersistentPeerStore({
+      peerStore: persistentPeerStore({
         events: new TypedEventEmitter(),
         peerId: await generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
         datastore: new MemoryDatastore(),
diff --git a/packages/interfaces/package.json b/packages/interfaces/package.json
index 9f7df6b8b3..a2238deb12 100644
--- a/packages/interfaces/package.json
+++ b/packages/interfaces/package.json
@@ -51,7 +51,7 @@
     "@multiformats/multiaddr": "^12.0.0",
     "cspell": "^8.6.1",
     "npm-run-all": "^4.1.5",
-    "libp2p": "2.0.2"
+    "libp2p": "2.1.8"
   },
   "files": [
     "dist",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index c17b1be916..bdf8fca091 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -74,7 +74,7 @@
     "@waku/utils": "0.0.20",
     "@waku/message-hash": "0.1.16",
     "async-mutex": "^0.5.0",
-    "libp2p": "2.0.2"
+    "libp2p": "2.1.8"
   },
   "devDependencies": {
     "@types/chai": "^4.3.11",
diff --git a/packages/tests/package.json b/packages/tests/package.json
index 1cd7f6032e..c1e3385009 100644
--- a/packages/tests/package.json
+++ b/packages/tests/package.json
@@ -86,7 +86,7 @@
     "datastore-core": "^10.0.2",
     "debug": "^4.3.4",
     "interface-datastore": "^8.2.10",
-    "libp2p": "2.0.2",
+    "libp2p": "2.1.8",
     "mocha": "^10.3.0",
     "mocha-multi-reporters": "^1.5.1",
     "npm-run-all": "^4.1.5"
diff --git a/packages/tests/tests/dns-peer-discovery.spec.ts b/packages/tests/tests/dns-peer-discovery.spec.ts
index 4a9408624d..ad3ab013db 100644
--- a/packages/tests/tests/dns-peer-discovery.spec.ts
+++ b/packages/tests/tests/dns-peer-discovery.spec.ts
@@ -3,7 +3,7 @@ import { TypedEventEmitter } from "@libp2p/interface";
 import tests from "@libp2p/interface-compliance-tests/peer-discovery";
 import { prefixLogger } from "@libp2p/logger";
 import { peerIdFromPrivateKey } from "@libp2p/peer-id";
-import { PersistentPeerStore } from "@libp2p/peer-store";
+import { persistentPeerStore } from "@libp2p/peer-store";
 import {
   DnsNodeDiscovery,
   enrTree,
@@ -27,7 +27,7 @@ describe("DNS Discovery: Compliance Test", function () {
       const peerId = peerIdFromPrivateKey(privateKey);
       // create libp2p mock peerStore
       const components = {
-        peerStore: new PersistentPeerStore({
+        peerStore: persistentPeerStore({
           events: new TypedEventEmitter(),
           peerId,
           datastore: new MemoryDatastore(),