diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64eb988f6d..b3c4161be2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  NIM_WAKU_VERSION: "v0.9"
+  NWAKU_VERSION: "v0.11"
   NODE_JS: "16"
 
 jobs:
@@ -69,18 +69,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Get nim-waku
+      - name: Get nwaku
         shell: bash
         run: |
-          mkdir -p nim-waku/build
-          cd nim-waku
-          wget "https://github.com/status-im/nim-waku/releases/download/${NIM_WAKU_VERSION}/nim-waku-ubuntu-latest.tar.gz"
+          mkdir -p nwaku/build
+          cd nwaku
+          wget "https://github.com/status-im/nwaku/releases/download/${NWAKU_VERSION}/nim-waku-ubuntu-latest.tar.gz"
           tar xavf nim-waku-ubuntu-latest.tar.gz
       - name: Ensure wakunode2 is ready
         shell: bash
         run: |
           uname -a
-          cd nim-waku/build
+          cd nwaku/build
           ./wakunode2 --help
       - uses: actions/setup-node@v3
         with:
@@ -88,13 +88,13 @@ jobs:
       - uses: bahmutov/npm-install@v1
       - run: npm run test:node
         env:
-          DEBUG: "waku:nim-waku*,waku:test*"
+          DEBUG: "waku:nwaku*,waku:test*"
 
       - name: Upload logs on failure
         uses: actions/upload-artifact@v2
         if: failure()
         with:
-          name: nim-waku-logs
+          name: nwaku-logs
           path: log/
 
   release_next:
diff --git a/.gitmodules b/.gitmodules
index 0a62469db8..05ef036178 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "nim-waku"]
-	path = nim-waku
+	path = nwaku
 	url = https://github.com/status-im/nim-waku.git
diff --git a/nim-waku b/nim-waku
deleted file mode 160000
index 97f23cd5fa..0000000000
--- a/nim-waku
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 97f23cd5fa89220912819fc5868c5162d222e72e
diff --git a/nwaku b/nwaku
new file mode 160000
index 0000000000..fec1397483
--- /dev/null
+++ b/nwaku
@@ -0,0 +1 @@
+Subproject commit fec13974836149c2b81cab8d4178dee7bfc56db1
diff --git a/package.json b/package.json
index 293cf8f774..ba8cbbeb45 100644
--- a/package.json
+++ b/package.json
@@ -54,11 +54,11 @@
     "fix:prettier": "prettier \"src/**/*.ts\" \"./*.json\" \"*.*js\" \".github/**/*.yml\" --write",
     "fix:lint": "eslint src --ext .ts --ext .cjs --fix",
     "pretest": "run-s pretest:*",
-    "pretest:1-init-git-submodules": "[ -f './nim-waku/build/wakunode2' ] || git submodule update --init --recursive",
-    "pretest:2-build-nim-waku": "[ -f './nim-waku/build/wakunode2' ] || run-s nim-waku:build",
+    "pretest:1-init-git-submodules": "[ -f './nwaku/build/wakunode2' ] || git submodule update --init --recursive",
+    "pretest:2-build-nwaku": "[ -f './nwaku/build/wakunode2' ] || run-s nwaku:build",
     "examples:pretest": "for d in examples/*/; do (cd $d && npm ci); done",
-    "nim-waku:build": "(cd nim-waku; NIMFLAGS=\"-d:chronicles_colors=off -d:chronicles_sinks=textlines -d:chronicles_log_level=TRACE\" make -j$(nproc --all 2>/dev/null || echo 2) wakunode2)",
-    "nim-waku:force-build": "(cd nim-waku && rm -rf ./build/ ./vendor && make -j$(nproc --all 2>/dev/null || echo 2) update) && run-s nim-waku:build",
+    "nwaku:build": "(cd nwaku; NIMFLAGS=\"-d:chronicles_colors=off -d:chronicles_sinks=textlines -d:chronicles_log_level=TRACE\" make -j$(nproc --all 2>/dev/null || echo 2) wakunode2)",
+    "nwaku:force-build": "(cd nwaku && rm -rf ./build/ ./vendor && make -j$(nproc --all 2>/dev/null || echo 2) update) && run-s nwaku:build",
     "test": "run-s test:*",
     "test:lint": "eslint src --ext .ts",
     "test:prettier": "prettier \"src/**/*.ts\" \"./*.json\" \"*.*js\" \".github/**/*.yml\" --list-different",
diff --git a/src/test_utils/nwaku.ts b/src/test_utils/nwaku.ts
index 7b6c7acc35..73bc34e9a8 100644
--- a/src/test_utils/nwaku.ts
+++ b/src/test_utils/nwaku.ts
@@ -22,7 +22,7 @@ import waitForLine from "./log_file";
 
 const dbg = debug("waku:nwaku");
 
-const NIM_WAKU_DIR = appRoot + "/nim-waku";
+const NIM_WAKU_DIR = appRoot + "/nwaku";
 const NIM_WAKU_BIN = NIM_WAKU_DIR + "/build/wakunode2";
 
 const LOG_DIR = "./log";