diff --git a/src/node/waku_node.py b/src/node/waku_node.py
index 85c2bf86..f39beb37 100644
--- a/src/node/waku_node.py
+++ b/src/node/waku_node.py
@@ -84,15 +84,15 @@ class WakuNode:
                 rln_opts = {
                     "eth-client-address": default_args["rln-creds"]["eth_client_address"],
                     "eth-account-private-key": default_args["rln-creds"]["eth_client_private_key"],
-                    "eth-contract-address": default_args["rln-creds"]["eth_contract_address"],
                     "cred-password": default_args["rln-creds"]["keystore_password"],
+                    "eth-contract-address": default_args["rln-creds"]["eth_contract_address"],
                 }
             elif self.is_nwaku():
                 rln_opts = {
                     "rln-relay-eth-client-address": default_args["rln-creds"]["eth_client_address"],
                     "rln-relay-eth-private-key": default_args["rln-creds"]["eth_client_private_key"],
-                    "rln-relay-eth-contract-address": default_args["rln-creds"]["eth_contract_address"],
                     "rln-relay-cred-password": default_args["rln-creds"]["keystore_password"],
+                    "rln-relay-eth-contract-address": default_args["rln-creds"]["eth_contract_address"],
                 }
                 if default_args["rln_register_only"]:
                     rln_opts["execute"] = None
diff --git a/src/steps/relay.py b/src/steps/relay.py
index 36dd02a4..2d83736b 100644
--- a/src/steps/relay.py
+++ b/src/steps/relay.py
@@ -50,7 +50,7 @@ class StepsRelay:
         self.node1 = WakuNode(NODE_1, f"node1_{request.cls.test_id}")
         rln_creds = {
             "eth_client_address": ETH_CLIENT_ADDRESS,
-            "eth_testnet_key": ETH_TESTNET_KEY,
+            "eth_client_private_key": ETH_TESTNET_KEY,
             "keystore_password": KEYSTORE_PASSWORD,
             "eth_contract_address": ETH_CONTRACT_ADDRESS,
         }