diff --git a/README.md b/README.md
index 70cf3c5..73d19c1 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,10 @@ docker-compose up -d
 * See [http://localhost:3000/d/yns_4vFVk/nwaku-monitoring](http://localhost:3000/d/yns_4vFVk/nwaku-monitoring) for node metrics.
 * See [localhost:4000](http://localhost:4000). Under development 🚧
 
-**📬 4. Use the REST API**
+**⭐ 4. Chat using waku-frontend**
+Check out [http://localhost:5173](http://localhost:5173) and use your Waku node to chat with other users
+
+**📬 5. Use the REST API**
 
 Your nwaku node exposes a [REST API](https://waku-org.github.io/waku-rest-api/) to interact with it.
 
diff --git a/docker-compose.yml b/docker-compose.yml
index f9deb4a..c287aa8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -141,6 +141,15 @@ services:
       - --config.file=/etc/pgexporter/postgres-exporter.yml
     depends_on:
       - postgres
+  
+  waku-frontend:
+   # TODO: migrate to waku-org
+   image: alrevuelta/waku-frontend:latest
+   ports:
+    - 127.0.0.1:5173:5173
+   restart: on-failure:5
+   depends_on:
+    - nwaku
 
 ##  Remove comment if you need pgadmin support in your container.
 ##  Commented for backward version compatibility of docker-compose.
diff --git a/run_node.sh b/run_node.sh
index 73417e6..e9ba453 100644
--- a/run_node.sh
+++ b/run_node.sh
@@ -79,6 +79,7 @@ exec /usr/bin/wakunode\
   --rest-address=0.0.0.0\
   --rest-port=8645\
   --rest-allow-origin="waku-org.github.io"\
+  --rest-allow-origin="localhost:*"\
   --nat=extip:"${MY_EXT_IP}"\
   --store=true\
   --store-message-db-url="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/postgres"\