diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1d842ae082ab3ba041a5cec367d72effb948e3bd..71a8104d26f3637b13fb47f99916fce5a5119c31 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,7 +6,7 @@
   "service": "app",
   "workspaceFolder": "/castopod-host",
   "postCreateCommand": "composer install && npm install && npm run build:static",
-  "postStartCommand": "crontab ./crontab && cron && php spark serve --host 0.0.0.0 & npm run dev",
+  "postStartCommand": "crontab ./crontab && cron && php spark serve --host 0.0.0.0",
   "postAttachCommand": "crontab ./crontab && service cron reload",
   "shutdownAction": "stopCompose",
   "settings": {
diff --git a/app/Helpers/rss_helper.php b/app/Helpers/rss_helper.php
index 10079326600cc84e1de5e65a55c098b58e996f33..502b2f7b875274c322513b94737034194055b3c9 100644
--- a/app/Helpers/rss_helper.php
+++ b/app/Helpers/rss_helper.php
@@ -249,6 +249,11 @@ if (! function_exists('get_rss_feed')) {
                 $item->addChild('season', $episode->season_number, $itunesNamespace);
             $item->addChild('episodeType', $episode->type, $itunesNamespace);
 
+            // add link to episode comments as podcast-activity format
+            $comments = $item->addChild('comments', null, $podcastNamespace);
+            $comments->addAttribute('uri', url_to('episode-comments', $podcast->name, $episode->slug));
+            $comments->addAttribute('contentType', 'application/podcast-activity+json');
+
             if ($episode->transcript_file_url) {
                 $transcriptElement = $item->addChild('transcript', null, $podcastNamespace);
                 $transcriptElement->addAttribute('url', $episode->transcript_file_url);
diff --git a/docs/setup-development.md b/docs/setup-development.md
index cb21900cfd2516e4764b6079369039c67b39c175..23721a24af0d329a16cae8889c2667ad26a1078c 100644
--- a/docs/setup-development.md
+++ b/docs/setup-development.md
@@ -90,19 +90,23 @@ required services will be loaded automagically!
    > The VSCode window will reload inside the dev container. Expect several
    > minutes during first load as it is building all necessary services.
 
-   **Note**: The dev container will start by running both the Castopod Host
-   server and [Vite](https://vitejs.dev)'s dev server (for compiling the
-   typescript code and styles). If there is any issue with the servers not
-   running, you can restart them using the following commands:
+   **Note**: The dev container will start by running Castopod Host's php server.
+   During development, you will have to start [Vite](https://vitejs.dev)'s dev
+   server for compiling the typescript code and styles:
 
    ```bash
-   # run Castopod host server
-   php spark serve --host 0.0.0.0
-
    # run Vite dev server
    npm run dev
    ```
 
+   If there is any issue with the php server not running, you can restart them
+   using the following commands:
+
+   ```bash
+   # run Castopod host server
+   php spark serve --host 0.0.0.0
+   ```
+
 3. You're all set! 🎉
 
    You're now **inside the dev container**, you may use the VSCode console