diff --git a/_assets/scripts/update-fleet-config.sh b/_assets/scripts/update-fleet-config.sh
index d2c8e7edd..c7338d427 100755
--- a/_assets/scripts/update-fleet-config.sh
+++ b/_assets/scripts/update-fleet-config.sh
@@ -20,7 +20,6 @@ for fleet in ${fleets[@]}; do
     fleetJSON=$(echo $json | jq ".fleets.\"$fleet\"")
     boot=$(echo $fleetJSON | jq ".boot | map(.)" -r)
     mail=$(echo $fleetJSON | jq ".mail | map(.)" -r)
-    rendezvous=$(echo $fleetJSON | jq ".rendezvous | map(.)" -r)
 
 
     # Get random nodes from whisper node list
@@ -33,8 +32,7 @@ for fleet in ${fleets[@]}; do
         && jq \
               ".ClusterConfig.BootNodes = $boot \
              | .ClusterConfig.TrustedMailServers = $mail \
-             | .ClusterConfig.StaticNodes = $whisper \
-             | .ClusterConfig.RendezvousNodes = $rendezvous" \
+             | .ClusterConfig.StaticNodes = $whisper" \
              $DIR/fleet-$fleet.json \
         | tee "$DIR/tmp.json" >/dev/null \
         && mv $DIR/tmp.json $DIR/fleet-$fleet.json
@@ -51,4 +49,4 @@ for fleet in ${wakufleets[@]}; do
              $DIR/fleet-$fleet.json \
         | tee "$DIR/tmp.json" >/dev/null \
         && mv $DIR/tmp.json $DIR/fleet-$fleet.json
-done
\ No newline at end of file
+done
diff --git a/config/cli/fleet-eth.prod.json b/config/cli/fleet-eth.prod.json
index d42dca5f3..f847ab213 100644
--- a/config/cli/fleet-eth.prod.json
+++ b/config/cli/fleet-eth.prod.json
@@ -1,5 +1,5 @@
 {
-  "Rendezvous": true,
+  "Rendezvous": false,
   "NoDiscovery": false,
   "ClusterConfig": {
     "Enabled": true,
@@ -37,14 +37,6 @@
     "StaticNodes": [
       "enode://b77bffc29e2592f30180311dd81204ab845e5f78953b5ba0587c6631be9c0862963dea5eb64c90617cf0efd75308e22a42e30bc4eb3cd1bbddbd1da38ff6483e@47.75.10.177:443",
       "enode://a8bddfa24e1e92a82609b390766faa56cf7a5eef85b22a2b51e79b333c8aaeec84f7b4267e432edd1cf45b63a3ad0fc7d6c3a16f046aa6bc07ebe50e80b63b8c@178.128.141.249:443"
-    ],
-    "RendezvousNodes": [
-      "/ip4/47.75.99.169/tcp/30703/ethv4/16Uiu2HAmV8Hq9e3zm9TMVP4zrVHo3BjqW5D6bDVV6VQntQd687e4",
-      "/ip4/178.128.138.128/tcp/30703/ethv4/16Uiu2HAmRHPzF3rQg55PgYPcQkyvPVH9n2hWsYPhUJBZ6kVjJgdV",
-      "/ip4/34.70.75.208/tcp/30703/ethv4/16Uiu2HAm6ZsERLx2BwVD2UM9SVPnnMU6NBycG8XPtu8qKys5awsU",
-      "/ip4/47.52.106.107/tcp/30703/ethv4/16Uiu2HAmEHiptiDDd9gqNY8oQqo8hHUWMHJzfwt5aLRdD6W2zcXR",
-      "/ip4/178.128.140.188/tcp/30703/ethv4/16Uiu2HAmLqTXuY4Sb6G28HNooaFUXUKzpzKXCcgyJxgaEE2i5vnf",
-      "/ip4/35.223.215.156/tcp/30703/ethv4/16Uiu2HAmQEUFE2YaJohavWtHxPTEFv3sEGJtDqvtGEv78DFoEWQF"
     ]
   }
 }
