diff --git a/docker-compose.yml b/docker-compose.yml
index 31b4ee6..f2fd6e2 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:-wakuorg/nwaku:v0.21.3}
+    image: ${NWAKU_IMAGE:-wakuorg/nwaku:v0.22.0-rc.0}
     restart: on-failure
     ports:
       - 30304:30304/tcp
diff --git a/run_node.sh b/run_node.sh
index 25fa8c6..b7f0869 100644
--- a/run_node.sh
+++ b/run_node.sh
@@ -56,14 +56,14 @@ fi
 
 exec /usr/bin/wakunode\
   --relay=true\
-  --topic=/waku/2/rs/1/0\
-  --topic=/waku/2/rs/1/1\
-  --topic=/waku/2/rs/1/2\
-  --topic=/waku/2/rs/1/3\
-  --topic=/waku/2/rs/1/4\
-  --topic=/waku/2/rs/1/5\
-  --topic=/waku/2/rs/1/6\
-  --topic=/waku/2/rs/1/7\
+  --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\