diff --git a/src/node/waku_node.py b/src/node/waku_node.py
index 043ff1fd..6a2510c8 100644
--- a/src/node/waku_node.py
+++ b/src/node/waku_node.py
@@ -80,12 +80,12 @@ class WakuNode:
         rln_args = {}
 
         if len(default_args["rln-creds"]) == 4:
-            self._volumes.extend(["/rln_tree:/etc/rln_tree", "/keystore:/keystore"])
-
             if self.is_gowaku():
                 if default_args["rln-register-only"]:
                     rln_args["generate-rln-credentials"] = None
 
+                self._volumes.extend(["/go-waku_rln_tree:/etc/rln_tree", "/go-waku_keystore:/keystore"])
+
                 rln_args.update(
                     {
                         "eth-client-address": default_args["rln-creds"]["eth_client_address"],
@@ -101,6 +101,8 @@ class WakuNode:
                     rln_args["generateRlnKeystore"] = None
                     rln_args["--execute"] = None
 
+                self._volumes.extend(["/nwaku_rln_tree:/etc/rln_tree", "/nwaku_keystore:/keystore"])
+
                 rln_args.update(
                     {
                         "rln-relay-eth-client-address": default_args["rln-creds"]["eth_client_address"],