diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
index 65886551ca4254..d78ec667d6fabf 100644
--- a/apps/web/middleware.ts
+++ b/apps/web/middleware.ts
@@ -166,36 +166,28 @@ export const config = {
     "/api/auth/signup",
     "/api/trpc/:path*",
     "/login",
-    "/auth/login",
-    "/future/auth/login",
-    /**
-     * Paths required by routingForms.handle
-     */
-    "/apps/routing_forms/:path*",
-
-    "/event-types",
-    "/future/event-types/",
-    "/apps/installed/:category/",
-    "/future/apps/installed/:category/",
-    "/apps/:slug/",
-    "/future/apps/:slug/",
-    "/apps/:slug/setup/",
-    "/future/apps/:slug/setup/",
-    "/apps/categories/",
-    "/future/apps/categories/",
-    "/apps/categories/:category/",
-    "/future/apps/categories/:category/",
+    "/auth/:path*",
+    "/apps/:path*",
+    "/event-types/:path*",
     "/workflows/:path*",
     "/getting-started/:path*",
     "/apps",
     "/bookings/:status/",
     "/video/:path*",
     "/teams",
-    "/future/teams/",
+    "/signup",
     "/settings/:path*",
     "/reschedule/:path*",
     "/availability/:path*",
     "/booking/:path*",
+    "/org/:path*",
+    "/team/:path*",
+    "/booking/:path*",
+    "/payment/:path*",
+    "/router/:path*",
+    "/routing-forms/:path*",
+    "/:user/:type/",
+    "/:user/",
   ],
 };