diff --git a/clients/python/README.md b/clients/python/README.md
index 558375a8a..d20d0f40a 100644
--- a/clients/python/README.md
+++ b/clients/python/README.md
@@ -26,7 +26,7 @@ import asyncio
 
 async def main():
     # Create a client connected to your RivetKit manager
-    client = ActorClient("http://localhost:6420")
+    client = ActorClient("http://localhost:8080")
 
     # Connect to a chat room actor
     chat_room = await client.get("chat-room", tags=[("room", "general")])
diff --git a/clients/rust/README.md b/clients/rust/README.md
index bc15893fd..0b47fa284 100644
--- a/clients/rust/README.md
+++ b/clients/rust/README.md
@@ -31,7 +31,7 @@ use serde_json::json;
 async fn main() -> anyhow::Result<()> {
     // Create a client connected to your RivetKit manager
     let client = Client::new(
-        "http://localhost:6420",
+        "http://localhost:8080",
         TransportKind::Sse,
         EncodingKind::Json
     );
diff --git a/docs/actors/actions.mdx b/docs/actors/actions.mdx
index ae560d102..71de3ea9b 100644
--- a/docs/actors/actions.mdx
+++ b/docs/actors/actions.mdx
@@ -72,7 +72,7 @@ Calling actions from the client is simple:
 import { createClient } from "rivetkit/client";
 import type { App } from "./src/index";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 const counter = await client.counter.get();
 const result = await counter.increment(42);
 console.log(result); // The value returned by the action
@@ -114,7 +114,7 @@ export type Registry = typeof registry;
 import { createClient } from "rivetkit/client";
 import type { App } from "./src/index";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 
 // Type-safe client usage
 const counter = await client.counter.get();
diff --git a/docs/actors/connections.mdx b/docs/actors/connections.mdx
index 92cd30b84..2246b49bb 100644
--- a/docs/actors/connections.mdx
+++ b/docs/actors/connections.mdx
@@ -42,7 +42,7 @@ const gameRoom = actor({
 import { createClient } from "rivetkit/client";
 import type { App } from "./src/index";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 const gameRoom = await client.gameRoom.get({
   params: { authToken: "supersekure" }
 });
diff --git a/docs/actors/events.mdx b/docs/actors/events.mdx
index 6a9572001..ba35a543b 100644
--- a/docs/actors/events.mdx
+++ b/docs/actors/events.mdx
@@ -34,7 +34,7 @@ const chatRoom = actor({
 import { createClient } from "rivetkit/client";
 import type { App } from "./src/index";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 const chatRoom = await client.chatRoom.get();
 await chatRoom.sendMessage('Hello, world!');
 ```
@@ -67,7 +67,7 @@ const chatRoom = actor({
 import { createClient } from "rivetkit/client";
 import type { App } from "./src/index";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 const chatRoom = await client.chatRoom.get();
 await chatRoom.sendPrivateMessage(123, 'Hello, world!');
 ```
@@ -90,7 +90,7 @@ Clients can subscribe to events that will happen repeatedly using `actor.on(name
 import { createClient } from "rivetkit/client";
 import type { App } from "./src/index";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 const chatRoom = await client.chatRoom.get();
 
 chatRoom.on('newMessage', ({ message }) => {
@@ -125,7 +125,7 @@ Clients can listen for an event only one time with `actor.once(name, callback)`.
 import { createClient } from "rivetkit/client";
 import type { App } from "./src/index";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 const chatRoom = await client.chatRoom.get();
 
 chatRoom.once('joinRequestApproved', () => {
diff --git a/docs/actors/metadata.mdx b/docs/actors/metadata.mdx
index fb5e37a01..71342f51e 100644
--- a/docs/actors/metadata.mdx
+++ b/docs/actors/metadata.mdx
@@ -56,7 +56,7 @@ export default chatRoom;
 import { createClient } from "rivetkit/client";
 import type { App } from "./src/index";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 
 // Connect to a specific channel
 const randomChannel = await client.chatRoom.get({ channel: "random" });
diff --git a/docs/actors/overview.mdx b/docs/actors/overview.mdx
index 066f8bde9..81d0a3da4 100644
--- a/docs/actors/overview.mdx
+++ b/docs/actors/overview.mdx
@@ -220,7 +220,7 @@ await client.chatRoom.get({ channel: "random" });
 import { createClient } from "rivetkit/client";
 import type { App } from "./src/index";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 
 // Game room with ID parameter
 const gameRoom = await client.gameRoom.get({ roomId: "ABC123" });
diff --git a/docs/actors/quickstart-frontend.mdx b/docs/actors/quickstart-frontend.mdx
index 5fb37a858..1794e7ea2 100644
--- a/docs/actors/quickstart-frontend.mdx
+++ b/docs/actors/quickstart-frontend.mdx
@@ -52,7 +52,7 @@ import { useState } from "react";
 import { createClient, createRivetKit } from "@rivetkit/react";
 import type { Registry } from "../backend/registry";
 
-const client = createClient<Registry>(`http://localhost:6420/registry`);
+const client = createClient<Registry>(`http://localhost:8080/registry`);
 const { useActor } = createRivetKit(client);
 
 function App() {
diff --git a/docs/clients/javascript.mdx b/docs/clients/javascript.mdx
index 3d42dff86..51efe3736 100644
--- a/docs/clients/javascript.mdx
+++ b/docs/clients/javascript.mdx
@@ -82,7 +82,7 @@ The RivetKit JavaScript client allows you to connect to and interact with actors
 
     async function main() {
       // Replace with your endpoint URL after deployment
-      const client = createClient<App>("http://localhost:6420");
+      const client = createClient<App>("http://localhost:8080");
 
       // Get or create a actor instance
       const counter = await client.counter.get();
diff --git a/docs/clients/python.mdx b/docs/clients/python.mdx
index 4fd8e009b..829ee1560 100644
--- a/docs/clients/python.mdx
+++ b/docs/clients/python.mdx
@@ -51,7 +51,7 @@ The RivetKit Python client provides a way to connect to and interact with actors
 
         async def main():
             # Replace with your endpoint URL after deployment
-            client = AsyncClient("http://localhost:6420")
+            client = AsyncClient("http://localhost:8080")
             
             # Get or create a actor instance
             counter = await client.get("counter")
@@ -80,7 +80,7 @@ The RivetKit Python client provides a way to connect to and interact with actors
         from rivetkit_client import Client
 
         # Replace with your endpoint URL after deployment
-        client = Client("http://localhost:6420")
+        client = Client("http://localhost:8080")
         
         # Get or create a actor instance
         counter = client.get("counter")
diff --git a/docs/clients/rust.mdx b/docs/clients/rust.mdx
index 476101c86..b20fe85bd 100644
--- a/docs/clients/rust.mdx
+++ b/docs/clients/rust.mdx
@@ -49,7 +49,7 @@ The RivetKit Rust client provides a way to connect to and interact with actors f
     async fn main() -> Result<(), Box<dyn std::error::Error>> {
         // Replace with your endpoint URL after deployment
         let client = Client::new(
-            "http://localhost:6420",
+            "http://localhost:8080",
             TransportKind::Sse,
             EncodingKind::Json
         );
diff --git a/docs/concepts/edge.mdx b/docs/concepts/edge.mdx
index b6879433f..535133a97 100644
--- a/docs/concepts/edge.mdx
+++ b/docs/concepts/edge.mdx
@@ -23,7 +23,7 @@ The region a actor is created in can be overridden using region options:
 import { createClient } from "rivetkit/client";
 import type { App } from "./src/index";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 
 // Create actor in a specific region
 const actor = await client.example.get({
diff --git a/docs/concepts/interacting-with-workers.mdx b/docs/concepts/interacting-with-workers.mdx
index f1fbb7ffd..ab6809eb5 100644
--- a/docs/concepts/interacting-with-workers.mdx
+++ b/docs/concepts/interacting-with-workers.mdx
@@ -23,7 +23,7 @@ use rivetkit_client::{Client, EncodingKind, GetOrCreateOptions, TransportKind};
 
 // Create a client with connection address and configuration
 let client = Client::new(
-    "http://localhost:6420",              // Connection address
+    "http://localhost:8080",              // Connection address
     TransportKind::WebSocket,             // Transport (WebSocket or SSE)
     EncodingKind::Cbor,                   // Encoding (Json or Cbor)
 );
@@ -33,7 +33,7 @@ let client = Client::new(
 from rivetkit_client import AsyncClient as ActorClient
 
 # Create a client with the connection address
-client = ActorClient("http://localhost:6420")
+client = ActorClient("http://localhost:8080")
 ```
 </CodeGroup>
 
diff --git a/docs/concepts/overview.mdx b/docs/concepts/overview.mdx
index caff5e9f2..80b1d9299 100644
--- a/docs/concepts/overview.mdx
+++ b/docs/concepts/overview.mdx
@@ -200,7 +200,7 @@ await client.chatRoom.get({ channel: "random" });
 import { createClient } from "rivetkit/client";
 import type { App } from "./src/index";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 
 // Game room with ID parameter
 const gameRoom = await client.gameRoom.get({ roomId: "ABC123" });
diff --git a/docs/frameworks/react.mdx b/docs/frameworks/react.mdx
index dbb148ec9..df00004a6 100644
--- a/docs/frameworks/react.mdx
+++ b/docs/frameworks/react.mdx
@@ -76,7 +76,7 @@ Learn how to create realtime, stateful React applications with RivetKit's actor
     import React, { useState } from "react";
 
     // Replace with your endpoint URL after deployment
-    const client = createClient<App>("http://localhost:6420");
+    const client = createClient<App>("http://localhost:8080");
     const { useActor, useActorEvent } = createReactRivetKit(client);
 
     function App() {
@@ -218,7 +218,7 @@ import type { App } from "../actors/app";
 import { useState } from "react";
 
 // Connect to RivetKit
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 function Counter() {
diff --git a/docs/integrations/hono.mdx b/docs/integrations/hono.mdx
index fb3c1cea2..5228b91e9 100644
--- a/docs/integrations/hono.mdx
+++ b/docs/integrations/hono.mdx
@@ -139,13 +139,13 @@ export type Registry = typeof registry;
 // Create server with the combined app
 const server = serve({
   fetch: honoApp.fetch,
-  port: 6420,
+  port: 8080,
 });
 
 // IMPORTANT: Inject the websocket handler into the server
 injectWebSocket(server);
 
-console.log("Server running at http://localhost:6420");
+console.log("Server running at http://localhost:8080");
 ```
 
 Make sure to update your client connection URL to include the custom path:
@@ -155,7 +155,7 @@ Make sure to update your client connection URL to include the custom path:
 import { createClient } from "rivetkit/client";
 import type { App } from "./src/index";
 
-const client = createClient<App>("http://localhost:6420/my-path");
+const client = createClient<App>("http://localhost:8080/my-path");
 ```
 
 ### Bun
@@ -190,7 +190,7 @@ export type Registry = typeof registry;
 
 // Create and start the server
 export default {
-  port: 6420,
+  port: 8080,
   fetch: honoApp.fetch,
   // IMPORTANT: Pass the webSocketHandler to Bun
   websocket: webSocketHandler,
@@ -204,5 +204,5 @@ Make sure to update your client connection URL to include the custom path:
 import { createClient } from "rivetkit/client";
 import type { App } from "./src/index";
 
-const client = createClient<App>("http://localhost:6420/my-path");
+const client = createClient<App>("http://localhost:8080/my-path");
 ```
diff --git a/docs/snippets/examples/ai-agent-react.mdx b/docs/snippets/examples/ai-agent-react.mdx
index 13d6e7e14..3caba8b38 100644
--- a/docs/snippets/examples/ai-agent-react.mdx
+++ b/docs/snippets/examples/ai-agent-react.mdx
@@ -5,7 +5,7 @@ import { useState, useEffect } from "react";
 import type { App } from "../actors/app";
 import type { Message } from "./actor";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function AIAssistant() {
diff --git a/docs/snippets/examples/chat-room-react.mdx b/docs/snippets/examples/chat-room-react.mdx
index 4c6391794..e48e607fa 100644
--- a/docs/snippets/examples/chat-room-react.mdx
+++ b/docs/snippets/examples/chat-room-react.mdx
@@ -5,7 +5,7 @@ import { useState, useEffect } from "react";
 import type { App } from "../actors/app";
 import type { Message } from "./actor";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function ChatRoom({ roomId = "general" }) {
diff --git a/docs/snippets/examples/crdt-react.mdx b/docs/snippets/examples/crdt-react.mdx
index e3275e185..1b25355eb 100644
--- a/docs/snippets/examples/crdt-react.mdx
+++ b/docs/snippets/examples/crdt-react.mdx
@@ -6,7 +6,7 @@ import * as Y from 'yjs';
 import { applyUpdate, encodeStateAsUpdate } from 'yjs';
 import type { App } from "../actors/app";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function YjsEditor({ documentId = "shared-doc" }) {
diff --git a/docs/snippets/examples/database-react.mdx b/docs/snippets/examples/database-react.mdx
index 7963d3898..3ac08e53b 100644
--- a/docs/snippets/examples/database-react.mdx
+++ b/docs/snippets/examples/database-react.mdx
@@ -3,7 +3,7 @@ import { createClient } from "rivetkit/client";
 import { createReactRivetKit } from "@rivetkit/react";
 import { useState, useEffect } from "react";
 
-const client = createClient("http://localhost:6420");
+const client = createClient("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function NotesApp({ userId }: { userId: string }) {
diff --git a/docs/snippets/examples/document-react.mdx b/docs/snippets/examples/document-react.mdx
index 42e862596..fb6cb38a1 100644
--- a/docs/snippets/examples/document-react.mdx
+++ b/docs/snippets/examples/document-react.mdx
@@ -4,7 +4,7 @@ import { createReactRivetKit } from "@rivetkit/react";
 import { useState, useEffect } from "react";
 import type { App } from "../actors/app";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function DocumentEditor() {
diff --git a/docs/snippets/examples/game-react.mdx b/docs/snippets/examples/game-react.mdx
index 6767869ec..e862b83b4 100644
--- a/docs/snippets/examples/game-react.mdx
+++ b/docs/snippets/examples/game-react.mdx
@@ -4,7 +4,7 @@ import { createReactRivetKit } from "@rivetkit/react";
 import { useState, useEffect, useRef } from "react";
 import type { Player } from "./actor";
 
-const client = createClient("http://localhost:6420");
+const client = createClient("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function MultiplayerGame() {
diff --git a/docs/snippets/examples/rate-react.mdx b/docs/snippets/examples/rate-react.mdx
index 29d9af3c5..68f79fc19 100644
--- a/docs/snippets/examples/rate-react.mdx
+++ b/docs/snippets/examples/rate-react.mdx
@@ -4,7 +4,7 @@ import { createReactRivetKit } from "@rivetkit/react";
 import { useState } from "react";
 import type { App } from "../actors/app";
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 const { useActor } = createReactRivetKit(client);
 
 export function RateLimiter() {
diff --git a/docs/snippets/examples/stream-react.mdx b/docs/snippets/examples/stream-react.mdx
index d2d860a5c..dd5dea177 100644
--- a/docs/snippets/examples/stream-react.mdx
+++ b/docs/snippets/examples/stream-react.mdx
@@ -5,7 +5,7 @@ import { useState, useEffect } from "react";
 import type { App } from "../actors/app";
 import type { StreamState } from "./actor"; // Import shared types from actor
 
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function StreamExample() {
diff --git a/docs/snippets/examples/sync-react.mdx b/docs/snippets/examples/sync-react.mdx
index 8859d0c50..4c50c86f7 100644
--- a/docs/snippets/examples/sync-react.mdx
+++ b/docs/snippets/examples/sync-react.mdx
@@ -4,7 +4,7 @@ import { createReactRivetKit } from "@rivetkit/react";
 import { useState, useEffect, useRef } from "react";
 import type { Contact } from "./actor";
 
-const client = createClient("http://localhost:6420");
+const client = createClient("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function ContactsApp() {
diff --git a/docs/snippets/examples/tenant-react.mdx b/docs/snippets/examples/tenant-react.mdx
index a2b09d33d..da58230db 100644
--- a/docs/snippets/examples/tenant-react.mdx
+++ b/docs/snippets/examples/tenant-react.mdx
@@ -5,7 +5,7 @@ import { useState, useEffect } from "react";
 import type { App } from "../actors/app";
 
 // Create client and hooks
-const client = createClient<App>("http://localhost:6420");
+const client = createClient<App>("http://localhost:8080");
 const { useActor } = createReactRivetKit(client);
 
 export function OrgDashboard({ orgId }: { orgId: string }) {
diff --git a/examples/better-auth/README.md b/examples/better-auth/README.md
index d4f52af4f..beef4719a 100644
--- a/examples/better-auth/README.md
+++ b/examples/better-auth/README.md
@@ -27,7 +27,7 @@ npm install
 npm run dev
 ```
 
-Open your browser to `http://localhost:5173` to see the frontend and the backend will be running on `http://localhost:6420`.
+Open your browser to `http://localhost:5173` to see the frontend and the backend will be running on `http://localhost:8080`.
 
 ## Features
 
@@ -52,4 +52,4 @@ Open your browser to `http://localhost:5173` to see the frontend and the backend
 
 ## License
 
-Apache 2.0
\ No newline at end of file
+Apache 2.0
diff --git a/examples/better-auth/src/backend/server.ts b/examples/better-auth/src/backend/server.ts
index de9d06abe..62437f6b7 100644
--- a/examples/better-auth/src/backend/server.ts
+++ b/examples/better-auth/src/backend/server.ts
@@ -49,6 +49,6 @@
 // 	}
 // });
 //
-// serve({ fetch: app.fetch, port: 6420 }, () =>
-// 	console.log("Listening at http://localhost:6420"),
+// serve({ fetch: app.fetch, port: 8080 }, () =>
+// 	console.log("Listening at http://localhost:8080"),
 // );
diff --git a/examples/better-auth/src/frontend/auth-client.ts b/examples/better-auth/src/frontend/auth-client.ts
index c3ead35b8..8756bb2da 100644
--- a/examples/better-auth/src/frontend/auth-client.ts
+++ b/examples/better-auth/src/frontend/auth-client.ts
@@ -1,5 +1,5 @@
 // import { createAuthClient } from "better-auth/react";
 //
 // export const authClient = createAuthClient({
-// 	baseURL: "http://localhost:6420",
+// 	baseURL: "http://localhost:8080",
 // });
diff --git a/examples/better-auth/src/frontend/components/ChatRoom.tsx b/examples/better-auth/src/frontend/components/ChatRoom.tsx
index e6d551a03..cf6a840a8 100644
--- a/examples/better-auth/src/frontend/components/ChatRoom.tsx
+++ b/examples/better-auth/src/frontend/components/ChatRoom.tsx
@@ -3,7 +3,7 @@ import { createClient, createRivetKit } from "@rivetkit/react";
 import { authClient } from "../auth-client";
 import type { Registry } from "../../backend/registry";
 
-const client = createClient<Registry>("http://localhost:6420/registry", {
+const client = createClient<Registry>("http://localhost:8080/registry", {
 	transport: "sse",
 });
 
@@ -156,4 +156,4 @@ export function ChatRoom({ user, onSignOut }: ChatRoomProps) {
 			</div>
 		</div>
 	);
-}
\ No newline at end of file
+}
diff --git a/examples/chat-room/scripts/cli.ts b/examples/chat-room/scripts/cli.ts
index f90d23c13..c794062f2 100644
--- a/examples/chat-room/scripts/cli.ts
+++ b/examples/chat-room/scripts/cli.ts
@@ -6,7 +6,7 @@ async function main() {
 	const { username, room } = await initPrompt();
 
 	// Create type-aware client
-	const client = createClient<Registry>("http://localhost:6420");
+	const client = createClient<Registry>("http://localhost:8080");
 
 	// connect to chat room - now accessed via property
 	// can still pass parameters like room
diff --git a/examples/chat-room/scripts/connect.ts b/examples/chat-room/scripts/connect.ts
index 1ee9496c9..ce7c4a7b2 100644
--- a/examples/chat-room/scripts/connect.ts
+++ b/examples/chat-room/scripts/connect.ts
@@ -4,7 +4,7 @@ import type { Registry } from "../actors/registry";
 
 async function main() {
 	// Create type-aware client
-	const client = createClient<Registry>(process.env.ENDPOINT ?? "http://localhost:6420");
+	const client = createClient<Registry>(process.env.ENDPOINT ?? "http://localhost:8080");
 
 	// connect to chat room - now accessed via property
 	const chatRoom = client.chatRoom.getOrCreate().connect();
diff --git a/examples/elysia/src/server.ts b/examples/elysia/src/server.ts
index d51532385..362e1100e 100644
--- a/examples/elysia/src/server.ts
+++ b/examples/elysia/src/server.ts
@@ -20,6 +20,6 @@
 //
 // 		return `New Count: ${newCount}`;
 // 	})
-// 	.listen(6420);
+// 	.listen(8080);
 //
-// console.log("Listening at http://localhost:6420");
+// console.log("Listening at http://localhost:8080");
diff --git a/examples/express/src/server.ts b/examples/express/src/server.ts
index c0c5ebcee..b5d577b50 100644
--- a/examples/express/src/server.ts
+++ b/examples/express/src/server.ts
@@ -20,6 +20,6 @@ app.post("/increment/:name", async (req, res) => {
 	res.send(`New Count: ${newCount}`);
 });
 
-app.listen(6420, () => {
-	console.log("Listening at http://localhost:6420");
+app.listen(8080, () => {
+	console.log("Listening at http://localhost:8080");
 });
diff --git a/examples/hono-react/src/backend/server.ts b/examples/hono-react/src/backend/server.ts
index 66d3e6b97..d0304713e 100644
--- a/examples/hono-react/src/backend/server.ts
+++ b/examples/hono-react/src/backend/server.ts
@@ -28,6 +28,6 @@
 // 	return c.text(`New Count: ${newCount}`);
 // });
 //
-// serve({ fetch: app.fetch, port: 6420 }, () =>
-// 	console.log("Listening at http://localhost:6420"),
+// serve({ fetch: app.fetch, port: 8080 }, () =>
+// 	console.log("Listening at http://localhost:8080"),
 // );
diff --git a/examples/hono-react/src/frontend/App.tsx b/examples/hono-react/src/frontend/App.tsx
index fe27125ff..d8fc9ff06 100644
--- a/examples/hono-react/src/frontend/App.tsx
+++ b/examples/hono-react/src/frontend/App.tsx
@@ -2,7 +2,7 @@
 // import { createClient, createRivetKit } from "@rivetkit/react";
 // import type { Registry } from "../backend/registry";
 //
-// const client = createClient<Registry>("http://localhost:6420/registry", {
+// const client = createClient<Registry>("http://localhost:8080/registry", {
 // 	transport: "sse",
 // });
 // const { useActor } = createRivetKit(client);
diff --git a/examples/react/src/frontend/App.tsx b/examples/react/src/frontend/App.tsx
index 97a1c0eef..16d803746 100644
--- a/examples/react/src/frontend/App.tsx
+++ b/examples/react/src/frontend/App.tsx
@@ -2,7 +2,7 @@
 // import { createClient, createRivetKit } from "@rivetkit/react";
 // import type { Registry } from "../backend/registry";
 //
-// const client = createClient<Registry>(`http://localhost:6420/registry`);
+// const client = createClient<Registry>(`http://localhost:8080/registry`);
 // const { useActor } = createRivetKit(client);
 //
 // function App() {
diff --git a/examples/rivet/README.md b/examples/rivet/README.md
index 5b0bcd942..72a1e4b7d 100644
--- a/examples/rivet/README.md
+++ b/examples/rivet/README.md
@@ -39,7 +39,7 @@ export RIVET_ENVIRONMENT=your_environment
 npm run dev
 ```
 
-This will start the RivetKit server locally at http://localhost:6420.
+This will start the RivetKit server locally at http://localhost:8080.
 
 ### Testing the Client
 
diff --git a/examples/snippets/ai-agent/App.tsx b/examples/snippets/ai-agent/App.tsx
index db1d67473..543f089b7 100644
--- a/examples/snippets/ai-agent/App.tsx
+++ b/examples/snippets/ai-agent/App.tsx
@@ -4,7 +4,7 @@ import { useState, useEffect } from "react";
 import type { Registry } from "../actors/registry";
 import type { Message } from "./actor";
 
-const client = createClient<Registry>("http://localhost:6420");
+const client = createClient<Registry>("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function AIAssistant() {
diff --git a/examples/snippets/chat-room/App.tsx b/examples/snippets/chat-room/App.tsx
index 8371e4589..ac2746656 100644
--- a/examples/snippets/chat-room/App.tsx
+++ b/examples/snippets/chat-room/App.tsx
@@ -4,7 +4,7 @@ import { useState, useEffect } from "react";
 import type { Registry } from "../actors/registry";
 import type { Message } from "./actor";
 
-const client = createClient<Registry>("http://localhost:6420");
+const client = createClient<Registry>("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function ChatRoom({ roomId = "general" }) {
diff --git a/examples/snippets/crdt/App.tsx b/examples/snippets/crdt/App.tsx
index a00dea4b4..8b2e1e56b 100644
--- a/examples/snippets/crdt/App.tsx
+++ b/examples/snippets/crdt/App.tsx
@@ -5,7 +5,7 @@ import * as Y from 'yjs';
 import { applyUpdate, encodeStateAsUpdate } from 'yjs';
 import type { Registry } from "../actors/registry";
 
-const client = createClient<Registry>("http://localhost:6420");
+const client = createClient<Registry>("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function YjsEditor({ documentId = "shared-doc" }) {
diff --git a/examples/snippets/database/App.tsx b/examples/snippets/database/App.tsx
index 299e2344e..354b5875d 100644
--- a/examples/snippets/database/App.tsx
+++ b/examples/snippets/database/App.tsx
@@ -2,7 +2,7 @@ import { createClient } from "@rivetkit/actor/client";
 import { createReactRivetKit } from "@rivetkit/react";
 import { useState, useEffect } from "react";
 
-const client = createClient("http://localhost:6420");
+const client = createClient("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function NotesApp({ userId }: { userId: string }) {
diff --git a/examples/snippets/document/App.tsx b/examples/snippets/document/App.tsx
index cb0031e7a..4ed2099b8 100644
--- a/examples/snippets/document/App.tsx
+++ b/examples/snippets/document/App.tsx
@@ -3,7 +3,7 @@ import { createReactRivetKit } from "@rivetkit/react";
 import { useState, useEffect } from "react";
 import type { Registry } from "../actors/registry";
 
-const client = createClient<Registry>("http://localhost:6420");
+const client = createClient<Registry>("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function DocumentEditor() {
diff --git a/examples/snippets/game/App.tsx b/examples/snippets/game/App.tsx
index 43eea65bb..625e5bca8 100644
--- a/examples/snippets/game/App.tsx
+++ b/examples/snippets/game/App.tsx
@@ -3,7 +3,7 @@ import { createReactRivetKit } from "@rivetkit/react";
 import { useState, useEffect, useRef } from "react";
 import type { Player } from "./actor";
 
-const client = createClient("http://localhost:6420");
+const client = createClient("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function MultiplayerGame() {
diff --git a/examples/snippets/rate/App.tsx b/examples/snippets/rate/App.tsx
index a21624c06..0d22f879e 100644
--- a/examples/snippets/rate/App.tsx
+++ b/examples/snippets/rate/App.tsx
@@ -3,7 +3,7 @@ import { createReactRivetKit } from "@rivetkit/react";
 import { useState } from "react";
 import type { Registry } from "../actors/registry";
 
-const client = createClient<Registry>("http://localhost:6420");
+const client = createClient<Registry>("http://localhost:8080");
 const { useActor } = createReactRivetKit(client);
 
 export function RateLimiter() {
diff --git a/examples/snippets/stream/App.tsx b/examples/snippets/stream/App.tsx
index ebd3a37b5..adcd5a90f 100644
--- a/examples/snippets/stream/App.tsx
+++ b/examples/snippets/stream/App.tsx
@@ -4,7 +4,7 @@ import { useState, useEffect } from "react";
 import type { Registry } from "../actors/registry";
 import type { StreamState } from "./actor"; // Import shared types from actor
 
-const client = createClient<Registry>("http://localhost:6420");
+const client = createClient<Registry>("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function StreamExample() {
diff --git a/examples/snippets/sync/App.tsx b/examples/snippets/sync/App.tsx
index 0cb5a1300..aca65289d 100644
--- a/examples/snippets/sync/App.tsx
+++ b/examples/snippets/sync/App.tsx
@@ -3,7 +3,7 @@ import { createReactRivetKit } from "@rivetkit/react";
 import { useState, useEffect, useRef } from "react";
 import type { Contact } from "./actor";
 
-const client = createClient("http://localhost:6420");
+const client = createClient("http://localhost:8080");
 const { useActor, useActorEvent } = createReactRivetKit(client);
 
 export function ContactsApp() {
diff --git a/examples/snippets/tenant/App.tsx b/examples/snippets/tenant/App.tsx
index 2f4b0971e..2ad15b1dd 100644
--- a/examples/snippets/tenant/App.tsx
+++ b/examples/snippets/tenant/App.tsx
@@ -4,7 +4,7 @@ import { useState, useEffect } from "react";
 import type { Registry } from "../actors/registry";
 
 // Create client and hooks
-const client = createClient<Registry>("http://localhost:6420");
+const client = createClient<Registry>("http://localhost:8080");
 const { useActor } = createReactRivetKit(client);
 
 export function OrgDashboard({ orgId }: { orgId: string }) {
diff --git a/packages/core/package.json b/packages/core/package.json
index 68c882412..8de561745 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -151,9 +151,7 @@
     "dump-openapi": "tsx scripts/dump-openapi.ts"
   },
   "dependencies": {
-    "@hono/zod-openapi": "^0.19.6",
     "cbor-x": "^1.6.0",
-    "hono": "^4.7.0",
     "invariant": "^2.2.4",
     "on-change": "^5.0.1",
     "p-retry": "^6.2.1",
@@ -178,20 +176,28 @@
   "peerDependencies": {
     "@hono/node-server": "^1.14.0",
     "@hono/node-ws": "^1.1.1",
+    "@hono/zod-openapi": "^0.19.6",
     "eventsource": "^3.0.5",
+    "hono": "^4.7.0",
     "ws": "^8.0.0"
   },
   "peerDependenciesMeta": {
-    "eventsource": {
+    "@hono/node-server": {
       "optional": true
     },
-    "ws": {
+    "@hono/node-ws": {
       "optional": true
     },
-    "@hono/node-server": {
+    "@hono/zod-openapi": {
       "optional": true
     },
-    "@hono/node-ws": {
+    "eventsource": {
+      "optional": true
+    },
+    "hono": {
+      "optional": true
+    },
+    "ws": {
       "optional": true
     }
   },
diff --git a/packages/core/src/test/config.ts b/packages/core/src/test/config.ts
index 7c1b8444b..3cef36142 100644
--- a/packages/core/src/test/config.ts
+++ b/packages/core/src/test/config.ts
@@ -10,7 +10,7 @@ export const ConfigSchema = RunConfigSchema.removeDefault()
 		port: z
 			.number()
 			.optional()
-			.default(Number.parseInt(process.env.PORT ?? "6420")),
+			.default(Number.parseInt(process.env.PORT ?? "8080")),
 	})
 	.partial({ driver: true })
 	.default({});
diff --git a/scripts/sse-test.sh b/scripts/sse-test.sh
index 00968fe81..78f7f0827 100755
--- a/scripts/sse-test.sh
+++ b/scripts/sse-test.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-curl -X POST -d '{ "query": { "getOrCreateForTags": { "tags": { "name": "counter" }, "create": { "tags": { "name": "counter" } } } } }' http://localhost:6420/manager/actors
+curl -X POST -d '{ "query": { "getOrCreateForTags": { "tags": { "name": "counter" }, "create": { "tags": { "name": "counter" } } } } }' http://localhost:8080/manager/actors