diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index afc06105e2..688af42312 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -87,7 +87,6 @@ jobs:
     with:
       nim_wakunode_image: harbor.status.im/wakuorg/nwaku:latest
       test_type: nwaku-master
-      debug: waku*
 
   maybe-release:
     name: release
diff --git a/packages/enr/src/enr.spec.ts b/packages/enr/src/enr.spec.ts
index 1665e4015a..5aa2894a9c 100644
--- a/packages/enr/src/enr.spec.ts
+++ b/packages/enr/src/enr.spec.ts
@@ -396,19 +396,19 @@ describe("ENR", function () {
       expect(peerInfo.id.toString()).to.equal(peerId.toString());
       expect(peerInfo.multiaddrs.length).to.equal(5);
       expect(peerInfo.multiaddrs.map((ma) => ma.toString())).to.contain(
-        multiaddr(`/ip4/${ip4}/tcp/${tcp}`).toString()
+        multiaddr(`/ip4/${ip4}/tcp/${tcp}/p2p/${peerId}`).toString()
       );
       expect(peerInfo.multiaddrs.map((ma) => ma.toString())).to.contain(
-        multiaddr(`/ip6/${ip6}/tcp/${tcp}`).toString()
+        multiaddr(`/ip6/${ip6}/tcp/${tcp}/p2p/${peerId}`).toString()
       );
       expect(peerInfo.multiaddrs.map((ma) => ma.toString())).to.contain(
-        multiaddr(`/ip4/${ip4}/udp/${udp}`).toString()
+        multiaddr(`/ip4/${ip4}/udp/${udp}/p2p/${peerId}`).toString()
       );
       expect(peerInfo.multiaddrs.map((ma) => ma.toString())).to.contain(
-        multiaddr(`/ip6/${ip6}/udp/${udp}`).toString()
+        multiaddr(`/ip6/${ip6}/udp/${udp}/p2p/${peerId}`).toString()
       );
       expect(peerInfo.multiaddrs.map((ma) => ma.toString())).to.contain(
-        wsMultiaddr.toString()
+        `${wsMultiaddr.toString()}/p2p/${peerId}`
       );
     });
   });
diff --git a/packages/enr/src/enr.ts b/packages/enr/src/enr.ts
index 7dd9df0ee1..edc02f8a08 100644
--- a/packages/enr/src/enr.ts
+++ b/packages/enr/src/enr.ts
@@ -107,7 +107,12 @@ export class ENR extends RawEnr implements IEnr {
 
     const _multiaddrs = this.multiaddrs ?? [];
 
-    return multiaddrs.concat(_multiaddrs);
+    return multiaddrs.concat(_multiaddrs).map((ma) => {
+      if (this.peerId) {
+        return ma.encapsulate(`/p2p/${this.peerId.toString()}`);
+      }
+      return ma;
+    });
   }
 
   get peerInfo(): PeerInfo | undefined {
diff --git a/packages/tests/src/lib/index.ts b/packages/tests/src/lib/index.ts
index 550b77f88b..631a56750a 100644
--- a/packages/tests/src/lib/index.ts
+++ b/packages/tests/src/lib/index.ts
@@ -84,7 +84,7 @@ export class ServiceNodesFleet {
   get type(): "go-waku" | "nwaku" {
     const nodeType = new Set(
       this.nodes.map((node) => {
-        return node.type();
+        return node.type;
       })
     );
     if (nodeType.size > 1) {
diff --git a/packages/tests/src/lib/service_node.ts b/packages/tests/src/lib/service_node.ts
index 8485f842c2..cc500deac2 100644
--- a/packages/tests/src/lib/service_node.ts
+++ b/packages/tests/src/lib/service_node.ts
@@ -79,7 +79,7 @@ export class ServiceNode {
     this.logPath = `${LOG_DIR}/wakunode_${logName}.log`;
   }
 
-  type(): "go-waku" | "nwaku" {
+  get type(): "go-waku" | "nwaku" {
     return isGoWaku ? "go-waku" : "nwaku";
   }
 
diff --git a/packages/tests/tests/filter/single_node/push.node.spec.ts b/packages/tests/tests/filter/single_node/push.node.spec.ts
index 383f9e3955..afe76d8e90 100644
--- a/packages/tests/tests/filter/single_node/push.node.spec.ts
+++ b/packages/tests/tests/filter/single_node/push.node.spec.ts
@@ -167,7 +167,7 @@ describe("Waku Filter V2: FilterPush", function () {
     ]);
 
     // For go-waku the message is received (it is possible to send a message with no payload)
-    if (nwaku.type() == "go-waku") {
+    if (nwaku.type == "go-waku") {
       expect(await messageCollector.waitForMessages(1)).to.eq(true);
     } else {
       expect(await messageCollector.waitForMessages(1)).to.eq(false);
diff --git a/packages/tests/tests/light-push/single_node/index.node.spec.ts b/packages/tests/tests/light-push/single_node/index.node.spec.ts
index e36b98aed1..ba317fb1d7 100644
--- a/packages/tests/tests/light-push/single_node/index.node.spec.ts
+++ b/packages/tests/tests/light-push/single_node/index.node.spec.ts
@@ -155,7 +155,7 @@ describe("Waku Light Push: Single Node", function () {
       messagePayload
     );
 
-    if (nwaku.type() == "go-waku") {
+    if (nwaku.type == "go-waku") {
       expect(pushResponse.recipients.length).to.eq(1);
       expect(await messageCollector.waitForMessages(1)).to.eq(true);
       messageCollector.verifyReceivedMessage(0, {
diff --git a/packages/tests/tests/store/cursor.node.spec.ts b/packages/tests/tests/store/cursor.node.spec.ts
index f54b75e00a..1b3bffd6f5 100644
--- a/packages/tests/tests/store/cursor.node.spec.ts
+++ b/packages/tests/tests/store/cursor.node.spec.ts
@@ -162,7 +162,7 @@ describe("Waku Store, cursor", function () {
       expect(messagesAfterCursor.length).to.eql(0);
     } catch (error) {
       if (
-        nwaku.type() === "go-waku" &&
+        nwaku.type === "go-waku" &&
         typeof error === "string" &&
         error.includes("History response contains an Error: INVALID_CURSOR")
       ) {
diff --git a/packages/tests/tests/store/page_size.node.spec.ts b/packages/tests/tests/store/page_size.node.spec.ts
index a7be22dccb..85273f97f9 100644
--- a/packages/tests/tests/store/page_size.node.spec.ts
+++ b/packages/tests/tests/store/page_size.node.spec.ts
@@ -54,7 +54,7 @@ describe("Waku Store, page size", function () {
       if (pageSize === 0) {
         effectivePageSize = 20;
       } else if (pageSize > 100) {
-        if (nwaku.type() == "go-waku") {
+        if (nwaku.type == "go-waku") {
           effectivePageSize = 20;
         } else {
           effectivePageSize = 100;