diff --git a/app/docker/__module.js b/app/docker/__module.js
index 254c6bfc7..f553d3955 100644
--- a/app/docker/__module.js
+++ b/app/docker/__module.js
@@ -104,6 +104,9 @@ angular.module('portainer.docker', ['portainer.app', reactModule]).config([
           controllerAs: 'ctrl',
         },
       },
+      data: {
+        docs: '/user/docker/configs/add',
+      },
     };
 
     const customTemplates = {
@@ -165,7 +168,7 @@ angular.module('portainer.docker', ['portainer.app', reactModule]).config([
         },
       },
       data: {
-        docs: '/user/docker/host',
+        docs: '/user/docker/host/details',
       },
     };
 
@@ -227,6 +230,9 @@ angular.module('portainer.docker', ['portainer.app', reactModule]).config([
           controller: 'BuildImageController',
         },
       },
+      data: {
+        docs: '/user/docker/images/build',
+      },
     };
 
     var imageImport = {
@@ -238,6 +244,9 @@ angular.module('portainer.docker', ['portainer.app', reactModule]).config([
           controller: 'ImportImageController',
         },
       },
+      data: {
+        docs: '/user/docker/images/import',
+      },
     };
 
     var networks = {
@@ -273,6 +282,9 @@ angular.module('portainer.docker', ['portainer.app', reactModule]).config([
           controller: 'CreateNetworkController',
         },
       },
+      data: {
+        docs: '/user/docker/networks/add',
+      },
     };
 
     var nodes = {
@@ -280,7 +292,7 @@ angular.module('portainer.docker', ['portainer.app', reactModule]).config([
       url: '/nodes',
       abstract: true,
       data: {
-        docs: '/user/docker/swarm',
+        docs: '/user/docker/swarm/details',
       },
     };
 
@@ -338,6 +350,9 @@ angular.module('portainer.docker', ['portainer.app', reactModule]).config([
           controller: 'CreateSecretController',
         },
       },
+      data: {
+        docs: '/user/docker/secrets/add',
+      },
     };
 
     var services = {
@@ -374,6 +389,9 @@ angular.module('portainer.docker', ['portainer.app', reactModule]).config([
           controller: 'CreateServiceController',
         },
       },
+      data: {
+        docs: '/user/docker/stacks/add',
+      },
     };
 
     var serviceLogs = {
@@ -444,7 +462,7 @@ angular.module('portainer.docker', ['portainer.app', reactModule]).config([
         },
       },
       data: {
-        docs: '/user/docker/swarm',
+        docs: '/user/docker/swarm/details',
       },
     };
 
@@ -500,7 +518,7 @@ angular.module('portainer.docker', ['portainer.app', reactModule]).config([
         },
       },
       data: {
-        docs: '/user/docker/templates',
+        docs: '/user/docker/templates/application',
       },
     };
 
@@ -549,6 +567,9 @@ angular.module('portainer.docker', ['portainer.app', reactModule]).config([
           controller: 'CreateVolumeController',
         },
       },
+      data: {
+        docs: '/user/docker/volumes/add',
+      },
     };
 
     const dockerFeaturesConfiguration = {
diff --git a/app/docker/react/views/containers.ts b/app/docker/react/views/containers.ts
index 453f49fd9..6e4bac0a6 100644
--- a/app/docker/react/views/containers.ts
+++ b/app/docker/react/views/containers.ts
@@ -85,6 +85,9 @@ function config($stateRegistryProvider: StateRegistry) {
         component: 'createContainerView',
       },
     },
+    data: {
+      docs: '/user/docker/containers/add',
+    },
   });
 
   $stateRegistryProvider.register({
diff --git a/app/edge/__module.js b/app/edge/__module.js
index 27a8faf63..352b912c8 100644
--- a/app/edge/__module.js
+++ b/app/edge/__module.js
@@ -72,6 +72,9 @@ angular
           component: 'createEdgeStackView',
         },
       },
+      data: {
+        docs: '/user/edge/stacks/add',
+      },
     };
 
     const stacksEdit = {
@@ -141,7 +144,7 @@ angular
           },
         },
         data: {
-          docs: '/user/edge/devices',
+          docs: '/user/edge/waiting-room',
         },
       });
     }
@@ -155,7 +158,7 @@ angular
         },
       },
       data: {
-        docs: '/user/edge/templates',
+        docs: '/user/edge/templates/application',
       },
     });
 
diff --git a/app/kubernetes/__module.js b/app/kubernetes/__module.js
index 39168d2ea..68af4628b 100644
--- a/app/kubernetes/__module.js
+++ b/app/kubernetes/__module.js
@@ -140,7 +140,7 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
         },
       },
       data: {
-        docs: '/user/kubernetes/helm',
+        docs: '/user/kubernetes/inspect-helm',
       },
     };
 
@@ -153,7 +153,7 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
         },
       },
       data: {
-        docs: '/user/kubernetes/services',
+        docs: '/user/kubernetes/networking/services',
       },
     };
 
@@ -166,7 +166,7 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
         },
       },
       data: {
-        docs: '/user/kubernetes/ingresses',
+        docs: '/user/kubernetes/networking/ingresses',
       },
     };
 
@@ -178,6 +178,9 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
           component: 'kubernetesIngressesCreateView',
         },
       },
+      data: {
+        docs: '/user/kubernetes/networking/ingresses/add',
+      },
     };
 
     const ingressesEdit = {
@@ -211,6 +214,9 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
           component: 'kubernetesCreateApplicationView',
         },
       },
