diff --git a/modules/server/containers/data/authentik/homepage.yaml b/modules/server/containers/data/authentik/homepage.yaml
index b182aa6..fc85c90 100644
--- a/modules/server/containers/data/authentik/homepage.yaml
+++ b/modules/server/containers/data/authentik/homepage.yaml
@@ -75,33 +75,28 @@ entries:
       open_in_new_tab: false
 
   # 3. Provision the static API token linked to the user account
+  - model: authentik_rbac.role
+    state: present
+    identifiers:
+      name: homepage-viewer
+    attrs:
+      permissions:
+        - authentik_core.view_user
+        - authentik_events.view_event
+
   - model: authentik_core.user
     state: present
     identifiers:
       username: homepage-svc
     attrs:
-      name: Homepage Dashboard Service Account
+      roles:
+        - !Find [authentik_rbac.role, [name, "homepage-viewer"]]
+      name: Homepage Service Account
       path: goauthentik.io/service-accounts
       is_active: true
       attributes:
         goauthentik.io/user/service-account: true
 
-  - model: authentik_policies.policybinding
-    state: present
-    identifiers:
-      user: !Find [authentik_core.user, [username, "homepage-svc"]]
-      permission: authentik_core.view_user
-    attrs:
-      enabled: true
-
-  - model: authentik_policies.policybinding
-    state: present
-    identifiers:
-      user: !Find [authentik_core.user, [username, "homepage-svc"]]
-      permission: authentik_events.view_event
-    attrs:
-      enabled: true
-
   - model: authentik_core.token
     state: present
     identifiers: