diff --git a/docker-compose.yml b/docker-compose.yml
index 8e068fd..362fedf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,7 +31,7 @@ x-pg-exporter-env: &pg_exp_env
 # Services definitions
 services:
   nwaku:
-    image: ${NWAKU_IMAGE:-harbor.status.im/wakuorg/nwaku:v0.24.0}
+    image: ${NWAKU_IMAGE:-harbor.status.im/wakuorg/nwaku:v0.25.0-rc-0}
     restart: on-failure
     ports:
       - 30304:30304/tcp
@@ -59,7 +59,7 @@ services:
       - ./rln_tree:/etc/rln_tree/:Z
       - ./keystore/keystore.json:/keystore/keystore.json:Z
     entrypoint: sh
-    command:
+    command: 
       - /opt/run_node.sh
     depends_on:
       - postgres
diff --git a/msg_publisher.sh b/msg_publisher.sh
new file mode 100755
index 0000000..5cb19b7
--- /dev/null
+++ b/msg_publisher.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+while true
+do
+    ## Target of ~10kB
+    payload_size=$(( RANDOM % 2000 + 9000 ))
+    payload=$(openssl rand -hex ${payload_size} | base64 | tr -d '\n')
+
+    #  echo "publishing ${payload}"
+
+    # Example on how to publish to autosharding endpoint
+    #  curl -X POST "http://127.0.0.1:8646/relay/v1/auto/messages"  -H "content-type: application/json"  -d '{"payload":"'${payload}'","contentTopic":"/my-app/0/my-ctopic/enc"}'
+
+    # publish towards waku.test:
+    # curl -X POST "http://127.0.0.1:8645/relay/v1/messages/%2Fwaku%2F2%2Frs%2F1%2F1"  -H "content-type: application/json"  -d '{"payload":"'${payload}'","contentTopic":"my-ctopic", "timestamp":'$(date +%s%N)'}'
+    # curl -X POST "http://127.0.0.1:8645/relay/v1/messages/%2Fwaku%2F2%2Frs%2F1%2F0"  -H "content-type: application/json"  -d '{"payload":"'${payload}'","contentTopic":"my-ctopic", "timestamp":'$(date +%s%N)'}'
+    
+    # publish towards waku2.test:
+    curl -X POST "http://127.0.0.1:8645/relay/v1/messages/%2Fwaku%2F2%2Fdefault-waku%2Fproto"  -H "content-type: application/json"  -d '{"payload":"'${payload}'","contentTopic":"my-ctopic", "timestamp":'$(date +%s%N)'}'
+    #  curl -X POST "http://127.0.0.1:8646/relay/v1/messages/%2Fwaku%2F2%2Fdefault-waku%2Fproto"  -H "content-type: application/json"  -d '{"payload":"'${payload}'","contentTopic":"my-ctopic"}'
+
+sleep 1.5
+done
diff --git a/register_rln.sh b/register_rln.sh
index be87f97..870dc64 100755
--- a/register_rln.sh
+++ b/register_rln.sh
@@ -17,7 +17,7 @@ fi
 
 
 
-docker run -v $(pwd)/keystore:/keystore/:Z wakuorg/nwaku:v0.24.0 generateRlnKeystore \
+docker run -v $(pwd)/keystore:/keystore/:Z wakuorg/nwaku:v0.25.0-rc.0 generateRlnKeystore \
 --rln-relay-eth-client-address=${ETH_CLIENT_ADDRESS} \
 --rln-relay-eth-private-key=${ETH_TESTNET_KEY} \
 --rln-relay-eth-contract-address=0xF471d71E9b1455bBF4b85d475afb9BB0954A29c4 \
diff --git a/run_node.sh b/run_node.sh
index 1ca9250..8135832 100644
--- a/run_node.sh
+++ b/run_node.sh
@@ -54,25 +54,19 @@ if [ -n "${RLN_RELAY_CRED_PASSWORD}" ]; then
     RLN_RELAY_CRED_PASSWORD=--rln-relay-cred-password="${RLN_RELAY_CRED_PASSWORD}"
 fi
 
+# waku2.test
 exec /usr/bin/wakunode\
   --relay=true\