+      data: {
+        docs: '/user/kubernetes/applications/add',
+      },
     };
 
     const application = {
@@ -221,6 +227,9 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
           component: 'applicationDetailsView',
         },
       },
+      data: {
+        docs: '/user/kubernetes/applications/inspect',
+      },
     };
 
     const applicationEdit = {
@@ -231,6 +240,9 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
           component: 'kubernetesCreateApplicationView',
         },
       },
+      data: {
+        docs: '/user/kubernetes/applications/edit',
+      },
     };
 
     const applicationConsole = {
@@ -317,6 +329,9 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
           component: 'kubernetesCreateConfigMapView',
         },
       },
+      data: {
+        docs: '/user/kubernetes/configurations/add-configmap',
+      },
     };
 
     const configMap = {
@@ -346,6 +361,9 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
           component: 'kubernetesCreateSecretView',
         },
       },
+      data: {
+        docs: '/user/kubernetes/configurations/add-secret',
+      },
     };
 
     const secret = {
@@ -367,7 +385,7 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
         },
       },
       data: {
-        docs: '/user/kubernetes/cluster',
+        docs: '/user/kubernetes/cluster/details',
       },
     };
 
@@ -379,6 +397,9 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
           component: 'kubernetesNodeView',
         },
       },
+      data: {
+        docs: '/user/kubernetes/cluster/node',
+      },
     };
 
     const nodeStats = {
@@ -412,6 +433,9 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
           component: 'kubernetesDeployView',
         },
       },
+      data: {
+        docs: '/user/kubernetes/applications/manifest',
+      },
     };
 
     const resourcePools = {
@@ -435,6 +459,9 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
           component: 'kubernetesCreateNamespaceView',
         },
       },
+      data: {
+        docs: '/user/kubernetes/namespaces/add',
+      },
     };
 
     const resourcePool = {
@@ -445,6 +472,9 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
           component: 'kubernetesResourcePoolView',
         },
       },
+      data: {
+        docs: '/user/kubernetes/namespaces/manage',
+      },
     };
 
     const resourcePoolAccess = {
@@ -455,6 +485,9 @@ angular.module('portainer.kubernetes', ['portainer.app', registriesModule, custo
           component: 'kubernetesResourcePoolAccessView',
         },
       },
+      data: {
+        docs: '/user/kubernetes/namespaces/access',
+      },
     };
 
     const volumes = {
diff --git a/app/kubernetes/custom-templates/index.js b/app/kubernetes/custom-templates/index.js
index 4183cf551..5b83845f3 100644
--- a/app/kubernetes/custom-templates/index.js
+++ b/app/kubernetes/custom-templates/index.js
@@ -37,6 +37,9 @@ function config($stateRegistryProvider) {
     params: {
       fileContent: '',
     },
+    data: {
+      docs: '/user/kubernetes/templates/add',
+    },
   };
 
   const customTemplatesEdit = {
diff --git a/app/portainer/__module.js b/app/portainer/__module.js
index 505a9ec14..8887f2545 100644
--- a/app/portainer/__module.js
+++ b/app/portainer/__module.js
@@ -183,7 +183,7 @@ angular
           },
         },
         data: {
-          docs: '/admin/environments',
+          docs: '/admin/environments/environments',
         },
       };
 
@@ -220,6 +220,9 @@ angular
             component: 'edgeAutoCreateScriptView',
           },
         },
+        data: {
+          docs: '/admin/environments/aeec',
+        },
       };
 
       var addFDOProfile = {
@@ -372,6 +375,9 @@ angular
             component: 'editRegistry',
           },
         },
+        data: {
+          docs: '/admin/registries/edit',
+        },
       };
 
       const registryCreation = {
@@ -382,6 +388,9 @@ angular
             component: 'createRegistry',
           },
         },
+        data: {
+          docs: '/admin/registries/add',
+        },
       };
 
       var settings = {
@@ -450,7 +459,7 @@ angular
           },
         },
         data: {
-          docs: '/admin/users',
+          docs: '/admin/user/users',
           access: AccessHeaders.Restricted, // allow for team leaders
         },
       };
diff --git a/app/portainer/rbac/index.js b/app/portainer/rbac/index.js
index 221d29744..0448c55d7 100644
--- a/app/portainer/rbac/index.js
+++ b/app/portainer/rbac/index.js
@@ -29,7 +29,7 @@ function config($stateRegistryProvider) {
       },
     },
     data: {
-      docs: '/admin/users/roles',
+      docs: '/admin/user/roles',
       access: AccessHeaders.Admin,
     },
   };
diff --git a/app/portainer/react/views/teams.ts b/app/portainer/react/views/teams.ts
index f2134c738..9d8c34c0c 100644
--- a/app/portainer/react/views/teams.ts
+++ b/app/portainer/react/views/teams.ts
@@ -31,7 +31,7 @@ function config($stateRegistryProvider: StateRegistry) {
       },
     },
     data: {
-      docs: '/admin/users/teams',
+      docs: '/admin/user/teams',
       access: AccessHeaders.Restricted, // allow for team leaders
     },
   });
diff --git a/app/portainer/react/views/update-schedules.ts b/app/portainer/react/views/update-schedules.ts
index 92618c49e..73c684d20 100644
--- a/app/portainer/react/views/update-schedules.ts
+++ b/app/portainer/react/views/update-schedules.ts
@@ -36,6 +36,9 @@ function config($stateRegistryProvider: StateRegistry) {
         component: 'updateSchedulesListView',
       },
     },
+    data: {
+      docs: '/admin/environments/update',
+    },
   });
 
   $stateRegistryProvider.register({