diff --git a/waku/node/peer_manager/peer_manager.nim b/waku/node/peer_manager/peer_manager.nim
index a5fecce0b..b8988dd28 100644
--- a/waku/node/peer_manager/peer_manager.nim
+++ b/waku/node/peer_manager/peer_manager.nim
@@ -53,7 +53,7 @@ const
   ConnectivityLoopInterval = chronos.seconds(15)
 
   # How often the peer store is pruned
-  PrunePeerStoreInterval = chronos.minutes(5)
+  PrunePeerStoreInterval = chronos.minutes(10)
 
   # How often metrics and logs are shown/updated
   LogAndMetricsInterval = chronos.minutes(3)
@@ -583,15 +583,16 @@ proc connectToRelayPeers*(pm: PeerManager) {.async.} =
   let totalRelayPeers = inRelayPeers.len + outRelayPeers.len
   let inPeersTarget = maxConnections - pm.outRelayPeersTarget
 
-  if inRelayPeers.len > pm.inRelayPeersTarget:
-    await pm.pruneInRelayConns(inRelayPeers.len - pm.inRelayPeersTarget)
+  # TODO: Temporally disabled. Might be causing connection issues
+  #if inRelayPeers.len > pm.inRelayPeersTarget:
+  #  await pm.pruneInRelayConns(inRelayPeers.len - pm.inRelayPeersTarget)
 
   if outRelayPeers.len >= pm.outRelayPeersTarget:
     return
 
   let notConnectedPeers = pm.peerStore.getNotConnectedPeers().mapIt(RemotePeerInfo.init(it.peerId, it.addrs))
   let outsideBackoffPeers = notConnectedPeers.filterIt(pm.canBeConnected(it.peerId))
-  let numPeersToConnect = min(min(maxConnections - totalRelayPeers, outsideBackoffPeers.len), MaxParalelDials)
+  let numPeersToConnect = min(outsideBackoffPeers.len, MaxParalelDials)
 
   await pm.connectToNodes(outsideBackoffPeers[0..<numPeersToConnect])
 
diff --git a/waku/node/waku_switch.nim b/waku/node/waku_switch.nim
index 6fee27cc3..f81e4a6ef 100644
--- a/waku/node/waku_switch.nim
+++ b/waku/node/waku_switch.nim
@@ -101,7 +101,7 @@ proc newWakuSwitch*(
     if peerStoreCapacity.isSome():
       b = b.withPeerStore(peerStoreCapacity.get())
     else:
-      let defaultPeerStoreCapacity = int(round(float64(maxConnections)*1.25))
+      let defaultPeerStoreCapacity = int(maxConnections)*5
       b = b.withPeerStore(defaultPeerStoreCapacity)
     if agentString.isSome():
       b = b.withAgentVersion(agentString.get())