diff --git a/src/env_vars.py b/src/env_vars.py
index a5881856..6693029f 100644
--- a/src/env_vars.py
+++ b/src/env_vars.py
@@ -14,8 +14,8 @@ def get_env_var(var_name, default=None):
 
 
 # Configuration constants. Need to be upercase to appear in reports
-DEFAULT_NWAKU = "harbor.status.im/wakuorg/nwaku:latest"
-DEFAULT_GOWAKU = "harbor.status.im/wakuorg/go-waku:latest"
+DEFAULT_NWAKU = "wakuorg/nwaku:latest"
+DEFAULT_GOWAKU = "wakuorg/go-waku:latest"
 NODE_1 = get_env_var("NODE_1", DEFAULT_GOWAKU)
 NODE_2 = get_env_var("NODE_2", DEFAULT_NWAKU)
 ADDITIONAL_NODES = get_env_var("ADDITIONAL_NODES", f"{DEFAULT_NWAKU},{DEFAULT_GOWAKU},{DEFAULT_NWAKU}")
diff --git a/src/steps/relay.py b/src/steps/relay.py
index bacf8aba..4dda2399 100644
--- a/src/steps/relay.py
+++ b/src/steps/relay.py
@@ -47,7 +47,7 @@ class StepsRelay(StepsCommon):
 
     @pytest.fixture(scope="function")
     def register_main_rln_relay_nodes(self, request):
-        logger.debug(f"Registering RLN credentials: {inspect.currentframe().f_code.co_name}")
+        logger.debug(f"Running fixture setup: {inspect.currentframe().f_code.co_name}")
         self.node1 = WakuNode(DEFAULT_NWAKU, f"node1_{request.cls.test_id}")
         self.node1.register_rln(rln_creds_source=RLN_CREDENTIALS, rln_creds_id="1")
         self.node2 = WakuNode(DEFAULT_NWAKU, f"node2_{request.cls.test_id}")
@@ -60,6 +60,7 @@ class StepsRelay(StepsCommon):
         self.node1 = WakuNode(DEFAULT_NWAKU, f"node1_{request.cls.test_id}")
         self.node1.start(relay="true", nodekey=NODEKEY, rln_creds_source=RLN_CREDENTIALS, rln_creds_id="1", rln_relay_membership_index="1")
         self.enr_uri = self.node1.get_enr_uri()
+        self.multiaddr_with_id = self.node1.get_multiaddr_with_id()
         self.node2 = WakuNode(DEFAULT_NWAKU, f"node2_{request.cls.test_id}")
         self.node2.start(
             relay="true", discv5_bootstrap_node=self.enr_uri, rln_creds_source=RLN_CREDENTIALS, rln_creds_id="2", rln_relay_membership_index="1"