diff --git a/tailscale/DOCS.md b/tailscale/DOCS.md
index 96175f004..1691c7c23 100644
--- a/tailscale/DOCS.md
+++ b/tailscale/DOCS.md
@@ -63,6 +63,11 @@ their interface.
 1. Click on the **…** icon at the right side and select the "Disable key
    expiry" option.
 
+**Note:** _Remember to restart the app when the configuration is changed._
+
+**Note:** _This is just an example, not even the default, don't copy and paste
+it! Create your own!_
+
 ```yaml
 accept_dns: true
 accept_routes: true
@@ -248,6 +253,10 @@ This can prevent browsers from warning that HTTP URLs to your Home Assistant
 instance look unencrypted (browsers are not aware that the connections between
 Tailscale nodes are secured with end-to-end encryption).
 
+**Note:** Tailscale Serve and Funnel will automatically update the certificate
+before expiration, unlike the `tailscale cert` command. Follow the steps in this
+documentation below to set up Serve or Funnel properly.
+
 With the Tailscale Serve feature, you can access your Home Assistant instance
 with the provided certificate within your tailnet from devices already connected
 to your tailnet.