-  --pubsub-topic=/waku/2/rs/1/0\
-  --pubsub-topic=/waku/2/rs/1/1\
-  --pubsub-topic=/waku/2/rs/1/2\
-  --pubsub-topic=/waku/2/rs/1/3\
-  --pubsub-topic=/waku/2/rs/1/4\
-  --pubsub-topic=/waku/2/rs/1/5\
-  --pubsub-topic=/waku/2/rs/1/6\
-  --pubsub-topic=/waku/2/rs/1/7\
   --filter=true\
   --lightpush=true\
   --rpc-admin=true\
   --keep-alive=true\
+  --pubsub-topic='/waku/2/default-waku/proto'\
+  --pubsub-topic='/waku/2/dev-waku/proto'\
   --max-connections=150\
-  --cluster-id=1\
-  --discv5-bootstrap-node="enr:-QESuEC1p_s3xJzAC_XlOuuNrhVUETmfhbm1wxRGis0f7DlqGSw2FM-p2Ugl_r25UHQJ3f1rIRrpzxJXSMaJe4yk1XFSAYJpZIJ2NIJpcISygI2rim11bHRpYWRkcnO4XAArNiZub2RlLTAxLmRvLWFtczMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwAtNiZub2RlLTAxLmRvLWFtczMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQJATXRSRSUyTw_QLB6H_U3oziVQgNRgrXpK7wp2AMyNxYN0Y3CCdl-DdWRwgiMohXdha3UyDw"\
-  --discv5-bootstrap-node="enr:-QEkuECnZ3IbVAgkOzv-QLnKC4dRKAPRY80m1-R7G8jZ7yfT3ipEfBrhKN7ARcQgQ-vg-h40AQzyvAkPYlHPaFKk6u9uAYJpZIJ2NIJpcIQiEAFDim11bHRpYWRkcnO4bgA0Ni9ub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA2Ni9ub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQMIJwesBVgUiBCi8yiXGx7RWylBQkYm1U9dvEy-neLG2YN0Y3CCdl-DdWRwgiMohXdha3UyDw"\
-  --discv5-bootstrap-node="enr:-QEkuEDzQyIAhs-CgBHIrJqtBv3EY1uP1Psrc-y8yJKsmxW7dh3DNcq2ergMUWSFVcJNlfcgBeVsFPkgd_QopRIiCV2pAYJpZIJ2NIJpcIQI2ttrim11bHRpYWRkcnO4bgA0Ni9ub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA2Ni9ub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQJIN4qwz3v4r2Q8Bv8zZD0eqBcKw6bdLvdkV7-JLjqIj4N0Y3CCdl-DdWRwgiMohXdha3UyDw"\
+  --staticnode="/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ"\
+  --staticnode="/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"\
+  --staticnode="/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm"\
   --discv5-discovery=true\
   --discv5-udp-port=9005\
   --discv5-enr-auto-update=True\
@@ -102,3 +96,77 @@ exec /usr/bin/wakunode\
   ${NODEKEY}\
   ${EXTRA_ARGS}
 
