diff --git a/run_bootstrap.sh b/run_bootstrap.sh
index 658c427..d27dfe7 100755
--- a/run_bootstrap.sh
+++ b/run_bootstrap.sh
@@ -21,5 +21,7 @@ exec /usr/bin/wakunode\
       --metrics-server-address=0.0.0.0\
       --nodekey=30348dd51465150e04a5d9d932c72864c8967f806cce60b5d26afeca1e77eb68\
       --nat=extip:${IP}\
-      --pubsub-topic=/waku/2/rs/66/0\
-      --cluster-id=66
\ No newline at end of file
+      --shard=0\
+      --cluster-id=66
+
+      # --pubsub-topic=/waku/2/rs/66/0\
\ No newline at end of file
diff --git a/run_nwaku.sh b/run_nwaku.sh
index e521b74..e419848 100755
--- a/run_nwaku.sh
+++ b/run_nwaku.sh
@@ -149,5 +149,7 @@ exec /usr/bin/wakunode\
       --metrics-server-address=0.0.0.0\
       --discv5-bootstrap-node=${BOOTSTRAP_ENR}\
       --nat=extip:${IP}\
-      --pubsub-topic=/waku/2/rs/66/0\
-      --cluster-id=66
\ No newline at end of file
+      --shard=0\
+      --cluster-id=66
+
+      #--pubsub-topic=/waku/2/rs/66/0\
\ No newline at end of file
diff --git a/run_servicenode.sh b/run_servicenode.sh
index dff97b7..14ad629 100755
--- a/run_servicenode.sh
+++ b/run_servicenode.sh
@@ -165,7 +165,9 @@ exec /usr/bin/wakunode\
       --nat=extip:${IP}\
       --tcp-port:60001\
       --nodekey=e3416f0b00005aa3ebc9cd42797b3847bfbf4fe810edaa6a1fc65e755638b7fb\
-      --pubsub-topic=/waku/2/rs/66/0\
+      --shard=0\
       --cluster-id=66\
       --store-message-db-url="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/postgres"\
       ${STORE_RETENTION_POLICY}\
+
+      #--pubsub-topic=/waku/2/rs/66/0\
\ No newline at end of file