diff --git a/core/modules/user/user.links.menu.yml b/core/modules/user/user.links.menu.yml
index bceb59b..12f1f0a 100644
--- a/core/modules/user/user.links.menu.yml
+++ b/core/modules/user/user.links.menu.yml
@@ -26,3 +26,16 @@ entity.user.admin_form:
   description: 'Configure default user account settings, including fields, registration requirements, and email messages.'
   weight: -10
   route_name: entity.user.admin_form
+user.admin_permissions:
+  title: 'Permissions'
+  parent: user.admin_index
+  description: 'Configure permissions per module and per role.'
+  weight: -9
+  route_name: user.admin_permissions
+entity.user_role.collection:
+  title: 'Roles'
+  parent: user.admin_index
+  description: 'Create roles and configure their permissions.'
+  weight: -8
+  route_name: entity.user_role.collection
+
diff --git a/core/modules/user/user.links.task.yml b/core/modules/user/user.links.task.yml
index 5b0d164..ce58387 100644
--- a/core/modules/user/user.links.task.yml
+++ b/core/modules/user/user.links.task.yml
@@ -38,14 +38,3 @@ entity.user.collection:
   title: List
   route_name: entity.user.collection
   base_route: entity.user.collection
-
-user.admin_permissions:
-  title: Permissions
-  route_name: user.admin_permissions
-  base_route: entity.user.collection
-
-entity.user_role.collection:
-  title: 'Roles'
-  route_name: entity.user_role.collection
-  base_route: entity.user.collection
-  weight: 10
diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml
index 319f219..e54a024 100644
--- a/core/modules/user/user.routing.yml
+++ b/core/modules/user/user.routing.yml
@@ -46,7 +46,7 @@ user.admin_create:
     _permission: 'administer users'
 
 user.admin_permissions:
-  path: '/admin/people/permissions'
+  path: '/admin/config/people/permissions'
   defaults:
     _form: '\Drupal\user\Form\UserPermissionsForm'
     _title: 'Permissions'
@@ -70,7 +70,7 @@ user.multiple_cancel_confirm:
     _permission: 'administer users'
 
 entity.user_role.collection:
-  path: '/admin/people/roles'
+  path: '/admin/config/people/roles'
   defaults:
     _entity_list: 'user_role'
     _title: 'Roles'