diff --git a/vercel.json b/vercel.json
index b3b831fb..fe06a139 100644
--- a/vercel.json
+++ b/vercel.json
@@ -1,80 +1,57 @@
 {
+  "trailingSlash": true,
   "redirects": [
-    {
-      "source": "/docs/settings",
-      "destination": "/docs/configuration"
-    },
     {
       "source": "/docs/settings/",
       "destination": "/docs/configuration/"
     },
-    {
-      "source": "/docs/settings/config",
-      "destination": "/docs/configuration/radio"
-    },
     {
       "source": "/docs/settings/config/",
       "destination": "/docs/configuration/radio/"
     },
     {
-      "source": "/docs/settings/config/:path*",
-      "destination": "/docs/configuration/radio/:path*"
-    },
-    {
-      "source": "/docs/settings/moduleconfig",
-      "destination": "/docs/configuration/module"
+      "source": "/docs/settings/config/:path*/",
+      "destination": "/docs/configuration/radio/:path*/"
     },
     {
       "source": "/docs/settings/moduleconfig/",
       "destination": "/docs/configuration/module/"
     },
     {
-      "source": "/docs/settings/moduleconfig/:path*",
-      "destination": "/docs/configuration/module/:path*"
+      "source": "/docs/settings/moduleconfig/:path*/",
+      "destination": "/docs/configuration/module/:path*/"
     },
     {
       "source": "/docs/hardware/peripheral/",
-      "destination": "/docs/configuration/module/remote-hardware#remote-hardware-module-usage"
+      "destination": "/docs/configuration/module/remote-hardware/#remote-hardware-module-usage"
     },
     {
-      "source": "/docs/configuration/rak-gpio-mapping",
-      "destination": "/docs/hardware/devices/rak/core-module#gpio"
+      "source": "/docs/configuration/rak-gpio-mapping/",
+      "destination": "/docs/hardware/devices/rak/core-module/#gpio"
     },
     {
-      "source": "/software/android-too-old(.*)",
-      "destination": "/docs/software/android/installation"
+      "source": "/software/android-too-old(.*)/",
+      "destination": "/docs/software/android/installation/"
     },
     {
-      "source": "/docs/software/android/android-installation(.*)",
-      "destination": "/docs/software/android/installation"
+      "source": "/docs/software/android/android-installation(.*)/",
+      "destination": "/docs/software/android/installation/"
     },
     {
       "source": "/docs/hardware/devices/Nano%20Series/",
       "destination": "/docs/hardware/devices/nano/"
     },
     {
-      "source": "/docs/hardware/supported-hardware",
-      "destination": "/docs/hardware/devices"
-    },
-    {
-      "source": "/docs/legal/trademark",
-      "destination": "/docs/legal/licensing-and-trademark"
-    },
-    {
-      "source": "/docs/legal/licensing",
-      "destination": "/docs/legal/licensing-and-trademark"
+      "source": "/docs/hardware/supported-hardware/",
+      "destination": "/docs/hardware/devices/"
     },
     {
       "source": "/docs/legal/trademark/",
-      "destination": "/docs/legal/licensing-and-trademark"
+      "destination": "/docs/legal/licensing-and-trademark/"
     },
     {
       "source": "/docs/legal/licensing/",
-      "destination": "/docs/legal/licensing-and-trademark"
-    },
-    {
-      "source": "/docs/software/mqtt",
-      "destination": "/docs/software/integrations/mqtt"
+      "destination": "/docs/legal/licensing-and-trademark/"
     },
     {
       "source": "/docs/software/mqtt/",