diff --git a/config/cli/fleet-eth.staging.json b/config/cli/fleet-eth.staging.json
index 6da592f8a..ee378ca3f 100644
--- a/config/cli/fleet-eth.staging.json
+++ b/config/cli/fleet-eth.staging.json
@@ -1,5 +1,5 @@
 {
-  "Rendezvous": true,
+  "Rendezvous": false,
   "NoDiscovery": false,
   "ClusterConfig": {
     "Enabled": true,
@@ -18,16 +18,10 @@
       "04b74859176c9751d314aeeffc26ec9f866a412752e7ddec91b19018a18e7cca8d637cfe2cedcb972f8eb64d816fbd5b4e89c7e8c7fd7df8a1329fa43db80b0bfe",
       "0469f72baa7f1722d111a8c9c68c39a31430e9d567695f6108f31ccb6cd8f0adff4991e7fdca8fa770e75bc8a511a87d24690cbc80e008175f40c157d6f6788d48",
       "04e4fc10c1f65c8aed83ac26bc1bfb21a45cc1a8550a58077c8d2de2a0e0cd18e40fd40f7e6f7d02dc6cd06982b014ce88d6e468725ffe2c138e958788d0002a7f"
-
     ],
     "StaticNodes": [
-      "enode://914c0b30f27bab30c1dfd31dad7652a46fda9370542aee1b062498b1345ee0913614b8b9e3e84622e84a7203c5858ae1d9819f63aece13ee668e4f6668063989@167.99.19.148:443",
-      "enode://2d897c6e846949f9dcf10279f00e9b8325c18fe7fa52d658520ad7be9607c83008b42b06aefd97cfe1fdab571f33a2a9383ff97c5909ed51f63300834913237e@35.192.0.86:443"
-    ],
-    "RendezvousNodes": [
-      "/ip4/47.91.229.44/tcp/30703/ethv4/16Uiu2HAmRnt2Eyoknh3auxh4fJwkRgqkH1gqrWGes8Pk1k3MV4xu",
-      "/ip4/174.138.107.239/tcp/30703/ethv4/16Uiu2HAm8UZXUHEPZrpJbcQ3yVFH6UtKrwsG6jH4ai72PsbLfVFb",
-      "/ip4/35.238.97.234/tcp/30703/ethv4/16Uiu2HAm6G9sDMkrB4Xa5EH3Zx2dysCxFgBTSRzghic3Z9tRFRNE"
+      "enode://088cf5a93c576fae52f6f075178467b8ff98bacf72f59e88efb16dfba5b30f80a4db78f8e3cb3d87f2f6521746ef4a8768465ef2896c6af24fd77a425e95b6dd@47.52.226.137:443",
+      "enode://914c0b30f27bab30c1dfd31dad7652a46fda9370542aee1b062498b1345ee0913614b8b9e3e84622e84a7203c5858ae1d9819f63aece13ee668e4f6668063989@167.99.19.148:443"
     ]
   }
 }
diff --git a/config/cli/fleet-eth.test.json b/config/cli/fleet-eth.test.json
index 7c4989e0f..2d0c7719c 100644
--- a/config/cli/fleet-eth.test.json
+++ b/config/cli/fleet-eth.test.json
@@ -1,5 +1,6 @@
 {
   "LogLevel": "DEBUG",
+  "Rendezvous": false,
   "NoDiscovery": false,
   "ClusterConfig": {
     "Enabled": true,
@@ -22,11 +23,6 @@
     "StaticNodes": [
       "enode://ad38f94030a846cc7005b7a1f3b6b01bf4ef59d34e8d3d6f4d12df23d14ba8656702a435d34cf4df3b412c0c1923df5adcce8461321a0d8ffb9435b26e572c2a@47.52.255.194:443",
       "enode://1d193635e015918fb85bbaf774863d12f65d70c6977506187ef04420d74ec06c9e8f0dcb57ea042f85df87433dab17a1260ed8dde1bdf9d6d5d2de4b7bf8e993@206.189.243.163:443"
-    ],
-    "RendezvousNodes": [
-      "/ip4/47.52.188.149/tcp/30703/ethv4/16Uiu2HAm9Vatqr4GfVCqnyeaPtCF3q8fz8kDDUgqXVfFG7ZfSA7w",
-      "/ip4/206.189.243.164/tcp/30703/ethv4/16Uiu2HAmBCh5bgYr6V3fDuLqUzvtSAsFTQJCQ3TVHT8ta8bTu2Jm",
-      "/ip4/35.188.168.137/tcp/30703/ethv4/16Uiu2HAm3MUqtGjmetyZ9L4SN2R8oHDWvACUcec25LjtDD5euiRH"
     ]
   }
 }
diff --git a/config/cli/fleet-wakuv2.prod.json b/config/cli/fleet-wakuv2.prod.json
index 178bd4206..c9fac5648 100644
--- a/config/cli/fleet-wakuv2.prod.json
+++ b/config/cli/fleet-wakuv2.prod.json
@@ -10,7 +10,7 @@
     "StaticNodes": [],
     "RendezvousNodes": [],
     "WakuNodes": [
-      "/ip4/8.210.222.231/tcp/30303/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
+      "/ip4/8.210.222.231/tcp/30303/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD",
       "/ip4/188.166.135.145/tcp/30303/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
       "/ip4/34.121.100.108/tcp/30303/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA"
     ],
@@ -19,6 +19,6 @@
     ]
   },
   "WakuV2Config": {
-		"Enabled": true
-	}
+    "Enabled": true
+  }
 }
diff --git a/config/cli/fleet-wakuv2.test.json b/config/cli/fleet-wakuv2.test.json
index 84da54e14..cbb8c4f53 100644
--- a/config/cli/fleet-wakuv2.test.json
+++ b/config/cli/fleet-wakuv2.test.json
@@ -10,7 +10,7 @@
     "StaticNodes": [],
     "RendezvousNodes": [],
     "WakuNodes": [
-      "/ip4/47.242.210.73/tcp/30303/p2p/16Uiu2HAmSyrYVycqBCWcHyNVQS6zYQcdQbwyov1CDijboVRsQS37",
+      "/ip4/47.242.210.73/tcp/30303/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
       "/ip4/134.209.139.210/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
       "/ip4/104.154.239.128/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"
     ],
@@ -19,6 +19,6 @@
     ]
   },
   "WakuV2Config": {
-		"Enabled": true
-	}
+    "Enabled": true
+  }
 }