diff --git a/src/env_vars.py b/src/env_vars.py
index fe4bddcf..96eef55e 100644
--- a/src/env_vars.py
+++ b/src/env_vars.py
@@ -18,7 +18,7 @@ DEFAULT_NWAKU = "wakuorg/nwaku:latest"
 DEFAULT_GOWAKU = "wakuorg/go-waku:latest"
 STRESS_ENABLED = False
 NODE_1 = get_env_var("NODE_1", DEFAULT_NWAKU)
-NODE_2 = get_env_var("NODE_2", DEFAULT_NWAKU)
+NODE_2 = get_env_var("NODE_2", DEFAULT_GOWAKU)
 ADDITIONAL_NODES = get_env_var("ADDITIONAL_NODES", f"{DEFAULT_NWAKU},{DEFAULT_GOWAKU},{DEFAULT_NWAKU}")
 # more nodes need to follow the NODE_X pattern
 DOCKER_LOG_DIR = get_env_var("DOCKER_LOG_DIR", "./log/docker")
diff --git a/src/node/waku_node.py b/src/node/waku_node.py
index e5abb01c..3669fa93 100644
--- a/src/node/waku_node.py
+++ b/src/node/waku_node.py
@@ -117,8 +117,8 @@ class WakuNode:
             "rln-creds-id": None,
             "rln-creds-source": None,
             "nodekey": self.generate_random_nodekey(),
-            "max-connections": "50",
-            "filter-subscription-timeout": "600",
+            # "max-connections": "50",
+            # "filter-subscription-timeout": "600",
         }
 
         if self.is_gowaku():
diff --git a/tests/e2e/test_e2e.py b/tests/e2e/test_e2e.py
index 17855b71..0d5c6230 100644
--- a/tests/e2e/test_e2e.py
+++ b/tests/e2e/test_e2e.py
@@ -181,6 +181,8 @@ class TestE2E(StepsFilter, StepsStore, StepsRelay, StepsLightPush):
     @pytest.mark.timeout(60 * 7)
     def test_filter_20_senders_1_receiver(self):
         total_senders = 20
+        if "go-waku" in NODE_2:
+            total_senders = 10
         node_list = []
 
         logger.debug(f"Start {total_senders} nodes to publish messages ")
@@ -190,7 +192,7 @@ class TestE2E(StepsFilter, StepsStore, StepsRelay, StepsLightPush):
             node_list.append(WakuNode(NODE_2, f"node{i + 1}_{self.test_id}"))
             delay(0.1)
             node_list[i + 1].start(relay="true", discv5_bootstrap_node=node_list[i].get_enr_uri())
-            delay(2)
+            delay(3)
 
         logger.debug(f"Start filter node and subscribed filter node ")
         self.node21 = WakuNode(NODE_1, f"node21_{self.test_id}")
@@ -207,7 +209,7 @@ class TestE2E(StepsFilter, StepsStore, StepsRelay, StepsLightPush):
             node.set_relay_subscriptions([self.test_pubsub_topic])
         logger.debug(f"Node22 make filter request to pubsubtopic {self.test_pubsub_topic} and content topic  {self.test_content_topic}")
         self.node22.set_filter_subscriptions({"requestId": "1", "contentFilters": [self.test_content_topic], "pubsubTopic": self.test_pubsub_topic})
-        self.wait_for_autoconnection(node_list, hard_wait=50)
+        self.wait_for_autoconnection(node_list, hard_wait=80)
 
         logger.debug(f"{total_senders} Nodes publish {total_senders} messages")
         for node in node_list[:-1]: