diff --git a/svc/ctrl/worker/deploy/deploy_handler.go b/svc/ctrl/worker/deploy/deploy_handler.go
index c6d678371f9..0ccfc0177e2 100644
--- a/svc/ctrl/worker/deploy/deploy_handler.go
+++ b/svc/ctrl/worker/deploy/deploy_handler.go
@@ -14,7 +14,6 @@ import (
 	"github.com/unkeyed/unkey/pkg/db"
 	"github.com/unkeyed/unkey/pkg/fault"
 	"github.com/unkeyed/unkey/pkg/logger"
-	"github.com/unkeyed/unkey/pkg/ptr"
 	"github.com/unkeyed/unkey/pkg/uid"
 	githubclient "github.com/unkeyed/unkey/svc/ctrl/worker/github"
 )
@@ -58,8 +57,10 @@ const (
 //
 // Returns terminal errors for validation failures and retryable errors for
 // transient system failures.
-func (w *Workflow) Deploy(ctx restate.WorkflowSharedContext, req *hydrav1.DeployRequest) (*hydrav1.DeployResponse, error) {
+func (w *Workflow) Deploy(ctx restate.WorkflowSharedContext, req *hydrav1.DeployRequest) (_ *hydrav1.DeployResponse, retErr error) {
 	finishedSuccessfully := false
+	var currentStep *db.DeploymentStepsStep
+	var failureReason string
 
 	err := assert.All(
 		assert.NotEmpty(req.GetDeploymentId(), "deployment_id is required"),
@@ -80,14 +81,29 @@ func (w *Workflow) Deploy(ctx restate.WorkflowSharedContext, req *hydrav1.Deploy
 	if err = w.startDeploymentStep(ctx, deployment, db.DeploymentStepsStepQueued); err != nil {
 		return nil, err
 	}
+	queuedStep := db.DeploymentStepsStepQueued
+	currentStep = &queuedStep
 
 	defer func() {
 		if finishedSuccessfully {
 			return
 		}
 
-		if err = w.updateDeploymentStatus(ctx, deployment.ID, db.DeploymentsStatusFailed); err != nil {
-			logger.Error("deployment failed but we can not set the status", "error", err.Error())
+		if currentStep != nil {
+			msg := failureReason
+			if msg == "" {
+				msg = fault.UserFacingMessage(retErr)
+			}
+			if msg == "" {
+				msg = fmt.Sprintf("Deployment failed during %s step", string(*currentStep))
+			}
+			if stepErr := w.endDeploymentStep(ctx, deployment.ID, *currentStep, &msg); stepErr != nil {
+				logger.Error("failed to end deployment step on failure", "step", *currentStep, "error", stepErr)
+			}
+		}
+
+		if statusErr := w.updateDeploymentStatus(ctx, deployment.ID, db.DeploymentsStatusFailed); statusErr != nil {
+			logger.Error("deployment failed but we can not set the status", "error", statusErr.Error())
 		}
 	}()
 
@@ -137,10 +153,13 @@ func (w *Workflow) Deploy(ctx restate.WorkflowSharedContext, req *hydrav1.Deploy
 	if err = w.endDeploymentStep(ctx, deployment.ID, db.DeploymentStepsStepQueued, nil); err != nil {
 		return nil, err
 	}
+	currentStep = nil
 
 	if err = w.startDeploymentStep(ctx, deployment, db.DeploymentStepsStepBuilding); err != nil {
 		return nil, err
 	}
+	buildingStep := db.DeploymentStepsStepBuilding
+	currentStep = &buildingStep
 
 	dockerImage := ""
 
@@ -202,9 +221,8 @@ func (w *Workflow) Deploy(ctx restate.WorkflowSharedContext, req *hydrav1.Deploy
 			WorkspaceID:    deployment.WorkspaceID,
 		})
 		if err != nil {
-			buildErr := fmt.Errorf("failed to build docker image from git: %w", err)
-			_ = w.endDeploymentStep(ctx, deployment.ID, db.DeploymentStepsStepBuilding, ptr.P(fault.UserFacingMessage(err)))
-			return nil, buildErr
+			failureReason = fault.UserFacingMessage(err)
+			return nil, fmt.Errorf("failed to build docker image from git: %w", err)
 		}
 		dockerImage = build.ImageName
 
@@ -237,6 +255,7 @@ func (w *Workflow) Deploy(ctx restate.WorkflowSharedContext, req *hydrav1.Deploy
 	if err = w.endDeploymentStep(ctx, deployment.ID, db.DeploymentStepsStepBuilding, nil); err != nil {
 		return nil, err
 	}
+	currentStep = nil
 
 	if err = w.updateDeploymentStatus(ctx, deployment.ID, db.DeploymentsStatusDeploying); err != nil {
 		return nil, err
@@ -245,6 +264,8 @@ func (w *Workflow) Deploy(ctx restate.WorkflowSharedContext, req *hydrav1.Deploy
 	if err = w.startDeploymentStep(ctx, deployment, db.DeploymentStepsStepDeploying); err != nil {
 		return nil, err
 	}
+	deployingStep := db.DeploymentStepsStepDeploying
+	currentStep = &deployingStep
 
 	// Read region config from runtime settings to determine per-region replica counts.
 	// If regionConfig is empty, deploy to all available regions with 1 replica each (default).
@@ -309,6 +330,9 @@ func (w *Workflow) Deploy(ctx restate.WorkflowSharedContext, req *hydrav1.Deploy
 	existingSentinels, err := restate.Run(ctx, func(runCtx restate.RunContext) ([]db.Sentinel, error) {
 		return db.Query.FindSentinelsByEnvironmentID(runCtx, w.db.RO(), environment.ID)
 	}, restate.WithName("find existing sentinels"))
+	if err != nil {
+		return nil, fmt.Errorf("failed to find existing sentinels: %w", err)
+	}
 
 	existingSentinelsByRegion := make(map[string]db.Sentinel)
 	for _, sentinel := range existingSentinels {
@@ -417,10 +441,13 @@ func (w *Workflow) Deploy(ctx restate.WorkflowSharedContext, req *hydrav1.Deploy
 	if err = w.endDeploymentStep(ctx, deployment.ID, db.DeploymentStepsStepDeploying, nil); err != nil {
 		return nil, err
 	}
+	currentStep = nil
 
 	if err = w.startDeploymentStep(ctx, deployment, db.DeploymentStepsStepNetwork); err != nil {
 		return nil, err
 	}
+	networkStep := db.DeploymentStepsStepNetwork
+	currentStep = &networkStep
 
 	allDomains := buildDomains(
 		workspace.Slug,
@@ -500,6 +527,7 @@ func (w *Workflow) Deploy(ctx restate.WorkflowSharedContext, req *hydrav1.Deploy
 	if err = w.endDeploymentStep(ctx, deployment.ID, db.DeploymentStepsStepNetwork, nil); err != nil {
 		return nil, err
 	}
+	currentStep = nil
 
 	if err = w.updateDeploymentStatus(ctx, deployment.ID, db.DeploymentsStatusReady); err != nil {
 		return nil, err
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/page.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/page.tsx
index 255743a5b9a..b4f7d9513ff 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/page.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/page.tsx
@@ -1,11 +1,8 @@
 "use client";
+import { PRODUCT_HOME_ROUTES, useProductSelection } from "@/hooks/use-product-selection";
+import { useWorkspaceNavigation } from "@/hooks/use-workspace-navigation";
 import { useRouter } from "next/navigation";
 import { useEffect } from "react";
-import {
-  PRODUCT_HOME_ROUTES,
-  useProductSelection,
-} from "@/hooks/use-product-selection";
-import { useWorkspaceNavigation } from "@/hooks/use-workspace-navigation";
 
 export default function WorkspacePage() {
   const router = useRouter();
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/build-steps-table/build-step-logs-expanded.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/build-steps-table/build-step-logs-expanded.tsx
index a0035c393e3..e34dfebb32f 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/build-steps-table/build-step-logs-expanded.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/build-steps-table/build-step-logs-expanded.tsx
@@ -33,8 +33,8 @@ export function BuildStepLogsExpanded({ step }: { step: BuildStepRow }) {
               />
             </td>
             <td className="py-0" />
-            <td colSpan={3} className="h-[26px] py-px">
-              <span className="whitespace-pre-wrap font-mono text-xs text-gray-12 break-all">
+            <td colSpan={3} className="h-[26px] py-px ">
+              <span className="whitespace-pre-wrap font-mono text-xs text-gray-12 break-all ">
                 {log.message}
               </span>
             </td>
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/build-steps-table/columns.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/build-steps-table/columns.tsx
index c2b271eb8d1..2b7e0066349 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/build-steps-table/columns.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/build-steps-table/columns.tsx
@@ -32,7 +32,7 @@ export const buildStepsColumns: Column<BuildStepRow>[] = [
     key: "started_at",
     width: "85px",
     render: (step) => (
-      <div className="font-mono text-xs truncate max-w-[300px] flex items-center gap-2 ">
+      <div className="font-mono text-xs truncate max-w-75 flex items-center gap-2 ">
         <TimestampInfo
           displayType="local_hours_with_millis"
           value={step.started_at}
@@ -46,12 +46,12 @@ export const buildStepsColumns: Column<BuildStepRow>[] = [
     width: "32px",
     render: (step) => {
       if (step.error) {
-        return <TriangleWarning className="text-error-11" />;
+        return <TriangleWarning className="text-error-11" iconSize="md-regular" />;
       }
       if (step.cached) {
         return (
           <InfoTooltip content="This step was cached" asChild>
-            <Bolt className="text-primary-11" />
+            <Bolt className="text-primary-11" iconSize="md-regular" />
           </InfoTooltip>
         );
       }
@@ -63,7 +63,7 @@ export const buildStepsColumns: Column<BuildStepRow>[] = [
     width: "250px",
     render: (step) => (
       <div
-        className="font-mono text-xs truncate max-w-[300px] flex items-center gap-2 text-gray-12"
+        className="font-mono text-xs truncate max-w-75 flex items-center gap-2 text-gray-12"
         title={step.name}
       >
         <span className="truncate">{step.name}</span>
@@ -78,7 +78,7 @@ export const buildStepsColumns: Column<BuildStepRow>[] = [
         return null;
       }
       return (
-        <span className="truncate font-mono" title={step.error}>
+        <span className="block truncate font-mono max-w-[300px]" title={step.error}>
           {step.error}
         </span>
       );
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/deployment-progress.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/deployment-progress.tsx
index b627047be57..c84f53fd079 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/deployment-progress.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/deployment-progress.tsx
@@ -2,11 +2,12 @@
 
 import { trpc } from "@/lib/trpc/client";
 import { CloudUp, Earth, Hammer2, LayerFront } from "@unkey/icons";
-import { SettingCardGroup } from "@unkey/ui";
+import { Button, SettingCardGroup } from "@unkey/ui";
 import { useParams, useRouter } from "next/navigation";
 import { useEffect, useRef, useState } from "react";
 import { DeploymentDomainsCard } from "../../../../components/deployment-domains-card";
 import { useProjectData } from "../../../data-provider";
+import { RedeployDialog } from "../../components/table/components/actions/redeploy-dialog";
 import { useDeployment } from "../layout-provider";
 import { DeploymentBuildStepsTable } from "./build-steps-table/deployment-build-steps-table";
 import { DeploymentStep } from "./deployment-step";
@@ -17,6 +18,7 @@ export function DeploymentProgress() {
   const params = useParams();
   const workspaceSlug = params.workspaceSlug as string;
   const projectId = params.projectId as string;
+  const isFailed = deployment.status === "failed";
 
   const steps = trpc.deploy.deployment.steps.useQuery(
     {
@@ -33,7 +35,7 @@ export function DeploymentProgress() {
       includeStepLogs: true,
     },
     {
-      refetchInterval: 1000,
+      refetchInterval: 1_000,
     },
   );
 
@@ -41,13 +43,18 @@ export function DeploymentProgress() {
 
   const [now, setNow] = useState(0);
   useEffect(() => {
+    if (isFailed) {
+      return;
+    }
     const interval = setInterval(() => setNow(Date.now()), 500);
     return () => {
       clearInterval(interval);
     };
-  }, []);
+  }, [isFailed]);
+
   const { building, deploying, network, queued } = steps.data ?? {};
 
+  const [redeployOpen, setRedeployOpen] = useState(false);
   const domainsForDeployment = getDomainsForDeployment(deployment.id);
 
   // Latch true once we observe the build actively in progress; stays true after it completes
@@ -55,7 +62,7 @@ export function DeploymentProgress() {
   if (building && !building.endedAt) {
     hasFreshBuild.current = true;
   }
-  const isPrebuilt = !hasFreshBuild.current;
+  const isPrebuilt = !hasFreshBuild.current && !building?.error;
 
   useEffect(() => {
     if (network?.completed) {
@@ -126,7 +133,9 @@ export function DeploymentProgress() {
               ? deploying.endedAt
                 ? (deploying.error ?? "Deployed to all machines")
                 : "Deploying to all machines"
-              : "Waiting for build"
+              : isFailed
+                ? "Skipped"
+                : "Waiting for build"
           }
           duration={deploying ? (deploying.endedAt ?? now) - deploying.startedAt : undefined}
           status={
@@ -136,7 +145,9 @@ export function DeploymentProgress() {
                 ? "completed"
                 : deploying
                   ? "started"
-                  : "pending"
+                  : isFailed
+                    ? "skipped"
+                    : "pending"
           }
         />
         <DeploymentStep
@@ -147,7 +158,9 @@ export function DeploymentProgress() {
               ? network.endedAt
                 ? (network.error ?? `Domains assigned · ${domainsForDeployment.length} records`)
                 : "Assigning domains"
-              : "Waiting for deployments"
+              : isFailed
+                ? "Skipped"
+                : "Waiting for deployments"
           }
           duration={network ? (network.endedAt ?? now) - network.startedAt : undefined}
           status={
@@ -157,10 +170,40 @@ export function DeploymentProgress() {
                 ? "completed"
                 : network
                   ? "started"
-                  : "pending"
+                  : isFailed
+                    ? "skipped"
+                    : "pending"
           }
         />
       </SettingCardGroup>
+      {isFailed && (
+        <div className="flex flex-col gap-3 animate-fade-slide-in">
+          <div className="border border-errorA-4 bg-errorA-2 rounded-[14px] p-4 flex items-center justify-between">
+            <div className="flex items-center gap-3">
+              <div className="flex flex-col gap-0.5">
+                <span className="text-sm font-medium text-error-11">Deployment failed</span>
+                <span className="text-xs text-gray-11">
+                  {[queued, building, deploying, network].find((s) => s?.error)?.error ??
+                    "Deployment failed"}
+                </span>
+              </div>
+            </div>
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() => setRedeployOpen(true)}
+              className="px-3"
+            >
+              Redeploy
+            </Button>
+          </div>
+          <RedeployDialog
+            isOpen={redeployOpen}
+            onClose={() => setRedeployOpen(false)}
+            selectedDeployment={deployment}
+          />
+        </div>
+      )}
       {network?.completed && (
         <div className="animate-fade-slide-in">
           <DeploymentDomainsCard glow />
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/deployment-step.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/deployment-step.tsx
index bb77f1ecc38..97b50d38dd4 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/deployment-step.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/[deploymentId]/(deployment-progress)/deployment-step.tsx
@@ -10,7 +10,7 @@ type DeploymentStepProps = {
   title: string;
   description: string;
   duration?: number;
-  status: "pending" | "started" | "completed" | "error";
+  status: "pending" | "started" | "completed" | "error" | "skipped";
   expandable?: React.ReactNode;
   defaultExpanded?: boolean;
   badgeText?: string;
@@ -25,61 +25,79 @@ export function DeploymentStep({
   expandable,
   defaultExpanded,
 }: DeploymentStepProps) {
-  const showGlow = status === "started";
+  const showGlow = status === "started" || status === "error";
+  const isError = status === "error";
+  const isSkipped = status === "skipped";
   return (
-    <SettingCard
-      icon={
-        <div className="relative w-full h-full">
-          <div
-            className={cn(
-              "absolute inset-[-4px] rounded-[10px] blur-[14px]",
-              "bg-linear-to-l from-feature-8 to-info-9",
-              showGlow ? "animate-pulse opacity-20" : "opacity-0 transition-opacity duration-300",
-            )}
-          />
-          <div
-            className={cn(
-              "w-full h-full rounded-[10px] flex items-center justify-center shrink-0",
-              showGlow &&
-                "relative dark:bg-white dark:text-black bg-black text-white shadow-md shadow-black/40",
-            )}
-          >
-            {icon}
+    <div className={cn(isSkipped && "opacity-50")}>
+      <SettingCard
+        icon={
+          <div className="relative w-full h-full">
+            <div
+              className={cn(
+                "absolute inset-[-4px] rounded-[10px] blur-[14px]",
+                isError
+                  ? "bg-linear-to-l from-error-7 to-error-8"
+                  : "bg-linear-to-l from-feature-8 to-info-9",
+                showGlow ? "animate-pulse opacity-20" : "opacity-0 transition-opacity duration-300",
+              )}
+            />
+            <div
+              className={cn(
+                "w-full h-full rounded-[10px] flex items-center justify-center shrink-0",
+                isError
+                  ? "relative bg-errorA-3 dark:text-error-11 text-error-11"
+                  : showGlow &&
+                      "relative dark:bg-white dark:text-black bg-black text-white shadow-md shadow-black/40",
+              )}
+            >
+              {icon}
+            </div>
           </div>
-        </div>
-      }
-      title={
-        <div className="flex items-center gap-2">
-          <span>{title}</span>
-          <Badge
-            variant="success"
-            size="sm"
-            className={cn(
-              "transition-all duration-300 font-normal text-[11px] rounded-md h-[18px]",
-              status === "completed" ? "opacity-100 scale-100" : "opacity-0 scale-95",
+        }
+        title={
+          <div className="flex items-center gap-2">
+            <span>{title}</span>
+            {isError ? (
+              <Badge
+                variant="error"
+                size="sm"
+                className="transition-all duration-300 font-normal text-[11px] rounded-md h-[18px] opacity-100 scale-100"
+              >
+                Failed
+              </Badge>
+            ) : (
+              <Badge
+                variant="success"
+                size="sm"
+                className={cn(
+                  "transition-all duration-300 font-normal text-[11px] rounded-md h-[18px]",
+                  status === "completed" ? "opacity-100 scale-100" : "opacity-0 scale-95",
+                )}
+              >
+                Complete
+              </Badge>
             )}
-          >
-            Complete
-          </Badge>
+          </div>
+        }
+        iconClassName={showGlow ? "bg-transparent shadow-none dark:ring-0" : undefined}
+        className="relative"
+        description={description}
+        expandable={expandable}
+        defaultExpanded={defaultExpanded}
+        contentWidth="w-fit"
+      >
+        <div className="flex items-center gap-4 justify-end w-full absolute right-14">
+          <span className="text-gray-10 text-xs">{duration ? ms(duration) : null}</span>
+          {status === "completed" ? (
+            <Check iconSize="md-regular" className="text-success-11" />
+          ) : status === "started" ? (
+            <Loading className="size-4" />
+          ) : status === "error" ? (
+            <TriangleWarning2 className="text-error-11" iconSize="md-regular" />
+          ) : null}
         </div>
-      }
-      iconClassName={showGlow ? "bg-transparent shadow-none dark:ring-0" : undefined}
-      className="relative"
-      description={description}
-      expandable={expandable}
-      defaultExpanded={defaultExpanded}
-      contentWidth="w-fit"
-    >
-      <div className="flex items-center gap-4 justify-end w-full absolute right-14">
-        <span className="text-gray-10 text-xs">{duration ? ms(duration) : null}</span>
-        {status === "completed" ? (
-          <Check iconSize="md-regular" className="text-success-11" />
-        ) : status === "started" ? (
-          <Loading className="size-4" />
-        ) : status === "error" ? (
-          <TriangleWarning2 className="text-error-11" />
-        ) : null}
-      </div>
-    </SettingCard>
+      </SettingCard>
+    </div>
   );
 }
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/components/table/components/actions/deployment-list-table-action.popover.constants.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/components/table/components/actions/deployment-list-table-action.popover.constants.tsx
index 6092cb2340a..be9baf0a9de 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/components/table/components/actions/deployment-list-table-action.popover.constants.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/components/table/components/actions/deployment-list-table-action.popover.constants.tsx
@@ -36,7 +36,8 @@ export const DeploymentListTableActions = ({
       selectedDeployment.status === "ready" &&
       selectedDeployment.id !== liveDeployment.id;
 
-    const canRedeploy = selectedDeployment.status === "ready";
+    const canRedeploy =
+      selectedDeployment.status === "ready" || selectedDeployment.status === "failed";
 
     return [
       {
@@ -95,9 +96,7 @@ export const DeploymentListTableActions = ({
         label: "Go to logs...",
         icon: <Layers3 iconSize="md-regular" />,
         onClick: () => {
-          router.push(
-            `/${workspace.slug}/projects/${selectedDeployment.projectId}/deployments/${selectedDeployment.id}/logs`,
-          );
+          router.push(`/${workspace.slug}/projects/${selectedDeployment.projectId}/logs`);
         },
       },
     ];
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/components/table/components/deployment-status-badge.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/components/table/components/deployment-status-badge.tsx
index 9ec8da7a585..2f6de02bc93 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/components/table/components/deployment-status-badge.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/components/table/components/deployment-status-badge.tsx
@@ -86,7 +86,7 @@ export const DeploymentStatusBadge = ({ status, className }: DeploymentStatusBad
   return (
     <div
       className={cn(
-        "items-center flex gap-2 p-1.5 rounded-md w-fit relative",
+        "items-center flex gap-2 p-1.5 rounded-md w-fit relative h-5.5",
         animated && "overflow-hidden",
         bgColor,
         className,
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/components/table/deployments-list.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/components/table/deployments-list.tsx
index 0c0c5fe71cf..6050f3dafc0 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/components/table/deployments-list.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/deployments/components/table/deployments-list.tsx
@@ -68,7 +68,7 @@ export const DeploymentsList = () => {
           const isLive = liveDeploymentId === deployment.id;
           const iconContainer = <StatusIndicator withSignal={isLive} />;
           return (
-            <div className="flex flex-col items-start px-[18px] py-1.5">
+            <div className="flex flex-col items-start px-4.5 py-1.5">
               <div className="flex gap-3 items-center w-full">
                 <div className="shrink-0">{iconContainer}</div>
                 <div className="min-w-0 flex-1">
@@ -133,7 +133,7 @@ export const DeploymentsList = () => {
           const mem = isFailed ? null : formatMemoryParts(deployment.memoryMib);
           return (
             <div className="flex items-center gap-7">
-              <div className="hidden 2xl:flex items-center">
+              <div className="hidden 2xl:flex items-center w-[80px]">
                 {isFailed ? (
                   <span className="text-gray-9">—</span>
                 ) : (
@@ -146,20 +146,24 @@ export const DeploymentsList = () => {
                   </div>
                 )}
               </div>
-              {!isFailed && cpu && mem && (
-                <div className="hidden 2xl:flex gap-1.5">
-                  <div className="bg-grayA-3 font-mono text-xs items-center flex gap-1.5 p-1.5 rounded-md text-grayA-11 w-fit h-[22px]">
-                    <Bolt className="text-gray-12" iconSize="sm-regular" />
-                    <span className="font-semibold text-grayA-12">{cpu.value}</span>
-                    <span>{cpu.unit}</span>
-                  </div>
-                  <div className="bg-grayA-3 font-mono text-xs items-center flex gap-1.5 p-1.5 rounded-md text-grayA-11 w-fit h-[22px]">
-                    <ScanCode className="text-gray-12" iconSize="sm-regular" />
-                    <span className="font-semibold text-grayA-12">{mem.value}</span>
-                    <span>{mem.unit}</span>
-                  </div>
-                </div>
-              )}
+              <div className="hidden 2xl:flex gap-1.5 w-[180px]">
+                {isFailed || !cpu || !mem ? (
+                  <span className="text-gray-9">—</span>
+                ) : (
+                  <>
+                    <div className="bg-grayA-3 font-mono text-xs items-center flex gap-1.5 p-1.5 rounded-md text-grayA-11 w-fit h-[22px]">
+                      <Bolt className="text-gray-12" iconSize="sm-regular" />
+                      <span className="font-semibold text-grayA-12">{cpu.value}</span>
+                      <span>{cpu.unit}</span>
+                    </div>
+                    <div className="bg-grayA-3 font-mono text-xs items-center flex gap-1.5 p-1.5 rounded-md text-grayA-11 w-fit h-[22px]">
+                      <ScanCode className="text-gray-12" iconSize="sm-regular" />
+                      <span className="font-semibold text-grayA-12">{mem.value}</span>
+                      <span>{mem.unit}</span>
+                    </div>
+                  </>
+                )}
+              </div>
               <div className="flex gap-2 items-center">
                 <div className="size-5 rounded flex items-center justify-center border border-grayA-3 bg-grayA-3">
                   <CodeBranch iconSize="sm-regular" className="text-gray-12" />
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/build-settings/dockerfile-settings.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/build-settings/dockerfile-settings.tsx
index 3a945c5ed49..66be2449d47 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/build-settings/dockerfile-settings.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/build-settings/dockerfile-settings.tsx
@@ -12,7 +12,7 @@ const dockerfileSchema = z.object({
 });
 
 export const Dockerfile = () => {
-  const { settings } = useEnvironmentSettings();
+  const { settings, autoSave } = useEnvironmentSettings();
   const { environmentId, dockerfile: defaultValue } = settings;
 
   const {
@@ -48,6 +48,7 @@ export const Dockerfile = () => {
       displayValue={defaultValue}
       onSubmit={handleSubmit(onSubmit)}
       saveState={saveState}
+      autoSave={autoSave}
     >
       <FormInput
         required
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/build-settings/root-directory-settings.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/build-settings/root-directory-settings.tsx
index e7edbf20bca..7b749e8a731 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/build-settings/root-directory-settings.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/build-settings/root-directory-settings.tsx
@@ -12,7 +12,7 @@ const rootDirectorySchema = z.object({
 });
 
 export const RootDirectory = () => {
-  const { settings } = useEnvironmentSettings();
+  const { settings, autoSave } = useEnvironmentSettings();
   const { environmentId, dockerContext: defaultValue } = settings;
 
   const {
@@ -48,6 +48,7 @@ export const RootDirectory = () => {
       displayValue={defaultValue || "."}
       onSubmit={handleSubmit(onSubmit)}
       saveState={saveState}
+      autoSave={autoSave}
     >
       <FormInput
         label="Root directory"
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/command.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/command.tsx
index 81990ee2cdf..3acf15dffd3 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/command.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/command.tsx
@@ -17,7 +17,7 @@ const commandSchema = z.object({
 type CommandFormValues = z.infer<typeof commandSchema>;
 
 export const Command = () => {
-  const { settings } = useEnvironmentSettings();
+  const { settings, autoSave } = useEnvironmentSettings();
   const { command, environmentId } = settings;
   const defaultCommand = command.join(" ");
 
@@ -70,6 +70,7 @@ export const Command = () => {
       }
       onSubmit={handleSubmit(onSubmit)}
       saveState={saveState}
+      autoSave={autoSave}
     >
       <FormTextarea
         label="Command"
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/cpu.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/cpu.tsx
index 0c9393bb138..143673b7124 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/cpu.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/cpu.tsx
@@ -31,7 +31,7 @@ const cpuSchema = z.object({
 type CpuFormValues = z.infer<typeof cpuSchema>;
 
 export const Cpu = () => {
-  const { settings } = useEnvironmentSettings();
+  const { settings, autoSave } = useEnvironmentSettings();
   const { environmentId, cpuMillicores: defaultCpu } = settings;
 
   const {
@@ -83,6 +83,7 @@ export const Cpu = () => {
       })()}
       onSubmit={handleSubmit(onSubmit)}
       saveState={saveState}
+      autoSave={autoSave}
     >
       <div className="flex flex-col">
         <span className="text-gray-11 text-[13px]">CPU per instance</span>
@@ -97,6 +98,7 @@ export const Cpu = () => {
                 setValue("cpu", indexToValue(CPU_OPTIONS, value, 256), { shouldValidate: true });
               }
             }}
+            onValueCommit={autoSave ? () => handleSubmit(onSubmit)() : undefined}
             className="flex-1 max-w-[480px]"
             rangeStyle={{
               background: "linear-gradient(to right, hsla(var(--infoA-4)), hsla(var(--infoA-12)))",
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/healthcheck/index.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/healthcheck/index.tsx
index 040a420eb8c..aec22ed73f1 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/healthcheck/index.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/healthcheck/index.tsx
@@ -20,7 +20,7 @@ import { HTTP_METHODS, type HealthcheckFormValues, healthcheckSchema } from "./s
 import { intervalToSeconds, secondsToInterval } from "./utils";
 
 export const Healthcheck = () => {
-  const { settings } = useEnvironmentSettings();
+  const { settings, autoSave } = useEnvironmentSettings();
   const { healthcheck, environmentId } = settings;
 
   const defaultValues: HealthcheckFormValues = {
@@ -94,6 +94,7 @@ export const Healthcheck = () => {
       }
       onSubmit={handleSubmit(onSubmit)}
       saveState={saveState}
+      autoSave={autoSave}
     >
       <div className="flex flex-col gap-3 w-[520px]">
         {/* TODO: multi-check when API supports
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/instances.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/instances.tsx
index 09979aeca1b..1fa1d272a30 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/instances.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/instances.tsx
@@ -20,7 +20,7 @@ const instancesSchema = z.object({
 type InstancesFormValues = z.infer<typeof instancesSchema>;
 
 export const Instances = () => {
-  const { settings } = useEnvironmentSettings();
+  const { settings, autoSave } = useEnvironmentSettings();
   const { environmentId, regionConfig } = settings;
 
   const selectedRegions = Object.keys(regionConfig);
@@ -82,6 +82,7 @@ export const Instances = () => {
       }
       onSubmit={handleSubmit(onSubmit)}
       saveState={saveState}
+      autoSave={autoSave}
     >
       <div className="flex flex-col">
         <span className="text-gray-11 text-[13px]">Instances per region</span>
@@ -96,6 +97,15 @@ export const Instances = () => {
                 setValue("instances", value, { shouldValidate: true });
               }
             }}
+            onValueCommit={
+              autoSave
+                ? ([value]) => {
+                    if (value !== undefined) {
+                      handleSubmit(onSubmit)();
+                    }
+                  }
+                : undefined
+            }
             className="flex-1 max-w-[480px]"
             rangeStyle={{
               background:
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/memory.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/memory.tsx
index a6ab7a084bf..d5eeafd8b9f 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/memory.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/memory.tsx
@@ -31,7 +31,7 @@ const memorySchema = z.object({
 type MemoryFormValues = z.infer<typeof memorySchema>;
 
 export const Memory = () => {
-  const { settings } = useEnvironmentSettings();
+  const { settings, autoSave } = useEnvironmentSettings();
   const { memoryMib: defaultMemory, environmentId } = settings;
 
   const {
@@ -83,6 +83,7 @@ export const Memory = () => {
       })()}
       onSubmit={handleSubmit(onSubmit)}
       saveState={saveState}
+      autoSave={autoSave}
     >
       <div className="flex flex-col">
         <span className="text-gray-11 text-[13px]">Memory per instance</span>
@@ -99,6 +100,7 @@ export const Memory = () => {
                 });
               }
             }}
+            onValueCommit={autoSave ? () => handleSubmit(onSubmit)() : undefined}
             className="flex-1 max-w-[480px]"
             rangeStyle={{
               background:
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/port-settings.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/port-settings.tsx
index d64afab86fa..b8b9f017d23 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/port-settings.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/port-settings.tsx
@@ -12,7 +12,7 @@ const portSchema = z.object({
 });
 
 export const Port = () => {
-  const { settings } = useEnvironmentSettings();
+  const { settings, autoSave } = useEnvironmentSettings();
   const { environmentId, port: defaultValue } = settings;
 
   const {
@@ -48,6 +48,7 @@ export const Port = () => {
       displayValue={String(defaultValue)}
       onSubmit={handleSubmit(onSubmit)}
       saveState={saveState}
+      autoSave={autoSave}
     >
       <FormInput
         required
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/regions.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/regions.tsx
index b2635a16954..7bd0b3547b9 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/regions.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/runtime-settings/regions.tsx
@@ -21,7 +21,7 @@ const regionsSchema = z.object({
 type RegionsFormValues = z.infer<typeof regionsSchema>;
 
 export const Regions = () => {
-  const { settings } = useEnvironmentSettings();
+  const { settings, autoSave } = useEnvironmentSettings();
   const { environmentId, regionConfig } = settings;
   const defaultRegions = Object.keys(regionConfig);
 
@@ -35,6 +35,7 @@ export const Regions = () => {
       environmentId={environmentId}
       defaultRegions={defaultRegions}
       availableRegions={availableRegions ?? []}
+      autoSave={autoSave}
     />
   );
 };
@@ -43,12 +44,14 @@ type RegionsFormProps = {
   environmentId: string;
   defaultRegions: string[];
   availableRegions: string[];
+  autoSave?: boolean;
 };
 
 const RegionsForm: React.FC<RegionsFormProps> = ({
   environmentId,
   defaultRegions,
   availableRegions,
+  autoSave,
 }) => {
   const {
     handleSubmit,
@@ -150,6 +153,7 @@ const RegionsForm: React.FC<RegionsFormProps> = ({
       displayValue={displayValue}
       onSubmit={handleSubmit(onSubmit)}
       saveState={saveState}
+      autoSave={autoSave}
     >
       <FormCombobox
         label="Regions"
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/sentinel-settings/keyspaces.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/sentinel-settings/keyspaces.tsx
index 512654fed0a..2d0302fc0f2 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/sentinel-settings/keyspaces.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/sentinel-settings/keyspaces.tsx
@@ -19,7 +19,7 @@ const keyspacesSchema = z.object({
 type KeyspacesFormValues = z.infer<typeof keyspacesSchema>;
 
 export const Keyspaces = () => {
-  const { settings } = useEnvironmentSettings();
+  const { settings, autoSave } = useEnvironmentSettings();
   const { environmentId } = settings;
 
   const { data: availableKeyspaces } =
@@ -39,6 +39,7 @@ export const Keyspaces = () => {
       environmentId={environmentId}
       defaultKeyspaceIds={defaultKeyspaceIds}
       availableKeyspaces={availableKeyspaces ?? {}}
+      autoSave={autoSave}
     />
   );
 };
@@ -47,12 +48,14 @@ type KeyspacesFormProps = {
   environmentId: string;
   defaultKeyspaceIds: string[];
   availableKeyspaces: Record<string, { id: string; api: { name: string } }>;
+  autoSave?: boolean;
 };
 
 const KeyspacesForm: React.FC<KeyspacesFormProps> = ({
   environmentId,
   defaultKeyspaceIds,
   availableKeyspaces,
+  autoSave,
 }) => {
   const {
     handleSubmit,
@@ -160,6 +163,7 @@ const KeyspacesForm: React.FC<KeyspacesFormProps> = ({
       displayValue={displayValue}
       onSubmit={handleSubmit(onSubmit)}
       saveState={saveState}
+      autoSave={autoSave}
     >
       <FormCombobox
         label="Keyspaces"
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/shared/form-setting-card.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/shared/form-setting-card.tsx
index bcb9a1149ec..433e60097cc 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/shared/form-setting-card.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/shared/form-setting-card.tsx
@@ -18,6 +18,7 @@ type EditableSettingCardProps = {
 
   ref?: React.Ref<HTMLFormElement>;
   className?: string;
+  autoSave?: boolean;
 };
 
 export const FormSettingCard = ({
@@ -31,6 +32,7 @@ export const FormSettingCard = ({
   saveState,
   ref,
   className,
+  autoSave,
 }: EditableSettingCardProps) => {
   return (
     <SettingCard
@@ -49,31 +51,47 @@ export const FormSettingCard = ({
             e.preventDefault();
             onSubmit(e);
           }}
+          onBlur={(e) => {
+            if (!autoSave || saveState.status !== "ready") {
+              return;
+            }
+            const relatedTarget = e.relatedTarget instanceof Node ? e.relatedTarget : null;
+            if (!e.currentTarget.contains(relatedTarget)) {
+              e.currentTarget.requestSubmit();
+            }
+          }}
         >
-          <div className="px-4 pt-4 pb-2 flex flex-col gap-3 overflow-y-auto max-h-[500px]">
+          <div
+            className={cn(
+              "px-4 pt-4 flex flex-col gap-3 overflow-y-auto max-h-[500px]",
+              autoSave ? "pb-4" : "pb-2",
+            )}
+          >
             {children}
           </div>
-          <div className="px-4 pt-2 pb-4 flex justify-end">
-            <InfoTooltip
-              content={saveState.status === "disabled" ? saveState.reason : undefined}
-              disabled={
-                saveState.status !== "disabled" || !("reason" in saveState && saveState.reason)
-              }
-              asChild
-              variant="inverted"
-            >
-              <Button
-                type="submit"
-                variant="primary"
-                className="px-3 py-3"
-                size="sm"
-                disabled={saveState.status !== "ready"}
-                loading={saveState.status === "saving"}
+          {!autoSave && (
+            <div className="px-4 pt-2 pb-4 flex justify-end">
+              <InfoTooltip
+                content={saveState.status === "disabled" ? saveState.reason : undefined}
+                disabled={
+                  saveState.status !== "disabled" || !("reason" in saveState && saveState.reason)
+                }
+                asChild
+                variant="inverted"
               >
-                Save
-              </Button>
-            </InfoTooltip>
-          </div>
+                <Button
+                  type="submit"
+                  variant="primary"
+                  className="px-3 py-3"
+                  size="sm"
+                  disabled={saveState.status !== "ready"}
+                  loading={saveState.status === "saving"}
+                >
+                  Save
+                </Button>
+              </InfoTooltip>
+            </div>
+          )}
         </form>
       }
     >
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/shared/settings-group.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/shared/settings-group.tsx
index 15737428294..95e6162747b 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/shared/settings-group.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/shared/settings-group.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { ChevronRight } from "@unkey/icons";
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 
 type SettingsGroupProps = {
   icon: React.ReactNode;
@@ -20,6 +20,10 @@ export const SettingsGroup = ({
 }: SettingsGroupProps) => {
   const [expanded, setExpanded] = useState(defaultExpanded);
 
+  useEffect(() => {
+    setExpanded(defaultExpanded);
+  }, [defaultExpanded]);
+
   return (
     <div className="flex flex-col">
       <div className="flex items-center justify-between mb-4 px-2">
@@ -30,7 +34,7 @@ export const SettingsGroup = ({
         <button
           type="button"
           onClick={() => setExpanded((prev) => !prev)}
-          className="flex items-center gap-1 text-xs text-gray-10 hover:text-gray-11 transition-colors group duration-300"
+          className="flex items-center gap-1 text-xs text-gray-10 hover:text-gray-11 transition-colors group duration-300 cursor-pointer"
         >
           {!hideChevron && (
             <>
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/deployment-settings.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/deployment-settings.tsx
index 4b7c0b132af..f3097376c2e 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/deployment-settings.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/deployment-settings.tsx
@@ -21,45 +21,63 @@ import { EnvVars } from "./components/advanced-settings/env-vars";
 import { Keyspaces } from "./components/sentinel-settings/keyspaces";
 import { SettingsGroup } from "./components/shared/settings-group";
 
+// build is only required to invalidate other defaults. E.g onboarding settings, passes build=true to prevent expanding other sections.
+type DeploymentSection = "advanced" | "sentinel" | "runtime" | "build";
+
 type DeploymentSettingsProps = {
   githubReadOnly?: boolean;
+  sections?: Partial<Record<DeploymentSection, true>>;
 };
 
-export const DeploymentSettings = ({ githubReadOnly = false }: DeploymentSettingsProps) => (
-  <div className="flex flex-col gap-6">
-    <SettingCardGroup>
-      <GitHub readOnly={githubReadOnly} />
-      <RootDirectory />
-      <Dockerfile />
-    </SettingCardGroup>
-    <SettingsGroup icon={<CircleHalfDottedClock iconSize="md-medium" />} title="Runtime settings">
-      <SettingCardGroup>
-        <Regions />
-        <Instances />
-        <Cpu />
-        <Memory />
-        {/* Temporarily disabled */}
-        {/* <Storage /> */}
-        <Healthcheck />
-        <Port />
-        <Command />
-        {/* Temporarily disabled */}
-        {/* <Scaling /> */}
-      </SettingCardGroup>
-    </SettingsGroup>
-    <SettingsGroup icon={<Gear iconSize="md-medium" />} title="Advanced configurations">
+export const DeploymentSettings = ({
+  githubReadOnly = false,
+  sections = { build: true, runtime: true, advanced: true, sentinel: true },
+}: DeploymentSettingsProps) => {
+  return (
+    <div className="flex flex-col gap-6">
       <SettingCardGroup>
-        <EnvVars />
-        <CustomDomains />
+        <GitHub readOnly={githubReadOnly} />
+        <RootDirectory />
+        <Dockerfile />
       </SettingCardGroup>
-    </SettingsGroup>
-    <SettingsGroup
-      icon={<StackPerspective2 iconSize="md-medium" />}
-      title="Sentinel configurations"
-    >
-      <SettingCardGroup>
-        <Keyspaces />
-      </SettingCardGroup>
-    </SettingsGroup>
-  </div>
-);
+      <SettingsGroup
+        icon={<CircleHalfDottedClock iconSize="md-medium" />}
+        title="Runtime settings"
+        defaultExpanded={Boolean(sections.runtime)}
+      >
+        <SettingCardGroup>
+          <Regions />
+          <Instances />
+          <Cpu />
+          <Memory />
+          {/* Temporarily disabled */}
+          {/* <Storage /> */}
+          <Healthcheck />
+          <Port />
+          <Command />
+          {/* Temporarily disabled */}
+          {/* <Scaling /> */}
+        </SettingCardGroup>
+      </SettingsGroup>
+      <SettingsGroup
+        icon={<Gear iconSize="md-medium" />}
+        title="Advanced configurations"
+        defaultExpanded={Boolean(sections.advanced)}
+      >
+        <SettingCardGroup>
+          <EnvVars />
+          <CustomDomains />
+        </SettingCardGroup>
+      </SettingsGroup>
+      <SettingsGroup
+        icon={<StackPerspective2 iconSize="md-medium" />}
+        title="Sentinel configurations"
+        defaultExpanded={Boolean(sections.sentinel)}
+      >
+        <SettingCardGroup>
+          <Keyspaces />
+        </SettingCardGroup>
+      </SettingsGroup>
+    </div>
+  );
+};
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/environment-provider.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/environment-provider.tsx
index 1669035daf7..4f41c62384a 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/environment-provider.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/environment-provider.tsx
@@ -9,6 +9,7 @@ import { useProjectData } from "../data-provider";
 
 type EnvironmentContextType = {
   settings: EnvironmentSettings;
+  autoSave?: boolean;
 };
 
 export const EnvironmentContext = createContext<EnvironmentContextType | null>(null);
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/components/status-indicator.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/components/status-indicator.tsx
index 053f9984df7..26c70fd46c2 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/components/status-indicator.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/components/status-indicator.tsx
@@ -43,11 +43,12 @@ export function StatusIndicator({
   return (
     <InfoTooltip
       content={getTooltipContent(status)}
+      asChild
       position={{
         side: "bottom",
         align: "center",
       }}
-      className="max-w-[300px]"
+      className="max-w-75"
     >
       <div className="relative">
         <div
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/configure-deployment.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/configure-deployment.tsx
index 4a54e998db0..5e2e5385fd2 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/configure-deployment.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/configure-deployment.tsx
@@ -16,7 +16,7 @@ export const ConfigureDeploymentStep = ({
   projectId,
   onDeploymentCreated,
 }: ConfigureDeploymentStepProps) => {
-  const { next } = useStepWizard();
+  const { next, activeStepId } = useStepWizard();
 
   const deploy = trpc.deploy.deployment.create.useMutation({
     onSuccess: async (data) => {
@@ -34,9 +34,9 @@ export const ConfigureDeploymentStep = ({
 
   return (
     <ProjectDataProvider projectId={projectId}>
-      <OnboardingEnvironmentSettingsProvider>
-        <div className="w-[900px]">
-          <DeploymentSettings githubReadOnly />
+      <OnboardingEnvironmentSettingsProvider isActive={activeStepId === "configure-deployment"}>
+        <div className="w-225">
+          <DeploymentSettings githubReadOnly sections={{ build: true }} />
           <div className="flex justify-end mt-6 mb-10 flex-col gap-4">
             <Button
               type="button"
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/onboarding-environment-provider.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/onboarding-environment-provider.tsx
index 33838606196..04f09c6132f 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/onboarding-environment-provider.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/onboarding-environment-provider.tsx
@@ -4,6 +4,7 @@ import {
   type EnvironmentSettings,
   buildSettingsMutations,
 } from "@/lib/collections/deploy/environment-settings";
+import { trpc } from "@/lib/trpc/client";
 import { eq, useLiveQuery } from "@tanstack/react-db";
 import { type PropsWithChildren, useEffect, useMemo, useRef } from "react";
 import { useProjectData } from "../../[projectId]/(overview)/data-provider";
@@ -16,7 +17,10 @@ import { EnvironmentContext } from "../../[projectId]/(overview)/settings/enviro
  * but syncs production setting changes to every other environment so new
  * projects start with consistent config.
  */
-export const OnboardingEnvironmentSettingsProvider = ({ children }: PropsWithChildren) => {
+export const OnboardingEnvironmentSettingsProvider = ({
+  children,
+  isActive,
+}: PropsWithChildren<{ isActive: boolean }>) => {
   const { environments } = useProjectData();
 
   const prodEnvId = useMemo(
@@ -39,15 +43,75 @@ export const OnboardingEnvironmentSettingsProvider = ({ children }: PropsWithChi
 
   const settings = data.at(0);
 
+  const { data: availableRegions } = trpc.deploy.environmentSettings.getAvailableRegions.useQuery(
+    undefined,
+    { enabled: Boolean(prodEnvId) },
+  );
+
+  useInitializeSettings(settings, availableRegions, isActive);
   useSyncSettingsToOtherEnvironments(settings, otherEnvIds);
 
   if (!settings) {
     return null;
   }
 
-  return <EnvironmentContext.Provider value={{ settings }}>{children}</EnvironmentContext.Provider>;
+  return (
+    <EnvironmentContext.Provider value={{ settings, autoSave: true }}>
+      {children}
+    </EnvironmentContext.Provider>
+  );
 };
 
+// Settings are empty initially so we set all of them by default for the user.
+// Later they can change it in the settings.
+function useInitializeSettings(
+  settings: EnvironmentSettings | undefined,
+  availableRegions: string[] | undefined,
+  isActive: boolean,
+) {
+  const hasInitializedRef = useRef(false);
+
+  useEffect(() => {
+    if (!settings || !availableRegions || !isActive) {
+      return;
+    }
+    if (hasInitializedRef.current) {
+      return;
+    }
+    hasInitializedRef.current = true;
+
+    collection.environmentSettings.update(
+      settings.environmentId,
+      { metadata: { silent: true } },
+      (draft) => {
+        if (!draft.dockerfile) {
+          draft.dockerfile = "Dockerfile";
+        }
+        if (!draft.dockerContext) {
+          draft.dockerContext = ".";
+        }
+        if (!draft.port) {
+          draft.port = 8080;
+        }
+        if (!draft.cpuMillicores) {
+          draft.cpuMillicores = 256;
+        }
+        if (!draft.memoryMib) {
+          draft.memoryMib = 256;
+        }
+        if (!draft.shutdownSignal) {
+          draft.shutdownSignal = "SIGTERM";
+        }
+        if (Object.keys(draft.regionConfig).length === 0) {
+          for (const region of availableRegions) {
+            draft.regionConfig[region] = 1;
+          }
+        }
+      },
+    );
+  }, [settings, availableRegions, isActive]);
+}
+
 function useSyncSettingsToOtherEnvironments(
   settings: EnvironmentSettings | undefined,
   otherEnvIds: string[],
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/select-repo/language-icon.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/select-repo/language-icon.tsx
index 566527f0ae3..d04b2fdb492 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/select-repo/language-icon.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/select-repo/language-icon.tsx
@@ -29,12 +29,12 @@ export const LanguageIcon = ({ language }: { language: string | null }) => {
 
   return Icon ? (
     <div className="size-10 grid place-content-center mr-11">
-      <Icon className="size-[26px]" />
+      <Icon className="size-6.5" />
     </div>
   ) : (
     <div className="size-10 grid place-content-center mr-11">
-      <div className="size-[26px] grid place-content-center rounded-lg ring-1 ring-grayA-4 shadow-sm shadow-grayA-8/20 dark:shadow-none">
-        <BracketsCurly iconSize="sm-medium" className="text-gray-9" />
+      <div className="size-6.5 grid place-content-center rounded-md ring-1 ring-grayA-4 shadow-sm shadow-grayA-8/20 dark:shadow-none">
+        <BracketsCurly iconSize="sm-medium" className="text-gray-9 size-4" />
       </div>
     </div>
   );
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/select-repo/repo-list-item.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/select-repo/repo-list-item.tsx
index 11e1f6e3615..4f9092aa678 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/select-repo/repo-list-item.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/new/steps/select-repo/repo-list-item.tsx
@@ -55,8 +55,8 @@ export const RepoListItem = ({
   return (
     <div className="flex px-4 py-5 items-center">
       <LanguageIcon language={repo.language} />
-      <div className="flex flex-col gap-1 w-[160px]">
-        <div className="font-medium text-[13px] text-gray-12 leading-4 truncate max-w-[160px]">
+      <div className="flex flex-col gap-1 w-40">
+        <div className="font-medium text-[13px] text-gray-12 leading-4 truncate max-w-40">
           {repoName}
         </div>
         <div className="font-medium text-[13px] text-gray-10 leading-3">
@@ -76,7 +76,7 @@ export const RepoListItem = ({
         )}
       </div>
       <div className="flex gap-2 items-center">
-        <div className="ml-6 w-[140px]">
+        <div className="ml-6 w-35">
           {isLoading ? (
             <div className="h-8 w-full bg-grayA-3 rounded-lg animate-pulse" />
           ) : (
@@ -89,7 +89,7 @@ export const RepoListItem = ({
               >
                 <SelectValue />
               </SelectTrigger>
-              <SelectContent className="max-h-[200px]">
+              <SelectContent className="max-h-50">
                 {(details.branches ?? []).map((branch) => (
                   <SelectItem key={branch} value={branch} className="cursor-pointer text-[13px]">
                     {branch}
diff --git a/web/apps/dashboard/app/(app)/integrations/github/callback/page.tsx b/web/apps/dashboard/app/(app)/integrations/github/callback/page.tsx
index b3731dfc111..3d07a231aec 100644
--- a/web/apps/dashboard/app/(app)/integrations/github/callback/page.tsx
+++ b/web/apps/dashboard/app/(app)/integrations/github/callback/page.tsx
@@ -21,7 +21,6 @@ export default function Page() {
 
   const mutation = trpc.github.registerInstallation.useMutation({
     onSuccess: (data) => {
-      toast.success("GitHub App installed");
       if (data.returnTo === "settings") {
         router.replace(`/${data.workspaceSlug}/projects/${data.projectId}/settings`);
       } else {
diff --git a/web/apps/dashboard/lib/collections/deploy/environment-settings.ts b/web/apps/dashboard/lib/collections/deploy/environment-settings.ts
index 938ee11bb85..a8a2380e1ff 100644
--- a/web/apps/dashboard/lib/collections/deploy/environment-settings.ts
+++ b/web/apps/dashboard/lib/collections/deploy/environment-settings.ts
@@ -86,7 +86,8 @@ export const environmentSettings = createCollection<EnvironmentSettings, string>
     id: "environmentSettings",
     onUpdate: async ({ transaction }) => {
       const { original, modified } = transaction.mutations[0];
-      await dispatchSettingsMutations(original, modified);
+      const silent = transaction.metadata?.silent === true;
+      await dispatchSettingsMutations(original, modified, silent);
     },
   }),
 );
@@ -244,6 +245,7 @@ export function buildSettingsMutations(
 async function dispatchSettingsMutations(
   original: EnvironmentSettings,
   modified: EnvironmentSettings,
+  silent = false,
 ): Promise<void> {
   const mutations = buildSettingsMutations(original.environmentId, original, modified);
 
@@ -252,13 +254,15 @@ async function dispatchSettingsMutations(
   }
 
   const allMutations = Promise.all(mutations);
-  toast.promise(allMutations, {
-    loading: "Saving settings...",
-    success: "Settings updated",
-    error: (err) => ({
-      message: "Failed to update settings",
-      description: err instanceof Error ? err.message : "An unexpected error occurred",
-    }),
-  });
+  if (!silent) {
+    toast.promise(allMutations, {
+      loading: "Saving settings...",
+      success: "Settings updated",
+      error: (err) => ({
+        message: "Failed to update settings",
+        description: err instanceof Error ? err.message : "An unexpected error occurred",
+      }),
+    });
+  }
   await allMutations;
 }