diff --git a/packages/cloudflare-workers/tests/driver-tests.test.ts b/packages/cloudflare-workers/tests/driver-tests.test.ts
index 46431c1e0..541718b81 100644
--- a/packages/cloudflare-workers/tests/driver-tests.test.ts
+++ b/packages/cloudflare-workers/tests/driver-tests.test.ts
@@ -98,7 +98,7 @@ runDriverTests({
 		return {
 			endpoint: `http://localhost:${port}/rivet`,
 			namespace: "default",
-			runnerName: "rivetkit",
+			runnerName: "default",
 			async cleanup() {
 				// Shut down wrangler process
 				wranglerProcess.kill();
diff --git a/packages/rivetkit/src/client/config.ts b/packages/rivetkit/src/client/config.ts
index 4f4226996..b1211da57 100644
--- a/packages/rivetkit/src/client/config.ts
+++ b/packages/rivetkit/src/client/config.ts
@@ -29,7 +29,7 @@ export const ClientConfigSchema = z.object({
 	/** Name of the runner. This is used to group together runners in to different pools. */
 	runnerName: z
 		.string()
-		.default(() => getEnvUniversal("RIVET_RUNNER") ?? "rivetkit"),
+		.default(() => getEnvUniversal("RIVET_RUNNER") ?? "default"),
 
 	encoding: EncodingSchema.default("bare"),
 
diff --git a/packages/rivetkit/src/driver-test-suite/mod.ts b/packages/rivetkit/src/driver-test-suite/mod.ts
index 5d09af5ff..90950ba14 100644
--- a/packages/rivetkit/src/driver-test-suite/mod.ts
+++ b/packages/rivetkit/src/driver-test-suite/mod.ts
@@ -272,7 +272,7 @@ export async function createTestRuntime(
 		return {
 			endpoint: serverEndpoint,
 			namespace: "default",
-			runnerName: "rivetkit",
+			runnerName: "default",
 			cleanup,
 		};
 	}
diff --git a/packages/rivetkit/src/manager/router.ts b/packages/rivetkit/src/manager/router.ts
index d8fca244d..b6105e332 100644
--- a/packages/rivetkit/src/manager/router.ts
+++ b/packages/rivetkit/src/manager/router.ts
@@ -168,7 +168,7 @@ function addServerlessRoutes(
 		if (!parseResult.success) {
 			throw new InvalidRequest(
 				parseResult.error.issues[0]?.message ??
-					"invalid serverless start headers",
+				"invalid serverless start headers",
 			);
 		}
 		const { endpoint, token, totalSlots, runnerName, namespace } =
@@ -274,9 +274,9 @@ function addManagerRoutes(
 
 			const actorIdsParsed = actor_ids
 				? actor_ids
-						.split(",")
-						.map((id) => id.trim())
-						.filter((id) => id.length > 0)
+					.split(",")
+					.map((id) => id.trim())
+					.filter((id) => id.length > 0)
 				: undefined;
 
 			const actors: ActorOutput[] = [];
@@ -321,7 +321,7 @@ function addManagerRoutes(
 			}
 
 			return c.json<ActorsListResponse>({
-				actors: actors.map(createApiActor),
+				actors: actors.map(actor => createApiActor(actor, runConfig.runnerName)),
 			});
 		});
 	}
@@ -355,7 +355,7 @@ function addManagerRoutes(
 
 			if (existingActor) {
 				return c.json<ActorsGetOrCreateResponse>({
-					actor: createApiActor(existingActor),
+					actor: createApiActor(existingActor, runConfig.runnerName),
 					created: false,
 				});
 			}
@@ -372,7 +372,7 @@ function addManagerRoutes(
 			});
 
 			return c.json<ActorsGetOrCreateResponse>({
-				actor: createApiActor(newActor),
+				actor: createApiActor(newActor, runConfig.runnerName),
 				created: true,
 			});
 		});
@@ -410,7 +410,7 @@ function addManagerRoutes(
 			});
 
 			// Transform ActorOutput to match ActorSchema
-			const actor = createApiActor(actorOutput);
+			const actor = createApiActor(actorOutput, runConfig.runnerName);
 
 			return c.json<ActorsCreateResponse>({ actor });
 		});
@@ -655,13 +655,13 @@ function addManagerRoutes(
 	);
 }
 
-function createApiActor(actor: ActorOutput): ApiActor {
+function createApiActor(actor: ActorOutput, runnerName: string = "default"): ApiActor {
 	return {
 		actor_id: actor.actorId,
 		name: actor.name,
 		key: serializeActorKey(actor.key),
 		namespace_id: "default", // Assert default namespace
-		runner_name_selector: "rivetkit", // Assert rivetkit runner
+		runner_name_selector: runnerName,
 		create_ts: Date.now(),
 		connectable_ts: null,
 		destroy_ts: null,