diff --git a/components/package-template/src/etc/clp-config.template.json.yaml b/components/package-template/src/etc/clp-config.template.json.yaml
index ed83f92b50..ee27ce7453 100644
--- a/components/package-template/src/etc/clp-config.template.json.yaml
+++ b/components/package-template/src/etc/clp-config.template.json.yaml
@@ -105,6 +105,8 @@
 #  rate_limit: 1000
 #
 #mcp_server: null
+##  host: "localhost"
+##  port: 8000
 #
 ## Where archives should be output to
 #archive_output:
@@ -156,6 +158,8 @@
 #
 ## Presto client config
 #presto: null
+##  host: <presto-coordinator-ip>  # default: "localhost"
+##  port: <presto-coordinator-port>  # default: 8889
 #
 ## Location where other data (besides archives) are stored. It will be created if
 ## it doesn't exist.
diff --git a/components/package-template/src/etc/clp-config.template.text.yaml b/components/package-template/src/etc/clp-config.template.text.yaml
index 7ca4898ac7..59544d8880 100644
--- a/components/package-template/src/etc/clp-config.template.text.yaml
+++ b/components/package-template/src/etc/clp-config.template.text.yaml
@@ -87,6 +87,8 @@ log_ingestor: null
 #  rate_limit: 1000
 #
 #mcp_server: null
+##  host: "localhost"
+##  port: 8000
 #
 ## Where archives should be output to
 #archive_output:
@@ -139,6 +141,8 @@ log_ingestor: null
 #
 ## Presto client config
 #presto: null
+##  host: <presto-coordinator-ip>  # default: "localhost"
+##  port: <presto-coordinator-port>  # default: 8889
 #
 ## Location where other data (besides archives) are stored. It will be created if
 ## it doesn't exist.
diff --git a/docs/src/user-docs/guides-mcp-server/index.md b/docs/src/user-docs/guides-mcp-server/index.md
index 17f7f557bf..8594c22489 100644
--- a/docs/src/user-docs/guides-mcp-server/index.md
+++ b/docs/src/user-docs/guides-mcp-server/index.md
@@ -21,14 +21,9 @@ This guide assumes:
 
 ## Starting the MCP Server
 
-1. Configure `clp-json` to run the MCP server by locating the `mcp_server` section in
-   `etc/clp-config.yaml`
-
-    ```yaml
-    #mcp_server: null
-    ```
-
-   then uncommenting it and specifying a `host` and `port`:
+1. Configure `clp-json` to run the MCP server by uncommenting the `mcp_server` section in
+   `etc/clp-config.yaml` and specifying a `host` and `port`. Replace the default values if
+   necessary.
 
     ```yaml
     mcp_server:
@@ -37,11 +32,9 @@ This guide assumes:
        # other settings
     ```
 
-    Replace the default `host` and `port` shown above if necessary.
-
     :::{note}
-    If you set `mcp_server: null` or leave the `mcp_server` section commented, the MCP server won't
-    be started with the rest of `clp-json`.
+    Setting `mcp_server: null` or leaving the section commented will prevent the MCP server from
+    starting with `clp-json`.
     :::
 
 2. Start `clp-json` and compress the logs you want to query by following the [clp-json
diff --git a/docs/src/user-docs/guides-using-presto.md b/docs/src/user-docs/guides-using-presto.md
index a598347917..af9ff064a0 100644
--- a/docs/src/user-docs/guides-using-presto.md
+++ b/docs/src/user-docs/guides-using-presto.md
@@ -57,14 +57,13 @@ Using Presto with CLP requires:
         retention_period: null
       ```
 
-    * Update the `presto` key with the host and port of the Presto cluster. If you follow the
-      [Setting up Presto](#setting-up-presto) section, the host is `localhost` and the port is
-      `8889`.
+    * Update the `presto` key with the `host` and `port` of the Presto cluster. Replace the default
+      values if necessary.
 
       ```yaml
       presto:
-        host: "<ip-address>"
-        port: <port>
+        host: "localhost"
+        port: 8889
       ```
 
       :::{note}