+# Waku.test
+# exec /usr/bin/wakunode\
+#   --relay=true\
+#   --filter=true\
+#   --lightpush=true\
+#   --rpc-admin=true\
+#   --keep-alive=true\
+#   --pubsub-topic=/waku/2/rs/1/0\
+#   --pubsub-topic=/waku/2/rs/1/1\
+#   --pubsub-topic=/waku/2/rs/1/2\
+#   --pubsub-topic=/waku/2/rs/1/3\
+#   --pubsub-topic=/waku/2/rs/1/4\
+#   --pubsub-topic=/waku/2/rs/1/5\
+#   --pubsub-topic=/waku/2/rs/1/6\
+#   --pubsub-topic=/waku/2/rs/1/7\
+#   --max-connections=150\
+#   --cluster-id=1\
+#   --staticnode="/dns4/node-01.do-ams3.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W"\
+#   --staticnode="/dns4/node-01.gc-us-central1-a.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAmDCp8XJ9z1ev18zuv8NHekAsjNyezAvmMfFEJkiharitG"\
+#   --staticnode="/dns4/node-01.ac-cn-hongkong-c.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp"\
+#   --discv5-discovery=true\
+#   --discv5-udp-port=9005\
+#   --discv5-enr-auto-update=True\
+#   --log-level=DEBUG\
+#   --rpc-port=8545\
+#   --rpc-address=0.0.0.0\
+#   --tcp-port=30304\
+#   --metrics-server=True\
+#   --metrics-server-port=8003\
+#   --metrics-server-address=0.0.0.0\
+#   --rest=true\
+#   --rest-admin=true\
+#   --rest-address=0.0.0.0\
+#   --rest-port=8645\
+#   --nat=extip:"${MY_EXT_IP}"\
+#   --store=true\
+#   --store-message-db-url="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/postgres"\
+#   --store-message-retention-policy=time:86400\
+#   --rln-relay=true\
+#   --rln-relay-dynamic=true\
+#   --rln-relay-eth-contract-address="${RLN_RELAY_CONTRACT_ADDRESS}"\
+#   --rln-relay-eth-client-address="${ETH_CLIENT_ADDRESS}"\
+#   --rln-relay-tree-path="/etc/rln_tree"\
+#   ${RLN_RELAY_CRED_PATH}\
+#   ${RLN_RELAY_CRED_PASSWORD}\
+#   ${DNS_WSS_CMD}\
+#   ${NODEKEY}\
+#   ${EXTRA_ARGS}
+
+
+# waku2.test
+#   --pubsub-topic='/waku/2/default-waku/proto'\
+#   --pubsub-topic='/waku/2/dev-waku/proto'\
+#   --staticnode="/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ"\
+#   --staticnode="/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"\
+#   --staticnode="/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm"\
+
+# waku.test
+#   --pubsub-topic=/waku/2/rs/1/0\
+#   --pubsub-topic=/waku/2/rs/1/1\
+#   --pubsub-topic=/waku/2/rs/1/2\
+#   --pubsub-topic=/waku/2/rs/1/3\
+#   --pubsub-topic=/waku/2/rs/1/4\
+#   --pubsub-topic=/waku/2/rs/1/5\
+#   --pubsub-topic=/waku/2/rs/1/6\
+#   --pubsub-topic=/waku/2/rs/1/7\
+#   --staticnode="/dns4/node-01.do-ams3.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkykgaECHswi3YKJ5dMLbq2kPVCo89fcyTd38UcQD6ej5W"\
+#   --staticnode="/dns4/node-01.gc-us-central1-a.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAmDCp8XJ9z1ev18zuv8NHekAsjNyezAvmMfFEJkiharitG"\
+#   --staticnode="/dns4/node-01.ac-cn-hongkong-c.waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAkzHaTP5JsUwfR9NR8Rj9HC24puS6ocaU8wze4QrXr9iXp"\
+
+# waku.test bootstrap:
+#   --discv5-bootstrap-node="enr:-QESuEC1p_s3xJzAC_XlOuuNrhVUETmfhbm1wxRGis0f7DlqGSw2FM-p2Ugl_r25UHQJ3f1rIRrpzxJXSMaJe4yk1XFSAYJpZIJ2NIJpcISygI2rim11bHRpYWRkcnO4XAArNiZub2RlLTAxLmRvLWFtczMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwAtNiZub2RlLTAxLmRvLWFtczMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQJATXRSRSUyTw_QLB6H_U3oziVQgNRgrXpK7wp2AMyNxYN0Y3CCdl-DdWRwgiMohXdha3UyDw"\
+#   --discv5-bootstrap-node="enr:-QEkuECnZ3IbVAgkOzv-QLnKC4dRKAPRY80m1-R7G8jZ7yfT3ipEfBrhKN7ARcQgQ-vg-h40AQzyvAkPYlHPaFKk6u9uAYJpZIJ2NIJpcIQiEAFDim11bHRpYWRkcnO4bgA0Ni9ub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA2Ni9ub2RlLTAxLmdjLXVzLWNlbnRyYWwxLWEud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQMIJwesBVgUiBCi8yiXGx7RWylBQkYm1U9dvEy-neLG2YN0Y3CCdl-DdWRwgiMohXdha3UyDw"\
+#   --discv5-bootstrap-node="enr:-QEkuEDzQyIAhs-CgBHIrJqtBv3EY1uP1Psrc-y8yJKsmxW7dh3DNcq2ergMUWSFVcJNlfcgBeVsFPkgd_QopRIiCV2pAYJpZIJ2NIJpcIQI2ttrim11bHRpYWRkcnO4bgA0Ni9ub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAZ2XwA2Ni9ub2RlLTAxLmFjLWNuLWhvbmdrb25nLWMud2FrdS50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DgnJzkwABCAAAAAEAAgADAAQABQAGAAeJc2VjcDI1NmsxoQJIN4qwz3v4r2Q8Bv8zZD0eqBcKw6bdLvdkV7-JLjqIj4N0Y3CCdl-DdWRwgiMohXdha3UyDw"\