diff --git a/config/permissions/ak-p-argocd-admin.yaml b/config/permissions/ak-p-argocd-admin.yaml
deleted file mode 100644
index 22f7078..0000000
--- a/config/permissions/ak-p-argocd-admin.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Permission: admin access to argocd. Bound to the argocd application for
-# access, and mapped to the argocd admin role via the groups claim.
-name: akP-argocd-admin
-application: argocd
diff --git a/config/permissions/ak-p-argocd-user.yaml b/config/permissions/ak-p-argocd-user.yaml
deleted file mode 100644
index b369880..0000000
--- a/config/permissions/ak-p-argocd-user.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Permission: user access to argocd. Bound to the argocd application for
-# access, and mapped to the argocd user role via the groups claim.
-name: akP-argocd-user
-application: argocd
diff --git a/config/permissions/ak-p-grafana-admin.yaml b/config/permissions/ak-p-grafana-admin.yaml
deleted file mode 100644
index 955e29a..0000000
--- a/config/permissions/ak-p-grafana-admin.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Permission: admin access to grafana. Bound to the grafana application for
-# access, and mapped to the grafana admin role via the groups claim.
-name: akP-grafana-admin
-application: grafana
diff --git a/config/permissions/ak-p-grafana-user.yaml b/config/permissions/ak-p-grafana-user.yaml
deleted file mode 100644
index 2092784..0000000
--- a/config/permissions/ak-p-grafana-user.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Permission: user access to grafana. Bound to the grafana application for
-# access, and mapped to the grafana user role via the groups claim.
-name: akP-grafana-user
-application: grafana
diff --git a/config/permissions/ak-p-rancher-admin.yaml b/config/permissions/ak-p-rancher-admin.yaml
deleted file mode 100644
index 1acc5e5..0000000
--- a/config/permissions/ak-p-rancher-admin.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Permission: admin access to rancher. Bound to the rancher application for
-# access, and mapped to the rancher admin role via the groups claim.
-name: akP-rancher-admin
-application: rancher
diff --git a/config/permissions/ak-p-rancher-user.yaml b/config/permissions/ak-p-rancher-user.yaml
deleted file mode 100644
index d596373..0000000
--- a/config/permissions/ak-p-rancher-user.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Permission: user access to rancher. Bound to the rancher application for
-# access, and mapped to the rancher user role via the groups claim.
-name: akP-rancher-user
-application: rancher
diff --git a/config/permissions/akP-argocd-admin.yaml b/config/permissions/akP-argocd-admin.yaml
new file mode 100644
index 0000000..50af97c
--- /dev/null
+++ b/config/permissions/akP-argocd-admin.yaml
@@ -0,0 +1,3 @@
+# Permission group akP-argocd-admin (name = filename). Grants admin
+# access to argocd: bound to the argocd application and mapped to its admin role.
+application: argocd
diff --git a/config/permissions/akP-argocd-user.yaml b/config/permissions/akP-argocd-user.yaml
new file mode 100644
index 0000000..c0ad827
--- /dev/null
+++ b/config/permissions/akP-argocd-user.yaml
@@ -0,0 +1,3 @@
+# Permission group akP-argocd-user (name = filename). Grants user
+# access to argocd: bound to the argocd application and mapped to its user role.
+application: argocd
diff --git a/config/permissions/akP-grafana-admin.yaml b/config/permissions/akP-grafana-admin.yaml
new file mode 100644
index 0000000..ee8ff1f
--- /dev/null
+++ b/config/permissions/akP-grafana-admin.yaml
@@ -0,0 +1,3 @@
+# Permission group akP-grafana-admin (name = filename). Grants admin
+# access to grafana: bound to the grafana application and mapped to its admin role.
+application: grafana
diff --git a/config/permissions/akP-grafana-user.yaml b/config/permissions/akP-grafana-user.yaml
new file mode 100644
index 0000000..718c224
--- /dev/null
+++ b/config/permissions/akP-grafana-user.yaml
@@ -0,0 +1,3 @@
+# Permission group akP-grafana-user (name = filename). Grants user
+# access to grafana: bound to the grafana application and mapped to its user role.
+application: grafana
diff --git a/config/permissions/akP-rancher-admin.yaml b/config/permissions/akP-rancher-admin.yaml
new file mode 100644
index 0000000..e312834
--- /dev/null
+++ b/config/permissions/akP-rancher-admin.yaml
@@ -0,0 +1,3 @@
+# Permission group akP-rancher-admin (name = filename). Grants admin
+# access to rancher: bound to the rancher application and mapped to its admin role.
+application: rancher
diff --git a/config/permissions/akP-rancher-user.yaml b/config/permissions/akP-rancher-user.yaml
new file mode 100644
index 0000000..e59c1d1
--- /dev/null
+++ b/config/permissions/akP-rancher-user.yaml
@@ -0,0 +1,3 @@
+# Permission group akP-rancher-user (name = filename). Grants user
+# access to rancher: bound to the rancher application and mapped to its user role.
+application: rancher
diff --git a/config/roles/ak-r-global-admin.yaml b/config/roles/ak-r-global-admin.yaml
deleted file mode 100644
index d9d0a7a..0000000
--- a/config/roles/ak-r-global-admin.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Role: full admin across all onboarded apps. Assign users here for org-wide admin.
-name: akR-global-admin
-is_superuser: false
-permissions:
-  - ak-p-grafana-admin
-  - ak-p-argocd-admin
-  - ak-p-rancher-admin
diff --git a/config/roles/ak-r-standard-user.yaml b/config/roles/ak-r-standard-user.yaml
deleted file mode 100644
index 8e21d35..0000000
--- a/config/roles/ak-r-standard-user.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Role: standard (non-admin) access across all onboarded apps.
-name: akR-standard-user
-permissions:
-  - ak-p-grafana-user
-  - ak-p-argocd-user
-  - ak-p-rancher-user
diff --git a/config/roles/akR-global-admin.yaml b/config/roles/akR-global-admin.yaml
new file mode 100644
index 0000000..cb24e50
--- /dev/null
+++ b/config/roles/akR-global-admin.yaml
@@ -0,0 +1,5 @@
+# Role akR-global-admin (name = filename): full admin across all onboarded apps.
+permissions:
+  - akP-grafana-admin
+  - akP-argocd-admin
+  - akP-rancher-admin
diff --git a/config/roles/akR-standard-user.yaml b/config/roles/akR-standard-user.yaml
new file mode 100644
index 0000000..14b8836
--- /dev/null
+++ b/config/roles/akR-standard-user.yaml
@@ -0,0 +1,5 @@
+# Role akR-standard-user (name = filename): standard (non-admin) access everywhere.
+permissions:
+  - akP-grafana-user
+  - akP-argocd-user
+  - akP-rancher-user
diff --git a/modules/authentik/main.tf b/modules/authentik/main.tf
index 69f6e8f..fa84126 100644
--- a/modules/authentik/main.tf
+++ b/modules/authentik/main.tf
@@ -12,7 +12,7 @@ resource "authentik_group" "this" {
 resource "authentik_group" "permission" {
   for_each = var.permission_groups
 
-  name       = each.value.name
+  name       = each.key
   attributes = jsonencode(each.value.attributes)
 }
 
@@ -23,21 +23,22 @@ resource "authentik_group" "permission" {
 resource "authentik_group" "role" {
   for_each = var.role_groups
 
-  name         = each.value.name
+  name         = each.key
   is_superuser = each.value.is_superuser
   parents      = [for p in each.value.permissions : authentik_group.permission[p].id]
   attributes   = jsonencode(each.value.attributes)
 }
 
-# Expand the OIDC `groups` claim to include inherited (ancestor) groups. The
-# default profile mapping only emits direct groups (goauthentik/authentik#15579),
-# so a member of a role group would not see the permission groups it nests. This
-# walks each of the user's direct groups up through `.parents` and emits the full
-# set of names, so role -> permission nesting drives in-app roles. Only evaluated
-# when a provider requests the `groups` scope.
+# Emit an `ak_groups` claim containing the user's groups AND all inherited
+# (ancestor) groups, so role -> permission nesting reaches apps. The default
+# profile mapping only emits *direct* groups under `groups`
+# (goauthentik/authentik#15579); we use a distinct claim key so there is no
+# collision with that (Authentik dict-overrides same-key claims in an
+# unpredictable order). Apps request the `ak_groups` scope and read the
+# `ak_groups` claim. Walks each direct group up through `.parents`.
 resource "authentik_property_mapping_provider_scope" "groups_hierarchical" {
-  name       = "unkin: groups (hierarchical)"
-  scope_name = "groups"
+  name       = "unkin: ak_groups (hierarchical)"
+  scope_name = "ak_groups"
   expression = <<-EOT
     groups = {}
     pending = list(user.ak_groups.all())
@@ -47,7 +48,7 @@ resource "authentik_property_mapping_provider_scope" "groups_hierarchical" {
             continue
         groups[grp.pk] = grp.name
         pending += list(grp.parents.all())
-    return {"groups": sorted(groups.values())}
+    return {"ak_groups": sorted(groups.values())}
   EOT
 }
 
diff --git a/modules/authentik/variables.tf b/modules/authentik/variables.tf
index 86bc700..3569aec 100644
--- a/modules/authentik/variables.tf
+++ b/modules/authentik/variables.tf
@@ -16,9 +16,9 @@ variable "groups" {
 # role is an effective member of every permission it grants (Authentik membership
 # propagates child -> parent). Split into two variables/resources so roles can
 # reference permission group ids without the authentik_group self-reference error.
+# The group name is the map key (the config filename); no `name` field needed.
 variable "permission_groups" {
   type = map(object({
-    name = string
     # slug of the oauth2 application this permission grants *access* to; when set,
     # a policy binding is created gating that app to this group (and its children).
     application = optional(string, null)
@@ -29,7 +29,6 @@ variable "permission_groups" {
 
 variable "role_groups" {
   type = map(object({
-    name = string
     # keys into var.permission_groups that this role nests (becomes its parents).
     permissions  = optional(list(string), [])
     is_superuser = optional(bool, false)