diff --git a/web/app/components/gpu-form.tsx b/web/app/components/gpu-form.tsx
index 7f94dae..28d1e4c 100644
--- a/web/app/components/gpu-form.tsx
+++ b/web/app/components/gpu-form.tsx
@@ -38,12 +38,14 @@ const packageNamesRegex = new RegExp(
 const packageNamesErrorMsg =
   "Please provide values in comma separated format as suggested in examples";
 export interface GpuFormProps {
+  machineName?: string;
   customNodesJson: OutputCustomNodesJson;
   modelsJson: OutputModel[];
   onBackStep: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
 }
 
 export default function GpuForm({
+  machineName,
   onBackStep,
   customNodesJson,
   modelsJson,
@@ -69,6 +71,9 @@ export default function GpuForm({
                 id="machine-name"
                 name="machine_name"
                 placeholder="Machine name"
+                defaultValue={machineName}
+                disabled={!!machineName}
+                readOnly={!!machineName}
                 onChange={(e) => {
                   if (machineNameRegex.test(e.target.value)) {
                     setMachineNameError(null);
diff --git a/web/app/routes/apps/route.tsx b/web/app/routes/apps/route.tsx
index 3f7e1bb..6e59e99 100644
--- a/web/app/routes/apps/route.tsx
+++ b/web/app/routes/apps/route.tsx
@@ -157,7 +157,6 @@ interface AppsLayoutProps {
 }
 
 function AppsLayout({ apps }: AppsLayoutProps) {
-  const deleteFetcher = useDeleteFetcherAction();
   const [appStateFilter, setAppStateFilter] = useState<string>("deployed");
 
   const displayApps = apps.filter((app) => appStateFilter === app.state);
@@ -291,50 +290,7 @@ function AppsLayout({ apps }: AppsLayoutProps) {
 
                   <td className="py-2 pl-0 pr-4 text-right sm:table-cell sm:pr-6 lg:pr-8">
                     {app.state === "deployed" ? (
-                      <Dialog>
-                        <DropdownMenu>
-                          <DropdownMenuTrigger asChild>
-                            <Button variant="ghost" className="h-8 w-8 p-0">
-                              <span className="sr-only">Open menu</span>
-                              <MoreHorizontal className="h-4 w-4" />
-                            </Button>
-                          </DropdownMenuTrigger>
-                          <DropdownMenuContent align="end">
-                            <DropdownMenuLabel>Actions</DropdownMenuLabel>
-                            <DialogTrigger asChild>
-                              <DropdownMenuItem>Delete</DropdownMenuItem>
-                            </DialogTrigger>
-                          </DropdownMenuContent>
-                        </DropdownMenu>
-                        <DialogContent>
-                          <DialogHeader>
-                            <DialogTitle>
-                              Are you sure you want to delete the app?
-                            </DialogTitle>
-                            <DialogDescription>
-                              This action cannot be undone. Are you sure you
-                              want to permanently delete this app?
-                            </DialogDescription>
-                          </DialogHeader>
-                          <DialogFooter>
-                            <deleteFetcher.Form method="post">
-                              <input
-                                type="hidden"
-                                name="actionType"
-                                value="delete"
-                              />
-                              <input
-                                type="hidden"
-                                name="appId"
-                                value={app.app_id}
-                              />
-                              <DialogClose asChild>
-                                <Button type="submit">Delete</Button>
-                              </DialogClose>
-                            </deleteFetcher.Form>
-                          </DialogFooter>
-                        </DialogContent>
-                      </Dialog>
+                      <DropdownActionMenu app={app} />
                     ) : null}
                   </td>
                 </tr>
@@ -352,6 +308,52 @@ function AppsLayout({ apps }: AppsLayoutProps) {
   );
 }
 
+interface DropdownActionMenuProps {
+  app: App;
+}
+function DropdownActionMenu({ app }: DropdownActionMenuProps) {
+  const deleteFetcher = useDeleteFetcherAction();
+  return (
+    <Dialog>
+      <DropdownMenu>
+        <DropdownMenuTrigger asChild>
+          <Button variant="ghost" className="h-8 w-8 p-0">
+            <span className="sr-only">Open menu</span>
+            <MoreHorizontal className="h-4 w-4" />
+          </Button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="end">
+          <DropdownMenuLabel>Actions</DropdownMenuLabel>
+          <DialogTrigger asChild>
+            <DropdownMenuItem>Delete</DropdownMenuItem>
+          </DialogTrigger>
+          <DropdownMenuItem>
+            <Link to={`/create-app?rebuild=${app.description}`}>Rebuild</Link>
+          </DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenu>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Are you sure you want to delete the app?</DialogTitle>
+          <DialogDescription>
+            This action cannot be undone. Are you sure you want to permanently
+            delete this app?
+          </DialogDescription>
+        </DialogHeader>
+        <DialogFooter>
+          <deleteFetcher.Form method="post">
+            <input type="hidden" name="actionType" value="delete" />
+            <input type="hidden" name="appId" value={app.app_id} />
+            <DialogClose asChild>
+              <Button type="submit">Delete</Button>
+            </DialogClose>
+          </deleteFetcher.Form>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
+
 function ErrorLayout() {
   const revalidator = useRevalidator();
   return (
diff --git a/web/app/routes/create-app/route.tsx b/web/app/routes/create-app/route.tsx
index 45f021e..79d0e3c 100644
--- a/web/app/routes/create-app/route.tsx
+++ b/web/app/routes/create-app/route.tsx
@@ -1,4 +1,10 @@
-import { json, redirect, useFetcher, useLoaderData } from "@remix-run/react";
+import {
+  json,
+  redirect,
+  useFetcher,
+  useLoaderData,
+  useSearchParams,
+} from "@remix-run/react";
 
 import {
   CreateAppErrorResponseBody,
@@ -79,6 +85,7 @@ export const loader = async (args: LoaderFunctionArgs) => {
 };
 
 export default function CreateAppPage() {
+  const [searchParams, _] = useSearchParams();
   const createAppFetcher = useFetcher<typeof action>({
     key: CREATE_APP_FETCHER_KEY,
   });
@@ -188,6 +195,7 @@ export default function CreateAppPage() {
             {currentStep?.name == "GPU" ? (
               <>
                 <GpuForm
+                  machineName={searchParams.get("rebuild") ?? ""}
                   customNodesJson={convertCustomNodesJson(
                     selectedCustomNodes.concat(selectedCustomNodesFromWFFile)
                   )}