diff --git a/website/static/flows/enrollment-2-stage.akflow b/website/static/flows/enrollment-2-stage.akflow
index 68b726154..13b364c87 100644
--- a/website/static/flows/enrollment-2-stage.akflow
+++ b/website/static/flows/enrollment-2-stage.akflow
@@ -133,7 +133,7 @@
                 "pk": "34e1e7d5-8eed-4549-bc7a-305069ff7df0",
                 "target": "773c6673-e4a2-423f-8d32-95b7b4a41cf3",
                 "stage": "20375f30-7fa7-4562-8f6e-0f61889f2963",
-                "order": 0
+                "order": 10
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -145,7 +145,7 @@
                 "pk": "e40467a6-3052-488c-a1b5-1ad7a80fe7b3",
                 "target": "773c6673-e4a2-423f-8d32-95b7b4a41cf3",
                 "stage": "6c342b94-790d-425a-ae31-6196b6570722",
-                "order": 1
+                "order": 11
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -157,7 +157,7 @@
                 "pk": "76bc594e-2715-49ab-bd40-994abd9a7b70",
                 "target": "773c6673-e4a2-423f-8d32-95b7b4a41cf3",
                 "stage": "a4090add-f483-4ac6-8917-10b493ef843e",
-                "order": 2
+                "order": 20
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -169,7 +169,7 @@
                 "pk": "2f324f6d-7646-4108-a6e2-e7f90985477f",
                 "target": "773c6673-e4a2-423f-8d32-95b7b4a41cf3",
                 "stage": "77090897-eb3f-40db-81e6-b4074b1998c4",
-                "order": 3
+                "order": 100
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
diff --git a/website/static/flows/enrollment-email-verification.akflow b/website/static/flows/enrollment-email-verification.akflow
index 24f15ff5c..0eb99c3dd 100644
--- a/website/static/flows/enrollment-email-verification.akflow
+++ b/website/static/flows/enrollment-email-verification.akflow
@@ -154,7 +154,7 @@
                 "pk": "34e1e7d5-8eed-4549-bc7a-305069ff7df0",
                 "target": "773c6673-e4a2-423f-8d32-95b7b4a41cf3",
                 "stage": "20375f30-7fa7-4562-8f6e-0f61889f2963",
-                "order": 0
+                "order": 10
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -166,7 +166,7 @@
                 "pk": "e40467a6-3052-488c-a1b5-1ad7a80fe7b3",
                 "target": "773c6673-e4a2-423f-8d32-95b7b4a41cf3",
                 "stage": "6c342b94-790d-425a-ae31-6196b6570722",
-                "order": 1
+                "order": 11
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -178,7 +178,7 @@
                 "pk": "76bc594e-2715-49ab-bd40-994abd9a7b70",
                 "target": "773c6673-e4a2-423f-8d32-95b7b4a41cf3",
                 "stage": "a4090add-f483-4ac6-8917-10b493ef843e",
-                "order": 2
+                "order": 20
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -190,7 +190,7 @@
                 "pk": "1db34a14-8985-4184-b5c9-254cd585d94f",
                 "target": "773c6673-e4a2-423f-8d32-95b7b4a41cf3",
                 "stage": "096e6282-6b30-4695-bd03-3b143eab5580",
-                "order": 3
+                "order": 30
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -202,7 +202,7 @@
                 "pk": "2f324f6d-7646-4108-a6e2-e7f90985477f",
                 "target": "773c6673-e4a2-423f-8d32-95b7b4a41cf3",
                 "stage": "77090897-eb3f-40db-81e6-b4074b1998c4",
