diff --git a/modules/server/containers/data/authentik/authentik.yaml b/modules/server/containers/data/authentik/authentik.yaml
index c52a555..e498d6b 100644
--- a/modules/server/containers/data/authentik/authentik.yaml
+++ b/modules/server/containers/data/authentik/authentik.yaml
@@ -4,17 +4,10 @@ metadata:
   labels:
     blueprint-type: core
 entries:
-  # Locate the binding for the root user setup flow and disable it
-  - model: authentik_flows.flowstagebinding
-    identifiers:
-      target: "ak-root-user-fill"
-    attrs:
-      enabled: false
-
   # Optionally, disable the default enrollment flow entirely
   - model: authentik_flows.flow
     identifiers:
-      slug: "default-enrollment-flow"
+      slug: "default-source-enrollment"
     attrs:
       designation: "enrollment"
       enabled: false
@@ -60,3 +53,18 @@ entries:
       path: "users"
       groups:
         - name: "admin"
+
+  # Disable the Initial Setup Flow
+  - model: authentik_flows.flow
+    identifiers:
+      slug: "initial-setup"
+    attrs:
+      authentication: "require_superuser"
+      enabled: false
+
+  # Disable the default 'akadmin' if it exists
+  - model: authentik_core.user
+    identifiers:
+      username: "akadmin"
+    attrs:
+      is_active: false