diff --git a/src/node/docker_mananger.py b/src/node/docker_mananger.py
index 0e00113c..475110ec 100644
--- a/src/node/docker_mananger.py
+++ b/src/node/docker_mananger.py
@@ -36,8 +36,11 @@ class DockerManager:
         for key, value in args.items():
             if isinstance(value, list):  # Check if value is a list
                 cli_args.extend([f"--{key}={item}" for item in value])  # Add a command for each item in the list
+            elif value is None:
+                cli_args.append(f"{key}")  # Add simple command as it is passed in the key
             else:
                 cli_args.append(f"--{key}={value}")  # Add a single command
+
         port_bindings = {f"{port}/tcp": ("", port) for port in ports}
         logger.debug(f"Starting container with image {image_name}")
         logger.debug(f"Using args {cli_args}")
diff --git a/src/node/waku_node.py b/src/node/waku_node.py
index 375ae2d9..71469517 100644
--- a/src/node/waku_node.py
+++ b/src/node/waku_node.py
@@ -87,6 +87,9 @@ class WakuNode:
                     "cred-password": default_args["rln-creds"]["keystore_password"],
                     "eth-contract-address": default_args["rln-creds"]["eth_contract_address"],
                 }
+                if default_args["rln-register-only"]:
+                    rln_opts["generate-rln-credentials"] = None
+
             elif self.is_nwaku():
                 rln_opts = {
                     "rln-relay-eth-client-address": default_args["rln-creds"]["eth_client_address"],
@@ -95,7 +98,8 @@ class WakuNode:
                     "rln-relay-eth-contract-address": default_args["rln-creds"]["eth_contract_address"],
                 }
                 if default_args["rln-register-only"]:
-                    rln_opts["execute"] = None
+                    rln_opts["--execute"] = None
+                    rln_opts["generateRlnKeystore"] = None
 
             rln_opts["rln-relay-cred-path"] = "/keystore/keystore.json"
             del default_args["rln-creds"]