diff --git a/docs b/docs
index b2c2a76d..a443af8c 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit b2c2a76d48ceab8f6306cd8778ca3f20b0a9cb56
+Subproject commit a443af8c11ef5c00aaced056fc297f79dee1f218
diff --git a/platformio/__main__.py b/platformio/__main__.py
index 07816eda..464f2fb9 100644
--- a/platformio/__main__.py
+++ b/platformio/__main__.py
@@ -120,7 +120,7 @@ An unexpected error occurred. Further steps:
   `pip install -U platformio` command
 
 * Try to find answer in FAQ Troubleshooting section
-  https://docs.platformio.org/page/faq.html
+  https://docs.platformio.org/page/faq/index.html
 
 * Report this problem to the developers
   https://github.com/platformio/platformio-core/issues
diff --git a/platformio/exception.py b/platformio/exception.py
index 03382a55..5c0b44ea 100644
--- a/platformio/exception.py
+++ b/platformio/exception.py
@@ -56,7 +56,7 @@ class MissedUdevRules(InvalidUdevRules):
 
     MESSAGE = (
         "Warning! Please install `99-platformio-udev.rules`. \nMore details: "
-        "https://docs.platformio.org/page/faq.html#platformio-udev-rules"
+        "https://docs.platformio.org/en/latest/core/installation/udev-rules.html"
     )
 
 
@@ -65,7 +65,7 @@ class OutdatedUdevRules(InvalidUdevRules):
     MESSAGE = (
         "Warning! Your `{0}` are outdated. Please update or reinstall them."
         "\nMore details: "
-        "https://docs.platformio.org/page/faq.html#platformio-udev-rules"
+        "https://docs.platformio.org/en/latest/core/installation/udev-rules.html"
     )
 
 
diff --git a/platformio/maintenance.py b/platformio/maintenance.py
index dccd8086..775de286 100644
--- a/platformio/maintenance.py
+++ b/platformio/maintenance.py
@@ -142,8 +142,8 @@ def after_upgrade(ctx):
         )
         click.secho("Please remove multiple PIO Cores from a system:", fg="yellow")
         click.secho(
-            "https://docs.platformio.org/page/faq.html"
-            "#multiple-platformio-cores-in-a-system",
+            "https://docs.platformio.org/en/latest/core"
+            "/installation/troubleshooting.html",
             fg="cyan",
         )
         click.secho("*" * terminal_width, fg="yellow")
diff --git a/scripts/99-platformio-udev.rules b/scripts/99-platformio-udev.rules
index 6fd87d00..574b6fe6 100644
--- a/scripts/99-platformio-udev.rules
+++ b/scripts/99-platformio-udev.rules
@@ -16,7 +16,7 @@
 #
 # INSTALLATION
 #
-# Please visit > https://docs.platformio.org/en/latest/faq.html#platformio-udev-rules
+# Please visit > https://docs.platformio.org/en/latest/core/installation/udev-rules.html
 #
 #####################################################################################
 
diff --git a/scripts/docspregen.py b/scripts/docspregen.py
index 90dc887d..2846c7da 100644
--- a/scripts/docspregen.py
+++ b/scripts/docspregen.py
@@ -338,7 +338,7 @@ Packages
 .. warning::
     **Linux Users**:
 
-        * Install "udev" rules :ref:`faq_udev_rules`
+        * Install "udev" rules :ref:`platformio_udev_rules`
         * Raspberry Pi users, please read this article
           `Enable serial port on Raspberry Pi <https://hallard.me/enable-serial-port-on-raspberry-pi/>`__.
 """