diff --git a/Makefile b/Makefile
index 97d96adbe..dfc0b6f43 100644
--- a/Makefile
+++ b/Makefile
@@ -178,10 +178,6 @@ chat2: | build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
 		$(ENV_SCRIPT) nim chat2 $(NIM_PARAMS) waku.nims
 
-rln-keystore-generator: | build deps librln
-	echo -e $(BUILD_MSG) "build/$@" && \
-	$(ENV_SCRIPT) nim rln_keystore_generator $(NIM_PARAMS) waku.nims
-
 rln-db-inspector: | build deps librln
 	echo -e $(BUILD_MSG) "build/$@" && \
 	$(ENV_SCRIPT) nim rln_db_inspector $(NIM_PARAMS) waku.nims
diff --git a/docs/tutorial/rln-keystore-generator.md b/docs/tutorial/rln-keystore-generator.md
index 869babf36..a9643ffb5 100644
--- a/docs/tutorial/rln-keystore-generator.md
+++ b/docs/tutorial/rln-keystore-generator.md
@@ -13,7 +13,7 @@ It is meant to be used to generate and persist a set of valid RLN credentials to
 1. First, we compile the binary
     
     ```bash
-    make -j12 rln-keystore-generator
+    make -j16 wakunode2
     ```
     This command will fetch the rln static library and link it automatically.
 
@@ -31,7 +31,7 @@ It is meant to be used to generate and persist a set of valid RLN credentials to
 3. Dry run the command to ensure better degree of execution 
 
     ```bash
-    ./build/rln_keystore_generator \
+    ./build/wakunode2 generateRlnKeystore \
     --rln-relay-eth-client-address:$RPC_URL \
     --rln-relay-eth-private-key:$PRIVATE_KEY \
     --rln-relay-eth-contract-address:$RLN_CONTRACT_ADDRESS \
@@ -43,7 +43,7 @@ It is meant to be used to generate and persist a set of valid RLN credentials to
 4. Run the keystore generator with the onchain registration
 
     ```bash
-    ./build/rln_keystore_generator \
+    ./build/wakunode2 generateRlnKeystore \
     --rln-relay-eth-client-address:$RPC_URL \
     --rln-relay-eth-private-key:$PRIVATE_KEY \
     --rln-relay-eth-contract-address:$RLN_CONTRACT_ADDRESS \
diff --git a/waku.nimble b/waku.nimble
index 528eef74e..f9337fceb 100644
--- a/waku.nimble
+++ b/waku.nimble
@@ -70,10 +70,6 @@ task networkmonitor, "Build network monitor tool":
   let name = "networkmonitor"
   buildBinary name, "apps/networkmonitor/"
 
-task rln_keystore_generator, "Build the rln keystore generator":
-  let name = "rln_keystore_generator"
-  buildBinary name, "tools/rln_keystore_generator/"
-
 task rln_db_inspector, "Build the rln db inspector":
   let name = "rln_db_inspector"
   buildBinary name, "tools/rln_db_inspector/"