-                "order": 4
+                "order": 40
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
diff --git a/website/static/flows/login-2fa.akflow b/website/static/flows/login-2fa.akflow
index f7eecc83c..180ea3f36 100644
--- a/website/static/flows/login-2fa.akflow
+++ b/website/static/flows/login-2fa.akflow
@@ -39,7 +39,7 @@
         {
             "identifiers": {
                 "pk": "37f709c3-8817-45e8-9a93-80a925d293c2",
-                "name": "default-authentication-flow-totp"
+                "name": "default-authentication-flow-mfa"
             },
             "model": "authentik_stages_authenticator_validate.AuthenticatorValidateStage",
             "attrs": {}
@@ -63,7 +63,7 @@
                 "pk": "a3056482-b692-4e3a-93f1-7351c6a351c7",
                 "target": "563ece21-e9a4-47e5-a264-23ffd923e393",
                 "stage": "5f594f27-0def-488d-9855-fe604eb13de5",
-                "order": 0
+                "order": 10
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -75,7 +75,7 @@
                 "pk": "4e8538cf-3e18-4a68-82ae-6df6725fa2e6",
                 "target": "563ece21-e9a4-47e5-a264-23ffd923e393",
                 "stage": "d8affa62-500c-4c5c-a01f-5835e1ffdf40",
-                "order": 1
+                "order": 20
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -87,7 +87,7 @@
                 "pk": "688aec6f-5622-42c6-83a5-d22072d7e798",
                 "target": "563ece21-e9a4-47e5-a264-23ffd923e393",
                 "stage": "37f709c3-8817-45e8-9a93-80a925d293c2",
-                "order": 2
+                "order": 30
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -99,7 +99,7 @@
                 "pk": "f3fede3a-a9b5-4232-9ec7-be7ff4194b27",
                 "target": "563ece21-e9a4-47e5-a264-23ffd923e393",
                 "stage": "69d41125-3987-499b-8d74-ef27b54b88c8",
-                "order": 3
+                "order": 100
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
diff --git a/website/static/flows/login-conditional-captcha.akflow b/website/static/flows/login-conditional-captcha.akflow
index d7b16a98c..44ffa44ae 100644
--- a/website/static/flows/login-conditional-captcha.akflow
+++ b/website/static/flows/login-conditional-captcha.akflow
@@ -66,7 +66,7 @@
                 "pk": "a3056482-b692-4e3a-93f1-7351c6a351c7",
                 "target": "563ece21-e9a4-47e5-a264-23ffd923e393",
                 "stage": "5f594f27-0def-488d-9855-fe604eb13de5",
-                "order": 0
+                "order": 10
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -78,7 +78,7 @@
                 "pk": "4e8538cf-3e18-4a68-82ae-6df6725fa2e6",
                 "target": "563ece21-e9a4-47e5-a264-23ffd923e393",
                 "stage": "d8affa62-500c-4c5c-a01f-5835e1ffdf40",
-                "order": 1
+                "order": 20
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -90,7 +90,7 @@
                 "pk": "3bcd6af0-48a6-4e18-87f3-d251a1a58226",
                 "target": "563ece21-e9a4-47e5-a264-23ffd923e393",
                 "stage": "a368cafc-1494-45e9-b75b-b5e7ac2bd3e4",
-                "order": 2
+                "order": 30
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -103,7 +103,7 @@
                 "pk": "f3fede3a-a9b5-4232-9ec7-be7ff4194b27",
                 "target": "563ece21-e9a4-47e5-a264-23ffd923e393",
                 "stage": "69d41125-3987-499b-8d74-ef27b54b88c8",
-                "order": 3
+                "order": 100
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
diff --git a/website/static/flows/recovery-email-verification.akflow b/website/static/flows/recovery-email-verification.akflow
index de3568d7e..d3b92c835 100644
--- a/website/static/flows/recovery-email-verification.akflow
+++ b/website/static/flows/recovery-email-verification.akflow
@@ -123,7 +123,7 @@
                 "pk": "7af7558e-2196-4b9f-a08e-d38420b7cfbb",
                 "target": "a5993183-89c0-43d2-a7f4-ddffb17baba7",
                 "stage": "e54045a7-6ecb-4ad9-ad37-28e72d8e565e",
-                "order": 0
+                "order": 10
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -135,7 +135,7 @@
                 "pk": "29446fd6-dd93-4e92-9830-2d81debad5ae",
                 "target": "a5993183-89c0-43d2-a7f4-ddffb17baba7",
                 "stage": "66f948dc-3f74-42b2-b26b-b8b9df109efb",
-                "order": 1
+                "order": 20
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -147,7 +147,7 @@
                 "pk": "1219d06e-2c06-4c5b-a162-78e3959c6cf0",
                 "target": "a5993183-89c0-43d2-a7f4-ddffb17baba7",
                 "stage": "975d5502-1e22-4d10-b560-fbc5bd70ff4d",
-                "order": 2
+                "order": 30
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -159,7 +159,7 @@
                 "pk": "66de86ba-0707-46a0-8475-ff2e260d6935",
                 "target": "a5993183-89c0-43d2-a7f4-ddffb17baba7",
                 "stage": "3909fd60-b013-4668-8806-12e9507dab97",
-                "order": 3
+                "order": 40
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
@@ -171,7 +171,7 @@
                 "pk": "9cec2334-d4a2-4895-a2b2-bc5ae4e9639a",
                 "target": "a5993183-89c0-43d2-a7f4-ddffb17baba7",
                 "stage": "fcdd4206-0d35-4ad2-a59f-5a72422936bb",
-                "order": 4
+                "order": 100
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {
diff --git a/website/static/flows/unenrollment.akflow b/website/static/flows/unenrollment.akflow
index b37d481a6..d14f37e43 100644
--- a/website/static/flows/unenrollment.akflow
+++ b/website/static/flows/unenrollment.akflow
@@ -26,7 +26,7 @@
                 "pk": "eb9aff2b-b95d-40b3-ad08-233aa77bbcf3",
                 "target": "59a576ce-2f23-4a63-b63a-d18dc7e550f5",
                 "stage": "c62ac2a4-2735-4a0f-abd0-8523d68c1209",
-                "order": 0
+                "order": 10
             },
             "model": "authentik_flows.flowstagebinding",
             "attrs": {