diff --git a/src/codegen/cli/commands/serve/main.py b/src/codegen/cli/commands/serve/main.py
index c8d0868fd..4c2dbc12e 100644
--- a/src/codegen/cli/commands/serve/main.py
+++ b/src/codegen/cli/commands/serve/main.py
@@ -81,7 +81,7 @@ def create_app_module(file_path: Path) -> str:
     module_name = f"codegen_app_{file_path.stem}"
     module_code = f"""
 from {file_path.stem} import app
-app = app
+app = app.app  # Get the FastAPI instance from the CodegenApp
 """
     module_path = file_path.parent / f"{module_name}.py"
     module_path.write_text(module_code)
diff --git a/src/codegen/extensions/events/codegen_app.py b/src/codegen/extensions/events/codegen_app.py
index 8034b3619..024730168 100644
--- a/src/codegen/extensions/events/codegen_app.py
+++ b/src/codegen/extensions/events/codegen_app.py
@@ -161,15 +161,18 @@ def _setup_routes(self):
         async def _root():
             return await self.root()
 
-        @self.app.post("/{org}/{repo}/slack/events")
+        # @self.app.post("/{org}/{repo}/slack/events")
+        @self.app.post("/slack/events")
         async def _handle_slack_event(request: Request):
             return await self.handle_slack_event(request)
 
-        @self.app.post("/{org}/{repo}/github/events")
+        # @self.app.post("/{org}/{repo}/github/events")
+        @self.app.post("/github/events")
         async def _handle_github_event(request: Request):
             return await self.handle_github_event(request)
 
-        @self.app.post("/{org}/{repo}/linear/events")
+        # @self.app.post("/{org}/{repo}/linear/events")
+        @self.app.post("/linear/events")
         async def handle_linear_event(request: Request):
             return await self.handle_linear_event(request)