diff --git a/frontend/src/app/data-providers/engine-data-provider.tsx b/frontend/src/app/data-providers/engine-data-provider.tsx
index 7a2aa97d00..02567053c0 100644
--- a/frontend/src/app/data-providers/engine-data-provider.tsx
+++ b/frontend/src/app/data-providers/engine-data-provider.tsx
@@ -527,7 +527,7 @@ export const createNamespaceContext = ({
 				},
 			});
 		},
-		createRunnerConfigMutationOptions(
+		upsertRunnerConfigMutationOptions(
 			opts: {
 				onSuccess?: (data: Rivet.RunnerConfigsUpsertResponse) => void;
 			} = {},
@@ -554,6 +554,21 @@ export const createNamespaceContext = ({
 				},
 			};
 		},
+		deleteRunnerConfigMutationOptions(
+			opts: { onSuccess?: (data: void) => void } = {},
+		) {
+			return {
+				...opts,
+				mutationKey: ["runner-config", "delete"],
+				mutationFn: async (name: string) => {
+					await client.runnerConfigs.delete(name, { namespace });
+				},
+				retry: shouldRetryAllExpect403,
+				meta: {
+					mightRequireAuth,
+				},
+			};
+		},
 		runnerConfigsQueryOptions() {
 			return infiniteQueryOptions({
 				queryKey: [{ namespace }, "runners", "configs"],
@@ -592,6 +607,7 @@ export const createNamespaceContext = ({
 				},
 			});
 		},
+
 		runnerConfigQueryOptions(runnerName: string) {
 			return queryOptions({
 				queryKey: [{ namespace }, "runners", "config", runnerName],
diff --git a/frontend/src/app/dialogs/confirm-delete-config-frame.tsx b/frontend/src/app/dialogs/confirm-delete-config-frame.tsx
new file mode 100644
index 0000000000..004b647da3
--- /dev/null
+++ b/frontend/src/app/dialogs/confirm-delete-config-frame.tsx
@@ -0,0 +1,53 @@
+import { useMutation } from "@tanstack/react-query";
+import { Button, type DialogContentProps, Frame } from "@/components";
+import { useEngineCompatDataProvider } from "@/components/actors";
+import { queryClient } from "@/queries/global";
+
+interface ConfirmDeleteConfigContentProps extends DialogContentProps {
+	name: string;
+}
+
+export default function ConfirmDeleteConfigContent({
+	onClose,
+	name,
+}: ConfirmDeleteConfigContentProps) {
+	const provider = useEngineCompatDataProvider();
+	const { mutate, isPending } = useMutation(
+		provider.deleteRunnerConfigMutationOptions({
+			onSuccess: async () => {
+				await queryClient.invalidateQueries(
+					provider.runnerConfigsQueryOptions(),
+				);
+				onClose?.();
+			},
+		}),
+	);
+
+	return (
+		<>
+			<Frame.Header>
+				<Frame.Title className="gap-2 flex items-center">
+					<div>Confirm deletion of {name}</div>
+				</Frame.Title>
+				<Frame.Description>
+					This action cannot be undone. Are you sure you want to
+					delete this configuration?
+				</Frame.Description>
+			</Frame.Header>
+			<Frame.Footer>
+				<Button
+					variant="destructive"
+					isLoading={isPending}
+					onClick={() => {
+						mutate(name);
+					}}
+				>
+					Delete
+				</Button>
+				<Button variant="secondary" onClick={onClose}>
+					Cancel
+				</Button>
+			</Frame.Footer>
+		</>
+	);
+}
diff --git a/frontend/src/app/dialogs/connect-aws-frame.tsx b/frontend/src/app/dialogs/connect-aws-frame.tsx
index 6493ee18a7..54f581ea96 100644
--- a/frontend/src/app/dialogs/connect-aws-frame.tsx
+++ b/frontend/src/app/dialogs/connect-aws-frame.tsx
@@ -39,6 +39,7 @@ const stepper = defineStepper(
 			headers: z.array(z.tuple([z.string(), z.string()])).default([]),
 			slotsPerRunner: z.coerce.number().min(1, "Must be at least 1"),
 			maxRunners: z.coerce.number().min(1, "Must be at least 1"),
+			minRunners: z.coerce.number().min(0, "Must be 0 or greater"),
 			runnerMargin: z.coerce.number().min(0, "Must be 0 or greater"),
 		}),
 	},
@@ -99,9 +100,10 @@ function FormStepper({
 	onClose?: () => void;
 	datacenters: Region[];
 }) {
+	const provider = useEngineCompatDataProvider();
 	const { mutateAsync } = useMutation({
-		...useEngineCompatDataProvider().createRunnerConfigMutationOptions(),
-		onSuccess: () => {
+		...provider.upsertRunnerConfigMutationOptions(),
+		onSuccess: async () => {
 			confetti({
 				angle: 60,
 				spread: 55,
@@ -112,6 +114,10 @@ function FormStepper({
 				spread: 55,
 				origin: { x: 1 },
 			});
+
+			await queryClient.invalidateQueries(
+				provider.runnerConfigsQueryOptions(),
+			);
 			onClose?.();
 		},
 	});
@@ -166,6 +172,7 @@ function Step1() {
 			<ConnectVercelForm.Headers />
 			<ConnectVercelForm.SlotsPerRunner />
 			<ConnectVercelForm.MaxRunners />
+			<ConnectVercelForm.MinRunners />
 			<ConnectVercelForm.RunnerMargin />
 		</div>
 	);
diff --git a/frontend/src/app/dialogs/connect-gcp-frame.tsx b/frontend/src/app/dialogs/connect-gcp-frame.tsx
index 97956c2186..c5b46a2395 100644
--- a/frontend/src/app/dialogs/connect-gcp-frame.tsx
+++ b/frontend/src/app/dialogs/connect-gcp-frame.tsx
@@ -13,6 +13,7 @@ import * as ConnectVercelForm from "@/app/forms/connect-vercel-form";
 import { cn, type DialogContentProps, Frame } from "@/components";
 import { type Region, useEngineCompatDataProvider } from "@/components/actors";
 import { defineStepper } from "@/components/ui/stepper";
+import { queryClient } from "@/queries/global";
 import { StepperForm } from "../forms/stepper-form";
 import { EnvVariablesStep } from "./connect-railway-frame";
 
@@ -33,6 +34,7 @@ const stepper = defineStepper(
 			headers: z.array(z.tuple([z.string(), z.string()])).default([]),
 			slotsPerRunner: z.coerce.number().min(1, "Must be at least 1"),
 			maxRunners: z.coerce.number().min(1, "Must be at least 1"),
+			minRunners: z.coerce.number().min(0, "Must be 0 or greater"),
 			runnerMargin: z.coerce.number().min(0, "Must be 0 or greater"),
 		}),
 	},
@@ -94,9 +96,10 @@ function FormStepper({
 	onClose?: () => void;
 	datacenters: Region[];
 }) {
+	const provider = useEngineCompatDataProvider();
 	const { mutateAsync } = useMutation({
-		...useEngineCompatDataProvider().createRunnerConfigMutationOptions(),
-		onSuccess: () => {
+		...provider.upsertRunnerConfigMutationOptions(),
+		onSuccess: async () => {
 			confetti({
 				angle: 60,
 				spread: 55,
@@ -107,6 +110,10 @@ function FormStepper({
 				spread: 55,
 				origin: { x: 1 },
 			});
+
+			await queryClient.invalidateQueries(
+				provider.runnerConfigsQueryOptions(),
+			);
 			onClose?.();
 		},
 	});
@@ -161,6 +168,7 @@ function Step1() {
 			<ConnectVercelForm.Headers />
 			<ConnectVercelForm.SlotsPerRunner />
 			<ConnectVercelForm.MaxRunners />
+			<ConnectVercelForm.MinRunners />
 			<ConnectVercelForm.RunnerMargin />
 		</div>
 	);
diff --git a/frontend/src/app/dialogs/connect-hetzner-frame.tsx b/frontend/src/app/dialogs/connect-hetzner-frame.tsx
index 5c0e5f9854..b28b18ecb1 100644
--- a/frontend/src/app/dialogs/connect-hetzner-frame.tsx
+++ b/frontend/src/app/dialogs/connect-hetzner-frame.tsx
@@ -19,6 +19,7 @@ import * as ConnectVercelForm from "@/app/forms/connect-vercel-form";
 import { cn, type DialogContentProps, Frame } from "@/components";
 import { type Region, useEngineCompatDataProvider } from "@/components/actors";
 import { defineStepper } from "@/components/ui/stepper";
+import { queryClient } from "@/queries/global";
 import { StepperForm } from "../forms/stepper-form";
 import { EnvVariablesStep } from "./connect-railway-frame";
 
@@ -39,6 +40,7 @@ const stepper = defineStepper(
 			headers: z.array(z.tuple([z.string(), z.string()])).default([]),
 			slotsPerRunner: z.coerce.number().min(1, "Must be at least 1"),
 			maxRunners: z.coerce.number().min(1, "Must be at least 1"),
+			minRunners: z.coerce.number().min(0, "Must be 0 or greater"),
 			runnerMargin: z.coerce.number().min(0, "Must be 0 or greater"),
 		}),
 	},
@@ -99,9 +101,10 @@ function FormStepper({
 	onClose?: () => void;
 	datacenters: Region[];
 }) {
+	const provider = useEngineCompatDataProvider();
 	const { mutateAsync } = useMutation({
-		...useEngineCompatDataProvider().createRunnerConfigMutationOptions(),
-		onSuccess: () => {
+		...provider.upsertRunnerConfigMutationOptions(),
+		onSuccess: async () => {
 			confetti({
 				angle: 60,
 				spread: 55,
@@ -112,6 +115,10 @@ function FormStepper({
 				spread: 55,
 				origin: { x: 1 },
 			});
+
+			await queryClient.invalidateQueries(
+				provider.runnerConfigsQueryOptions(),
+			);
 			onClose?.();
 		},
 	});
@@ -143,6 +150,7 @@ function FormStepper({
 				slotsPerRunner: 25,
 				maxRunners: 1000,
 				runnerMargin: 0,
+				minRunners: 1,
 				headers: [],
 				success: false,
 				datacenters: Object.fromEntries(
@@ -166,6 +174,7 @@ function Step1() {
 			<ConnectVercelForm.Headers />
 			<ConnectVercelForm.SlotsPerRunner />
 			<ConnectVercelForm.MaxRunners />
+			<ConnectVercelForm.MinRunners />
 			<ConnectVercelForm.RunnerMargin />
 		</div>
 	);
diff --git a/frontend/src/app/dialogs/connect-manual-frame.tsx b/frontend/src/app/dialogs/connect-manual-frame.tsx
index f7deb813be..3ef8ca34fe 100644
--- a/frontend/src/app/dialogs/connect-manual-frame.tsx
+++ b/frontend/src/app/dialogs/connect-manual-frame.tsx
@@ -13,6 +13,7 @@ import * as ConnectVercelForm from "@/app/forms/connect-vercel-form";
 import { cn, type DialogContentProps, Frame } from "@/components";
 import { type Region, useEngineCompatDataProvider } from "@/components/actors";
 import { defineStepper } from "@/components/ui/stepper";
+import { queryClient } from "@/queries/global";
 import { StepperForm } from "../forms/stepper-form";
 import { EnvVariablesStep } from "./connect-railway-frame";
 
@@ -33,6 +34,7 @@ const stepper = defineStepper(
 			headers: z.array(z.tuple([z.string(), z.string()])).default([]),
 			slotsPerRunner: z.coerce.number().min(1, "Must be at least 1"),
 			maxRunners: z.coerce.number().min(1, "Must be at least 1"),
+			minRunners: z.coerce.number().min(0, "Must be 0 or greater"),
 			runnerMargin: z.coerce.number().min(0, "Must be 0 or greater"),
 		}),
 	},
@@ -93,9 +95,10 @@ function FormStepper({
 	onClose?: () => void;
 	datacenters: Region[];
 }) {
+	const provider = useEngineCompatDataProvider();
 	const { mutateAsync } = useMutation({
-		...useEngineCompatDataProvider().createRunnerConfigMutationOptions(),
-		onSuccess: () => {
+		...provider.upsertRunnerConfigMutationOptions(),
+		onSuccess: async () => {
 			confetti({
 				angle: 60,
 				spread: 55,
@@ -106,6 +109,10 @@ function FormStepper({
 				spread: 55,
 				origin: { x: 1 },
 			});
+
+			await queryClient.invalidateQueries(
+				provider.runnerConfigsQueryOptions(),
+			);
 			onClose?.();
 		},
 	});
@@ -136,6 +143,7 @@ function FormStepper({
 				runnerName: "default",
 				slotsPerRunner: 25,
 				maxRunners: 1000,
+				minRunners: 1,
 				runnerMargin: 0,
 				headers: [],
 				success: false,
@@ -160,6 +168,7 @@ function Step1() {
 			<ConnectVercelForm.Headers />
 			<ConnectVercelForm.SlotsPerRunner />
 			<ConnectVercelForm.MaxRunners />
+			<ConnectVercelForm.MinRunners />
 			<ConnectVercelForm.RunnerMargin />
 		</div>
 	);
diff --git a/frontend/src/app/dialogs/connect-railway-frame.tsx b/frontend/src/app/dialogs/connect-railway-frame.tsx
index 3139a0bee1..ffda9f0548 100644
--- a/frontend/src/app/dialogs/connect-railway-frame.tsx
+++ b/frontend/src/app/dialogs/connect-railway-frame.tsx
@@ -48,7 +48,7 @@ const stepper = defineStepper(
 	{
 		id: "step-3",
 		title: "Wait for the Runner to connect",
-		assist: false,
+		assist: true,
 		schema: z.object({
 			success: z.boolean().refine((v) => v === true, {
 				message: "Runner must be connected to proceed",
@@ -74,6 +74,8 @@ export default function ConnectRailwayFrameContent({
 	const prefferedRegionForRailway =
 		data.find((region) => region.name.toLowerCase().includes("us-west"))
 			?.id ||
+		data.find((region) => region.name.toLowerCase().includes("us-east"))
+			?.id ||
 		data.find((region) => region.name.toLowerCase().includes("ore"))?.id ||
 		"auto";
 
@@ -103,9 +105,10 @@ function FormStepper({
 	onClose?: () => void;
 	defaultDatacenter: string;
 }) {
+	const provider = useEngineCompatDataProvider();
 	const { mutateAsync } = useMutation({
-		...useEngineCompatDataProvider().createRunnerConfigMutationOptions(),
-		onSuccess: () => {
+		...provider.upsertRunnerConfigMutationOptions(),
+		onSuccess: async () => {
 			confetti({
 				angle: 60,
 				spread: 55,
@@ -116,6 +119,8 @@ function FormStepper({
 				spread: 55,
 				origin: { x: 1 },
 			});
+
+						await queryClient.invalidateQueries(provider.runnerConfigsQueryOptions());
 			onClose?.();
 		},
 	});
diff --git a/frontend/src/app/dialogs/connect-vercel-frame.tsx b/frontend/src/app/dialogs/connect-vercel-frame.tsx
index 439db56138..b6a63a7471 100644
--- a/frontend/src/app/dialogs/connect-vercel-frame.tsx
+++ b/frontend/src/app/dialogs/connect-vercel-frame.tsx
@@ -20,6 +20,7 @@ import {
 } from "@/components";
 import { type Region, useEngineCompatDataProvider } from "@/components/actors";
 import { type JoinStepSchemas, StepperForm } from "../forms/stepper-form";
+import { queryClient } from "@/queries/global";
 
 const { stepper } = ConnectVercelForm;
 
@@ -47,11 +48,6 @@ export default function CreateProjectFrameContent({
 						Add <Icon icon={faVercel} className="ml-0.5" />
 						Vercel
 					</div>
-					<HelpDropdown>
-						<Button variant="ghost" size="icon">
-							<Icon icon={faQuestionCircle} />
-						</Button>
-					</HelpDropdown>
 				</Frame.Title>
 			</Frame.Header>
 			<Frame.Content>
@@ -68,9 +64,10 @@ function FormStepper({
 	onClose?: () => void;
 	datacenters: Region[];
 }) {
+	const provider = useEngineCompatDataProvider();
 	const { mutateAsync } = useMutation({
-		...useEngineCompatDataProvider().createRunnerConfigMutationOptions(),
-		onSuccess: () => {
+		...provider.upsertRunnerConfigMutationOptions(),
+		onSuccess: async () => {
 			confetti({
 				angle: 60,
 				spread: 55,
@@ -81,6 +78,7 @@ function FormStepper({
 				spread: 55,
 				origin: { x: 1 },
 			});
+			await queryClient.invalidateQueries(provider.runnerConfigsQueryOptions());
 			onClose?.();
 		},
 	});
@@ -127,6 +125,7 @@ function FormStepper({
 				plan: "hobby",
 				runnerName: "default",
 				slotsPerRunner: 25,
+				minRunners: 1,
 				maxRunners: 1000,
 				runnerMargin: 0,
 				headers: [],
@@ -153,6 +152,7 @@ function Step1() {
 						<ConnectVercelForm.Datacenters />
 						<ConnectVercelForm.Headers />
 						<ConnectVercelForm.SlotsPerRunner />
+						<ConnectVercelForm.MinRunners />
 						<ConnectVercelForm.MaxRunners />
 						<ConnectVercelForm.RunnerMargin />
 					</AccordionContent>
diff --git a/frontend/src/app/dialogs/edit-runner-config.tsx b/frontend/src/app/dialogs/edit-runner-config.tsx
index cad6867363..67d49ec8fc 100644
--- a/frontend/src/app/dialogs/edit-runner-config.tsx
+++ b/frontend/src/app/dialogs/edit-runner-config.tsx
@@ -1,61 +1,100 @@
-import { faQuestionCircle, faRailway, Icon } from "@rivet-gg/icons";
-import { useSuspenseQuery } from "@tanstack/react-query";
+import {
+	useMutation,
+	usePrefetchInfiniteQuery,
+	useSuspenseInfiniteQuery,
+} from "@tanstack/react-query";
 import * as EditRunnerConfigForm from "@/app/forms/edit-runner-config-form";
-import { HelpDropdown } from "@/app/help-dropdown";
-import { Button, type DialogContentProps, Frame } from "@/components";
+import { type DialogContentProps, Frame } from "@/components";
 import { useEngineCompatDataProvider } from "@/components/actors";
+import { queryClient } from "@/queries/global";
 
 interface EditRunnerConfigFrameContentProps extends DialogContentProps {
 	name: string;
+	dc: string;
 }
 
 export default function EditRunnerConfigFrameContent({
 	name,
+	dc,
 	onClose,
 }: EditRunnerConfigFrameContentProps) {
-	const { data } = useSuspenseQuery({
-		...useEngineCompatDataProvider().runnerConfigQueryOptions(name),
-		refetchInterval: 5000,
+	const provider = useEngineCompatDataProvider();
+	usePrefetchInfiniteQuery({
+		...provider.runnerConfigsQueryOptions(),
+		pages: Infinity,
 	});
 
+	const { data } = useSuspenseInfiniteQuery({
+		...provider.runnerConfigsQueryOptions(),
+	});
+
+	const { mutateAsync } = useMutation({
+		...provider.upsertRunnerConfigMutationOptions(),
+		onSuccess: () => {
+			onClose?.();
+		},
+	});
+
+	const config = data.find(([id]) => id === name)?.[1].datacenters?.[dc]
+		.serverless;
+
+	if (!config) {
+		return (
+			<Frame.Content>
+				Selected provider config is not available in this datacenter.
+			</Frame.Content>
+		);
+	}
+
 	return (
 		<EditRunnerConfigForm.Form
-			onSubmit={async () => {
+			onSubmit={async (values) => {
+				await mutateAsync({
+					name,
+					config: {
+						[dc]: {
+							serverless: {
+								...values,
+								headers: Object.fromEntries(
+									values.headers || [],
+								),
+							},
+						},
+					},
+				});
+
+				await queryClient.invalidateQueries(
+					provider.runnerConfigsQueryOptions(),
+				);
 				onClose?.();
 			}}
 			defaultValues={{
-				url: data.serverless.url,
-				maxRunners: data.serverless.maxRunners,
-				minRunners: data.serverless.minRunners,
-				requestLifespan: data.serverless.requestLifespan,
-				runnersMargin: data.serverless.runnersMargin,
-				slotsPerRunner: data.serverless.slotsPerRunner,
+				url: config.url,
+				maxRunners: config.maxRunners,
+				minRunners: config.minRunners,
+				requestLifespan: config.requestLifespan,
+				runnersMargin: config.runnersMargin,
+				slotsPerRunner: config.slotsPerRunner,
 			}}
 		>
 			<Frame.Header>
 				<Frame.Title className="justify-between flex items-center">
-					<div>
-						Add <Icon icon={faRailway} className="ml-0.5" /> Railway
-					</div>
-					<HelpDropdown>
-						<Button variant="ghost" size="icon">
-							<Icon icon={faQuestionCircle} />
-						</Button>
-					</HelpDropdown>
+					Edit {name} Provider
 				</Frame.Title>
 			</Frame.Header>
-			<Frame.Content>
+			<Frame.Content className="space-y-4">
 				<EditRunnerConfigForm.Url />
-				<div className="grid grid-cols-2">
+				<div className="grid grid-cols-2 gap-2">
 					<EditRunnerConfigForm.MinRunners />
 					<EditRunnerConfigForm.MaxRunners />
-					<EditRunnerConfigForm.RunnersMargin />
 				</div>
-				<div className="grid grid-cols-2">
+				<div className="grid grid-cols-2 gap-2">
 					<EditRunnerConfigForm.RequestLifespan />
-					<EditRunnerConfigForm.RunnersMargin />
+					<EditRunnerConfigForm.SlotsPerRunner />
 				</div>
-				<EditRunnerConfigForm.SlotsPerRunner />
+
+				<EditRunnerConfigForm.RunnersMargin />
+				<EditRunnerConfigForm.Headers />
 				<div className="flex justify-end mt-4">
 					<EditRunnerConfigForm.Submit>
 						Save
diff --git a/frontend/src/app/forms/connect-railway-form.tsx b/frontend/src/app/forms/connect-railway-form.tsx
index 0ba054504c..e75811d019 100644
--- a/frontend/src/app/forms/connect-railway-form.tsx
+++ b/frontend/src/app/forms/connect-railway-form.tsx
@@ -10,6 +10,7 @@ import * as ConnectVercelForm from "@/app/forms/connect-vercel-form";
 import {
 	cn,
 	FormControl,
+	FormDescription,
 	FormField,
 	FormItem,
 	FormLabel,
@@ -30,10 +31,15 @@ export const Datacenter = function Datacenter() {
 					<FormLabel>Datacenter</FormLabel>
 					<FormControl>
 						<RegionSelect
+							showAuto={false}
 							onValueChange={field.onChange}
 							value={field.value}
 						/>
 					</FormControl>
+					<FormDescription>
+						You can find the region your Railway runners are running
+						in under <i>Settings &gt; Deploy</i>
+					</FormDescription>
 					<FormMessage />
 				</FormItem>
 			)}
diff --git a/frontend/src/app/forms/connect-vercel-form.tsx b/frontend/src/app/forms/connect-vercel-form.tsx
index 7a10f93fda..34e0b4a0df 100644
--- a/frontend/src/app/forms/connect-vercel-form.tsx
+++ b/frontend/src/app/forms/connect-vercel-form.tsx
@@ -68,6 +68,7 @@ export const stepper = defineStepper(
 			headers: z.array(z.tuple([z.string(), z.string()])).default([]),
 			slotsPerRunner: z.coerce.number().min(1, "Must be at least 1"),
 			maxRunners: z.coerce.number().min(1, "Must be at least 1"),
+			minRunners: z.coerce.number().min(0, "Must be 0 or greater"),
 			runnerMargin: z.coerce.number().min(0, "Must be 0 or greater"),
 		}),
 	},
@@ -81,7 +82,7 @@ export const stepper = defineStepper(
 	{
 		id: "step-3",
 		title: "Deploy to Vercel",
-		assist: false,
+		assist: true,
 		next: "Done",
 		schema: z.object({
 			success: z.boolean().refine((val) => val, "Connection failed"),
@@ -190,6 +191,33 @@ export const Datacenters = function Datacenter() {
 	);
 };
 
+export const MinRunners = ({ className }: { className?: string }) => {
+	const { control } = useFormContext();
+	return (
+		<FormField
+			control={control}
+			name="minRunners"
+			render={({ field }) => (
+				<FormItem className={className}>
+					<FormLabel className="col-span-1">Min Runners</FormLabel>
+					<FormControl className="row-start-2">
+						<Input
+							type="number"
+							min={1}
+							{...field}
+							value={field.value || ""}
+						/>
+					</FormControl>
+					<FormDescription className="col-span-1">
+						The minimum number of runners to keep running.
+					</FormDescription>
+					<FormMessage className="col-span-1" />
+				</FormItem>
+			)}
+		/>
+	);
+};
+
 export const MaxRunners = ({ className }: { className?: string }) => {
 	const { control } = useFormContext();
 	return (
diff --git a/frontend/src/app/forms/edit-runner-config-form.tsx b/frontend/src/app/forms/edit-runner-config-form.tsx
index 6213e1f1df..a6cdf61671 100644
--- a/frontend/src/app/forms/edit-runner-config-form.tsx
+++ b/frontend/src/app/forms/edit-runner-config-form.tsx
@@ -1,22 +1,32 @@
-import { type UseFormReturn, useFormContext } from "react-hook-form";
+import { faTrash, Icon } from "@rivet-gg/icons";
+import {
+	type UseFormReturn,
+	useFieldArray,
+	useFormContext,
+} from "react-hook-form";
 import z from "zod";
 import {
+	Button,
 	createSchemaForm,
 	FormControl,
+	FormDescription,
 	FormField,
+	FormFieldContext,
 	FormItem,
 	FormLabel,
 	FormMessage,
 	Input,
+	Label,
 } from "@/components";
 
 export const formSchema = z.object({
-	url: z.string().url(),
-	maxRunners: z.number().positive(),
-	minRunners: z.number().positive(),
-	requestLifespan: z.number().positive(),
-	runnersMargin: z.number().positive(),
-	slotsPerRunner: z.number().positive(),
+	url: z.string().url().endsWith("/api/rivet"),
+	maxRunners: z.coerce.number().positive(),
+	minRunners: z.coerce.number().min(0),
+	requestLifespan: z.coerce.number().positive(),
+	runnersMargin: z.coerce.number().min(0),
+	slotsPerRunner: z.coerce.number().positive(),
+	headers: z.array(z.string()).default([]),
 });
 
 export type FormValues = z.infer<typeof formSchema>;
@@ -36,7 +46,7 @@ export const Url = ({ className }: { className?: string }) => {
 			name="url"
 			render={({ field }) => (
 				<FormItem className={className}>
-					<FormLabel className="col-span-1">Url</FormLabel>
+					<FormLabel className="col-span-1">Endpoint</FormLabel>
 					<FormControl className="row-start-2">
 						<Input
 							placeholder="https://your-rivet-runner"
@@ -56,13 +66,16 @@ export const MinRunners = ({ className }: { className?: string }) => {
 	return (
 		<FormField
 			control={control}
-			name="url"
+			name="minRunners"
 			render={({ field }) => (
 				<FormItem className={className}>
 					<FormLabel className="col-span-1">Min Runners</FormLabel>
 					<FormControl className="row-start-2">
 						<Input type="number" {...field} />
 					</FormControl>
+					<FormDescription className="col-span-1">
+						The minimum number of runners to keep running.
+					</FormDescription>
 					<FormMessage className="col-span-1" />
 				</FormItem>
 			)}
@@ -82,6 +95,11 @@ export const MaxRunners = ({ className }: { className?: string }) => {
 					<FormControl className="row-start-2">
 						<Input type="number" {...field} />
 					</FormControl>
+
+					<FormDescription className="col-span-1">
+						The maximum number of runners that can be created to
+						handle load.
+					</FormDescription>
 					<FormMessage className="col-span-1" />
 				</FormItem>
 			)}
@@ -103,6 +121,10 @@ export const RequestLifespan = ({ className }: { className?: string }) => {
 					<FormControl className="row-start-2">
 						<Input type="number" {...field} />
 					</FormControl>
+					<FormDescription className="col-span-1">
+						The maximum duration (in seconds) a request can take
+						before being terminated.
+					</FormDescription>
 					<FormMessage className="col-span-1" />
 				</FormItem>
 			)}
@@ -122,6 +144,10 @@ export const RunnersMargin = ({ className }: { className?: string }) => {
 					<FormControl className="row-start-2">
 						<Input type="number" {...field} />
 					</FormControl>
+					<FormDescription className="col-span-1">
+						The number of extra runners to keep running to handle
+						sudden spikes in load.
+					</FormDescription>
 					<FormMessage className="col-span-1" />
 				</FormItem>
 			)}
@@ -143,9 +169,134 @@ export const SlotsPerRunner = ({ className }: { className?: string }) => {
 					<FormControl className="row-start-2">
 						<Input type="number" {...field} />
 					</FormControl>
+					<FormDescription className="col-span-1">
+						The number of concurrent slots each runner can handle.
+					</FormDescription>
 					<FormMessage className="col-span-1" />
 				</FormItem>
 			)}
 		/>
 	);
 };
+
+export const Headers = function Headers() {
+	const { control, setValue } = useFormContext();
+	const { fields, append, remove } = useFieldArray<FormValues>({
+		name: "headers",
+		control,
+	});
+
+	return (
+		<div className="space-y-2">
+			<FormLabel asChild>
+				<p>Custom Headers</p>
+			</FormLabel>
+			<FormDescription>
+				Custom headers to add to each request to the runner. Useful for
+				providing authentication or other information.
+			</FormDescription>
+			<div className="grid grid-cols-[1fr,1fr,auto] grid-rows-[repeat(3,auto)] items-start gap-2 empty:hidden">
+				{fields.length > 0 ? (
+					<>
+						<Label asChild>
+							<p>Name</p>
+						</Label>
+						<Label asChild>
+							<p>Value</p>
+						</Label>
+						<p></p>
+					</>
+				) : null}
+				{fields.map((field, index) => (
+					<div
+						key={field.id}
+						className="grid grid-cols-subgrid grid-rows-
+col-span-full flex-1"
+					>
+						<FormFieldContext.Provider
+							value={{ name: `headers.${index}.0` }}
+						>
+							<FormItem
+								flex="1"
+								className="grid grid-cols-subgrid grid-rows-subgrid row-span-full"
+							>
+								<FormLabel aria-hidden hidden>
+									Key
+								</FormLabel>
+								<FormControl>
+									<Input
+										placeholder="Enter a value"
+										className="w-full"
+										value={field[0]}
+										onChange={(e) => {
+											setValue(
+												`headers.${index}.0`,
+												e.target.value,
+												{
+													shouldDirty: true,
+													shouldTouch: true,
+													shouldValidate: true,
+												},
+											);
+										}}
+									/>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						</FormFieldContext.Provider>
+
+						<FormFieldContext.Provider
+							value={{ name: `headers.${index}.1` }}
+						>
+							<FormItem
+								flex="1"
+								className="grid grid-cols-subgrid grid-rows-subgrid row-span-full"
+							>
+								<FormLabel aria-hidden hidden>
+									Value
+								</FormLabel>
+								<FormControl>
+									<Input
+										placeholder="Enter a value"
+										className="w-full"
+										value={field[1]}
+										onChange={(e) => {
+											setValue(
+												`headers.${index}.1`,
+												e.target.value,
+												{
+													shouldDirty: true,
+													shouldTouch: true,
+													shouldValidate: true,
+												},
+											);
+										}}
+									/>
+								</FormControl>
+								<FormMessage />
+							</FormItem>
+						</FormFieldContext.Provider>
+						<Button
+							size="icon"
+							className="self-end row-start-1"
+							variant="secondary"
+							type="button"
+							onClick={() => remove(index)}
+						>
+							<Icon icon={faTrash} />
+						</Button>
+					</div>
+				))}
+			</div>
+			<Button
+				className="justify-self-start"
+				variant="secondary"
+				size="sm"
+				type="button"
+				onClick={() => append([["", ""]])}
+			>
+				Add a header
+			</Button>
+		</div>
+	);
+};
diff --git a/frontend/src/app/runner-config-table.tsx b/frontend/src/app/runner-config-table.tsx
index 33c5b2bac2..0c20cc762b 100644
--- a/frontend/src/app/runner-config-table.tsx
+++ b/frontend/src/app/runner-config-table.tsx
@@ -1,5 +1,13 @@
+import {
+	faCog,
+	faCogs,
+	faRailway,
+	faTrash,
+	faVercel,
+	Icon,
+} from "@rivet-gg/icons";
 import type { Rivet } from "@rivetkit/engine-api-full";
-import { formatRelative } from "date-fns";
+import { Link } from "@tanstack/react-router";
 import {
 	Button,
 	DiscreteCopyButton,
@@ -13,13 +21,15 @@ import {
 	Text,
 	WithTooltip,
 } from "@/components";
+import { ActorRegion } from "@/components/actors";
+import { REGION_LABEL } from "@/components/matchmaker/lobby-region";
 
 interface RunnerConfigsTableProps {
 	isLoading?: boolean;
 	isError?: boolean;
 	hasNextPage?: boolean;
 	fetchNextPage?: () => void;
-	configs: Rivet.RunnerConfig[];
+	configs: [string, Rivet.RunnerConfigsListResponseRunnerConfigsValue][];
 }
 
 export function RunnerConfigsTable({
@@ -35,7 +45,8 @@ export function RunnerConfigsTable({
 				<TableRow>
 					<TableHead className="pl-8">Name</TableHead>
 					<TableHead>Provider</TableHead>
-					<TableHead>Endpoint</TableHead>
+					<TableHead className="pl-8">Endpoint</TableHead>
+					<TableHead className="text-center">Datacenter</TableHead>
 					<TableHead></TableHead>
 				</TableRow>
 			</TableHeader>
@@ -70,8 +81,8 @@ export function RunnerConfigsTable({
 						<RowSkeleton />
 					</>
 				) : null}
-				{configs?.map((config) => (
-					<Row {...config} key={config.metadata} />
+				{configs?.map(([id, config]) => (
+					<Row name={id} {...config} key={id} />
 				))}
 
 				{!isLoading && hasNextPage ? (
@@ -112,34 +123,135 @@ function RowSkeleton() {
 	);
 }
 
-function Row(config: Rivet.RunnerConfig) {
+function Row({
+	name,
+	...value
+}: { name: string } & Rivet.RunnerConfigsListResponseRunnerConfigsValue) {
+	const config = Object.values(value.datacenters)[0];
+
 	return (
-		<TableRow key={runner.runnerId}>
+		<TableRow>
+			<TableCell>
+				<DiscreteCopyButton value={name}>{name}</DiscreteCopyButton>
+			</TableCell>
+			<TableCell>
+				<Provider metadata={config.metadata} />
+			</TableCell>
 			<TableCell>
 				<WithTooltip
-					content={config}
+					content={config.serverless?.url || "-"}
 					trigger={
-						<DiscreteCopyButton value={runner.runnerId}>
-							{runner.runnerId.slice(0, 8)}
+						<DiscreteCopyButton value={name}>
+							<span>
+								{config.serverless?.url &&
+								config.serverless.url.length > 32
+									? `${config.serverless.url.slice(0, 16)}...${config.serverless.url.slice(-16)}`
+									: config.serverless?.url}
+							</span>
 						</DiscreteCopyButton>
 					}
 				/>
 			</TableCell>
 			<TableCell>
-				{config.metadata &&
-				typeof config.metadata === "object" &&
-				"provider" in config.metadata
-					? (config.metadata.provider as string)
-					: "unknown"}
+				<Regions regions={Object.keys(value.datacenters)} />
 			</TableCell>
-			<TableCell>-</TableCell>
-			<TableCell>{runner.datacenter}</TableCell>
 
 			<TableCell>
-				{runner.remainingSlots}/{runner.totalSlots}
+				<div className="flex gap-2 justify-end">
+					{config.serverless ? (
+						<WithTooltip
+							content="Edit provider settings"
+							trigger={
+								<Button variant="outline" size="icon" asChild>
+									<Link
+										to="."
+										search={{
+											modal: getModal(
+												config.metadata?.provider,
+											),
+											config: name,
+											dc: Object.keys(
+												value.datacenters,
+											)[0],
+										}}
+									>
+										<Icon icon={faCog} />
+									</Link>
+								</Button>
+							}
+						/>
+					) : null}
+					<WithTooltip
+						content="Delete provider"
+						trigger={
+							<Button variant="outline" size="icon" asChild>
+								<Link
+									to="."
+									search={{
+										modal: "delete-provider-config",
+										config: name,
+									}}
+								>
+									<Icon icon={faTrash} />
+								</Link>
+							</Button>
+						}
+					/>
+				</div>
 			</TableCell>
-
-			<TableCell>{formatRelative(runner.createTs, new Date())}</TableCell>
 		</TableRow>
 	);
 }
+
+function getModal(provider: string | undefined) {
+	return "edit-provider-config";
+}
+
+function Provider({ metadata }: { metadata: unknown }) {
+	if (!metadata || typeof metadata !== "object") {
+		return <span>Unknown</span>;
+	}
+	if ("provider" in metadata && typeof metadata.provider === "string") {
+		if (metadata.provider === "vercel") {
+			return (
+				<div>
+					<Icon icon={faVercel} className="mr-1" /> Vercel
+				</div>
+			);
+		}
+		if (metadata.provider === "railway") {
+			return (
+				<div>
+					<Icon icon={faRailway} className="mr-1" /> Railway
+				</div>
+			);
+		}
+		return <span>{metadata.provider || "-"}</span>;
+	}
+	return <span>Unknown</span>;
+}
+
+function Regions({ regions }: { regions: string[] }) {
+	if (regions.length === 1) {
+		return (
+			<ActorRegion
+				className="w-full items-start flex-1"
+				regionId={regions[0]}
+				showLabel
+			/>
+		);
+	}
+
+	return (
+		<WithTooltip
+			content={regions
+				.map((region) => REGION_LABEL[region] ?? REGION_LABEL.unknown)
+				.join(", ")}
+			trigger={
+				<span className="text-left w-full">
+					{regions.length} regions
+				</span>
+			}
+		/>
+	);
+}
diff --git a/frontend/src/app/use-dialog.tsx b/frontend/src/app/use-dialog.tsx
index 176ab6c0d6..6248c85a67 100644
--- a/frontend/src/app/use-dialog.tsx
+++ b/frontend/src/app/use-dialog.tsx
@@ -26,6 +26,12 @@ export const useDialog = {
 	ConnectHetzner: createDialogHook(
 		() => import("@/app/dialogs/connect-hetzner-frame"),
 	),
+	EditProviderConfig: createDialogHook(
+		() => import("@/app/dialogs/edit-runner-config"),
+	),
+	DeleteConfig: createDialogHook(
+		() => import("@/app/dialogs/confirm-delete-config-frame"),
+	),
 	Billing: createDialogHook(() => import("@/app/dialogs/billing-frame")),
 	ProvideEngineCredentials: createDialogHook(
 		() => import("@/app/dialogs/provide-engine-credentials-frame"),
diff --git a/frontend/src/components/actors/region-select.tsx b/frontend/src/components/actors/region-select.tsx
index 02d8fe6e53..34cdde1dc9 100644
--- a/frontend/src/components/actors/region-select.tsx
+++ b/frontend/src/components/actors/region-select.tsx
@@ -6,9 +6,14 @@ import { useDataProvider } from "./data-provider";
 interface RegionSelectProps {
 	onValueChange: (value: string) => void;
 	value: string;
+	showAuto?: boolean;
 }
 
-export function RegionSelect({ onValueChange, value }: RegionSelectProps) {
+export function RegionSelect({
+	onValueChange,
+	value,
+	showAuto = true,
+}: RegionSelectProps) {
 	const {
 		data = [],
 		fetchNextPage,
@@ -17,11 +22,15 @@ export function RegionSelect({ onValueChange, value }: RegionSelectProps) {
 	} = useInfiniteQuery(useDataProvider().regionsQueryOptions());
 
 	const regions = [
-		{
-			label: <span>Automatic (Recommended)</span>,
-			value: "auto",
-			region: { id: "auto", name: "Automatic" },
-		},
+		...(showAuto
+			? [
+					{
+						label: <span>Automatic (Recommended)</span>,
+						value: "auto",
+						region: { id: "auto", name: "Automatic" },
+					},
+				]
+			: []),
 		...data.map((region) => {
 			return {
 				label:
diff --git a/frontend/src/components/matchmaker/lobby-region.tsx b/frontend/src/components/matchmaker/lobby-region.tsx
index eb67988f4d..c49672db91 100644
--- a/frontend/src/components/matchmaker/lobby-region.tsx
+++ b/frontend/src/components/matchmaker/lobby-region.tsx
@@ -48,6 +48,10 @@ export const REGION_ICON: Record<string, string | IconProp> = {
 	gru: "🇧🇷", // Sao Paulo
 	bom: "🇮🇳", // Mumbai
 	sin: "🇸🇬", // Singapore
+	"eu-central-1": "🇩🇪", // Frankfurt
+	"us-east-1": "🇺🇸", // Northern Virginia
+	"us-west-1": "🇺🇸", // Oregon
+	"ap-southeast-1": "🇸🇬", // Singapore
 };
 
 export const REGION_LABEL: Record<string, string> = {
@@ -96,12 +100,14 @@ export const REGION_LABEL: Record<string, string> = {
 	gru: "Sao Paulo",
 	bom: "Mumbai, India",
 	sin: "Singapore",
+	"eu-central-1": "Frankfurt, Germany",
+	"us-east-1": "Northern Virginia, USA",
+	"us-west-1": "Oregon, USA",
+	"ap-southeast-1": "Singapore",
 };
 
 export function getRegionKey(regionNameId: string | undefined) {
-	// HACK: Remove prefix for old regions with format `lnd-atl`
-	const regionIdSplit = (regionNameId || "").split("-");
-	return regionIdSplit[regionIdSplit.length - 1];
+	return regionNameId;
 }
 
 export function RegionIcon({
diff --git a/frontend/src/lib/auth.ts b/frontend/src/lib/auth.ts
index 13a8d5c97c..8da8f0304e 100644
--- a/frontend/src/lib/auth.ts
+++ b/frontend/src/lib/auth.ts
@@ -20,6 +20,7 @@ export const redirectToOrganization = async (clerk: Clerk) => {
 		const { data: orgs } = await clerk.user.getOrganizationMemberships();
 
 		if (orgs.length > 0) {
+			await clerk.setActive({ organization: orgs[0].organization.id });
 			throw redirect({
 				to: "/orgs/$organization",
 				params: { organization: orgs[0].organization.id },
diff --git a/frontend/src/routes/_context/_cloud.tsx b/frontend/src/routes/_context/_cloud.tsx
index 06627800d0..040fe0c24e 100644
--- a/frontend/src/routes/_context/_cloud.tsx
+++ b/frontend/src/routes/_context/_cloud.tsx
@@ -43,6 +43,8 @@ function CloudModals() {
 	const ConnectAwsDialog = useDialog.ConnectAws.Dialog;
 	const ConnectGcpDialog = useDialog.ConnectGcp.Dialog;
 	const ConnectHetznerDialog = useDialog.ConnectHetzner.Dialog;
+	const EditProviderConfigDialog = useDialog.EditProviderConfig.Dialog;
+	const DeleteConfigDialog = useDialog.DeleteConfig.Dialog;
 	const TokensDialog = useDialog.Tokens.Dialog;
 
 	return (
@@ -218,6 +220,46 @@ function CloudModals() {
 					},
 				}}
 			/>
+			<EditProviderConfigDialog
+				dialogContentProps={{
+					className: "max-w-xl",
+				}}
+				name={search.config}
+				dc={search.dc}
+				dialogProps={{
+					open: search.modal === "edit-provider-config",
+					// FIXME
+					onOpenChange: (value: any) => {
+						if (!value) {
+							navigate({
+								to: ".",
+								search: (old) => ({
+									...old,
+									modal: undefined,
+								}),
+							});
+						}
+					},
+				}}
+			/>
+			<DeleteConfigDialog
+				name={search.config}
+				dialogProps={{
+					open: search.modal === "delete-provider-config",
+					// FIXME
+					onOpenChange: (value: any) => {
+						if (!value) {
+							navigate({
+								to: ".",
+								search: (old) => ({
+									...old,
+									modal: undefined,
+								}),
+							});
+						}
+					},
+				}}
+			/>
 		</>
 	);
 }
diff --git a/frontend/src/routes/_context/_cloud/orgs.$organization.tsx b/frontend/src/routes/_context/_cloud/orgs.$organization.tsx
index f490701682..c741ad5e7a 100644
--- a/frontend/src/routes/_context/_cloud/orgs.$organization.tsx
+++ b/frontend/src/routes/_context/_cloud/orgs.$organization.tsx
@@ -4,21 +4,28 @@ import { createOrganizationContext } from "@/app/data-providers/cloud-data-provi
 
 export const Route = createFileRoute("/_context/_cloud/orgs/$organization")({
 	component: RouteComponent,
-	beforeLoad: ({ context, params }) => {
-		return match(context)
-			.with({ __type: "cloud" }, (context) => ({
-				dataProvider: {
-					...context.dataProvider,
-					...createOrganizationContext({
+	beforeLoad: async ({ context, params }) => {
+		return await match(context)
+			.with({ __type: "cloud" }, async (context) => {
+				context.clerk.setActive({
+					organization: params.organization,
+				});
+				return {
+					dataProvider: {
 						...context.dataProvider,
-						organization: params.organization,
-					}),
-				},
-			}))
+						...createOrganizationContext({
+							...context.dataProvider,
+							organization: params.organization,
+						}),
+					},
+				};
+			})
 			.otherwise(() => {
 				throw new Error("Invalid context type for this route");
 			});
 	},
+	pendingMinMs: 0,
+	pendingMs: 0,
 });
 
 function RouteComponent() {
diff --git a/frontend/src/routes/_context/_cloud/orgs.$organization/projects.$project/ns.$namespace/connect.tsx b/frontend/src/routes/_context/_cloud/orgs.$organization/projects.$project/ns.$namespace/connect.tsx
index bac00f7aa2..56d20e242d 100644
--- a/frontend/src/routes/_context/_cloud/orgs.$organization/projects.$project/ns.$namespace/connect.tsx
+++ b/frontend/src/routes/_context/_cloud/orgs.$organization/projects.$project/ns.$namespace/connect.tsx
@@ -42,34 +42,37 @@ export const Route = createFileRoute(
 });
 
 export function RouteComponent() {
-	const { data: runnerNamesCount, isLoading } = useInfiniteQuery({
-		...useEngineCompatDataProvider().runnerNamesQueryOptions(),
-		select: (data) => data.pages[0].names?.length,
+	const { data: runnerConfigsCount, isLoading } = useInfiniteQuery({
+		...useEngineCompatDataProvider().runnerConfigsQueryOptions(),
+		select: (data) => Object.values(data.pages[0].runnerConfigs).length,
 		refetchInterval: 5000,
 	});
 
-	return (
-		<div className="bg-card h-full border my-2 mr-2 rounded-lg">
-			<div className=" mt-2 flex justify-between items-center px-6 py-4">
-				<H1>Connect</H1>
-				<div>
-					<HelpDropdown>
-						<Button
-							variant="outline"
-							startIcon={<Icon icon={faQuestionCircle} />}
-						>
-							Need help?
-						</Button>
-					</HelpDropdown>
+	const hasConfigs =
+		runnerConfigsCount !== undefined && runnerConfigsCount > 0;
+
+	if (isLoading) {
+		return (
+			<div className="bg-card h-full border my-2 mr-2 rounded-lg">
+				<div className="mt-2 flex justify-between items-center px-6 py-4">
+					<H1>Connect</H1>
+					<div>
+						<HelpDropdown>
+							<Button
+								variant="outline"
+								startIcon={<Icon icon={faQuestionCircle} />}
+							>
+								Need help?
+							</Button>
+						</HelpDropdown>
+					</div>
 				</div>
-			</div>
-			<p className="max-w-5xl mb-6 px-6 text-muted-foreground">
-				Connect your RivetKit application to Rivet Cloud. Use your cloud
-				of choice to run Rivet Actors.
-			</p>
+				<p className="max-w-5xl mb-6 px-6 text-muted-foreground">
+					Connect your RivetKit application to Rivet Cloud. Use your
+					cloud of choice to run Rivet Actors.
+				</p>
 
-			<hr className="mb-4" />
-			{isLoading ? (
+				<hr className="mb-4" />
 				<div className="p-4 px-6 max-w-5xl ">
 					<Skeleton className="h-8 w-48 mb-4" />
 					<div className="grid grid-cols-3 gap-2 my-4">
@@ -81,103 +84,152 @@ export function RouteComponent() {
 						<Skeleton className="min-w-48 h-auto min-h-28 rounded-md" />
 					</div>
 				</div>
-			) : runnerNamesCount === 0 ? (
-				<div className="p-4 px-6 max-w-5xl">
-					<H3>Add Provider</H3>
-					<div className="grid grid-cols-3 gap-2 my-4">
-						<Button
-							size="lg"
-							variant="outline"
-							className="min-w-48 h-auto min-h-28 text-xl"
-							startIcon={<Icon icon={faVercel} />}
-							asChild
-						>
-							<RouterLink
-								to="."
-								search={{ modal: "connect-vercel" }}
+			</div>
+		);
+	}
+
+	if (!hasConfigs) {
+		return (
+			<div className="bg-card h-full border my-2 mr-2 rounded-lg flex items-center justify-center">
+				<div className="max-w-5xl border rounded-lg">
+					<div className="mt-2 flex justify-between items-center px-6 py-4">
+						<H1>Connect</H1>
+						<div>
+							<HelpDropdown>
+								<Button
+									variant="outline"
+									startIcon={<Icon icon={faQuestionCircle} />}
+								>
+									Need help?
+								</Button>
+							</HelpDropdown>
+						</div>
+					</div>
+					<p className="max-w-5xl mb-6 px-6 text-muted-foreground">
+						Connect your RivetKit application to Rivet Cloud. Use
+						your cloud of choice to run Rivet Actors.
+					</p>
+
+					<hr className="mb-4" />
+					<div className="p-4 px-6 max-w-5xl">
+						<H3>Add Provider</H3>
+						<div className="grid grid-cols-3 gap-2 my-4">
+							<Button
+								size="lg"
+								variant="outline"
+								className="min-w-48 h-auto min-h-28 text-xl"
+								startIcon={<Icon icon={faVercel} />}
+								asChild
 							>
-								Vercel
-							</RouterLink>
-						</Button>
-						<Button
-							size="lg"
-							variant="outline"
-							className="min-w-48 h-auto min-h-28 text-xl"
-							startIcon={<Icon icon={faRailway} />}
-							asChild
-						>
-							<RouterLink
-								to="."
-								search={{ modal: "connect-railway" }}
+								<RouterLink
+									to="."
+									search={{ modal: "connect-vercel" }}
+								>
+									Vercel
+								</RouterLink>
+							</Button>
+							<Button
+								size="lg"
+								variant="outline"
+								className="min-w-48 h-auto min-h-28 text-xl"
+								startIcon={<Icon icon={faRailway} />}
+								asChild
 							>
-								Railway
-							</RouterLink>
-						</Button>
-						<Button
-							size="lg"
-							variant="outline"
-							className="min-w-48 h-auto min-h-28 text-xl"
-							startIcon={<Icon icon={faAws} />}
-							asChild
-						>
-							<RouterLink
-								to="."
-								search={{ modal: "connect-aws" }}
+								<RouterLink
+									to="."
+									search={{ modal: "connect-railway" }}
+								>
+									Railway
+								</RouterLink>
+							</Button>
+							<Button
+								size="lg"
+								variant="outline"
+								className="min-w-48 h-auto min-h-28 text-xl"
+								startIcon={<Icon icon={faAws} />}
+								asChild
 							>
-								AWS ECS
-							</RouterLink>
-						</Button>
+								<RouterLink
+									to="."
+									search={{ modal: "connect-aws" }}
+								>
+									AWS ECS
+								</RouterLink>
+							</Button>
 
-						<Button
-							size="lg"
-							variant="outline"
-							className="min-w-48 h-auto min-h-28 text-xl"
-							startIcon={<Icon icon={faGoogleCloud} />}
-							asChild
-						>
-							<RouterLink
-								to="."
-								search={{ modal: "connect-gcp" }}
+							<Button
+								size="lg"
+								variant="outline"
+								className="min-w-48 h-auto min-h-28 text-xl"
+								startIcon={<Icon icon={faGoogleCloud} />}
+								asChild
 							>
-								Google Cloud Run
-							</RouterLink>
-						</Button>
-						<Button
-							size="lg"
-							variant="outline"
-							className="min-w-48 h-auto min-h-28 text-xl"
-							startIcon={<Icon icon={faHetznerH} />}
-							asChild
-						>
-							<RouterLink
-								to="."
-								search={{ modal: "connect-hetzner" }}
+								<RouterLink
+									to="."
+									search={{ modal: "connect-gcp" }}
+								>
+									Google Cloud Run
+								</RouterLink>
+							</Button>
+							<Button
+								size="lg"
+								variant="outline"
+								className="min-w-48 h-auto min-h-28 text-xl"
+								startIcon={<Icon icon={faHetznerH} />}
+								asChild
 							>
-								Hetzner
-							</RouterLink>
-						</Button>
+								<RouterLink
+									to="."
+									search={{ modal: "connect-hetzner" }}
+								>
+									Hetzner
+								</RouterLink>
+							</Button>
+							<Button
+								size="lg"
+								variant="outline"
+								className="min-w-48 h-auto min-h-28 text-xl"
+								startIcon={<Icon icon={faServer} />}
+								asChild
+							>
+								<RouterLink
+									to="."
+									search={{ modal: "connect-custom" }}
+								>
+									Custom
+								</RouterLink>
+							</Button>
+						</div>
+					</div>
+				</div>
+			</div>
+		);
+	}
+
+	return (
+		<div className="bg-card h-full border my-2 mr-2 rounded-lg">
+			<div className="mt-2 flex justify-between items-center px-6 py-4">
+				<H1>Connect</H1>
+				<div>
+					<HelpDropdown>
 						<Button
-							size="lg"
 							variant="outline"
-							className="min-w-48 h-auto min-h-28 text-xl"
-							startIcon={<Icon icon={faServer} />}
-							asChild
+							startIcon={<Icon icon={faQuestionCircle} />}
 						>
-							<RouterLink
-								to="."
-								search={{ modal: "connect-custom" }}
-							>
-								Custom
-							</RouterLink>
+							Need help?
 						</Button>
-					</div>
+					</HelpDropdown>
 				</div>
-			) : (
-				<>
-					<Providers />
-					<Runners />
-				</>
-			)}
+			</div>
+			<p className="max-w-5xl mb-6 px-6 text-muted-foreground">
+				Connect your RivetKit application to Rivet Cloud. Use your cloud
+				of choice to run Rivet Actors.
+			</p>
+
+			<hr className="mb-4" />
+
+			<Providers />
+			<Runners />
 		</div>
 	);
 }
@@ -196,7 +248,19 @@ function Providers() {
 
 	return (
 		<div className="p-4 px-6 max-w-5xl">
-			<H3>Providers</H3>
+			<div className="flex gap-2 items-center mb-4">
+				<H3>Providers</H3>
+
+				<ProviderDropdown>
+					<Button
+						className="min-w-32"
+						variant="outline"
+						startIcon={<Icon icon={faPlus} />}
+					>
+						Add Provider
+					</Button>
+				</ProviderDropdown>
+			</div>
 
 			<div className="max-w-5xl mx-auto">
 				<div className="border rounded-md">
@@ -228,17 +292,7 @@ function Runners() {
 	return (
 		<div className="pb-4 px-6 max-w-5xl ">
 			<div className="flex gap-2 items-center mb-4 mt-6">
-				<H3 className="">Runners</H3>
-
-				<ProviderDropdown>
-					<Button
-						className="min-w-32"
-						variant="outline"
-						startIcon={<Icon icon={faPlus} />}
-					>
-						Add Runner
-					</Button>
-				</ProviderDropdown>
+				<H3>Runners</H3>
 			</div>
 			<div className="max-w-5xl mx-auto">
 				<div className="border rounded-md">
diff --git a/frontend/src/routes/_context/_engine.tsx b/frontend/src/routes/_context/_engine.tsx
index 3125de09be..2ccffa1bf5 100644
--- a/frontend/src/routes/_context/_engine.tsx
+++ b/frontend/src/routes/_context/_engine.tsx
@@ -40,6 +40,8 @@ function EngineModals() {
 	const ConnectAwsDialog = useDialog.ConnectAws.Dialog;
 	const ConnectGcpDialog = useDialog.ConnectGcp.Dialog;
 	const ConnectHetznerDialog = useDialog.ConnectHetzner.Dialog;
+	const EditProviderConfigDialog = useDialog.EditProviderConfig.Dialog;
+	const DeleteConfigDialog = useDialog.DeleteConfig.Dialog;
 
 	return (
 		<>
@@ -180,6 +182,47 @@ function EngineModals() {
 					},
 				}}
 			/>
+
+			<EditProviderConfigDialog
+				dialogContentProps={{
+					className: "max-w-xl",
+				}}
+				name={search.config}
+				dc={search.dc}
+				dialogProps={{
+					open: search.modal === "edit-provider-config",
+					// FIXME
+					onOpenChange: (value: any) => {
+						if (!value) {
+							navigate({
+								to: ".",
+								search: (old) => ({
+									...old,
+									modal: undefined,
+								}),
+							});
+						}
+					},
+				}}
+			/>
+			<DeleteConfigDialog
+				name={search.config}
+				dialogProps={{
+					open: search.modal === "delete-provider-config",
+					// FIXME
+					onOpenChange: (value: any) => {
+						if (!value) {
+							navigate({
+								to: ".",
+								search: (old) => ({
+									...old,
+									modal: undefined,
+								}),
+							});
+						}
+					},
+				}}
+			/>
 		</>
 	);
 }
diff --git a/frontend/src/routes/onboarding/choose-organization.tsx b/frontend/src/routes/onboarding/choose-organization.tsx
index 8b56a13f97..2e72c7635a 100644
--- a/frontend/src/routes/onboarding/choose-organization.tsx
+++ b/frontend/src/routes/onboarding/choose-organization.tsx
@@ -1,5 +1,5 @@
-import { CreateOrganization } from "@clerk/clerk-react";
-import { createFileRoute } from "@tanstack/react-router";
+import { CreateOrganization, useOrganizationList } from "@clerk/clerk-react";
+import { createFileRoute, Navigate } from "@tanstack/react-router";
 import { RouteLayout } from "@/app/route-layout";
 
 export const Route = createFileRoute("/onboarding/choose-organization")({
@@ -7,11 +7,25 @@ export const Route = createFileRoute("/onboarding/choose-organization")({
 });
 
 function RouteComponent() {
+	const {
+		userMemberships: { data: userMemberships },
+	} = useOrganizationList({ userMemberships: true });
+
 	return (
 		<RouteLayout>
 			<div className="bg-card h-full border my-2 mr-2 rounded-lg">
 				<div className="mt-2 flex flex-col items-center justify-center h-full">
 					<div className="w-full sm:w-96">
+						{userMemberships?.length ? (
+							<Navigate
+								to={`/orgs/$organization`}
+								params={{
+									organization:
+										userMemberships[0].organization.id,
+								}}
+								replace
+							/>
+						) : null}
 						<CreateOrganization
 							hideSlug
 							afterCreateOrganizationUrl={(org) =>