From 940b9967b847e946727609a300bbe1b9e1a931ab Mon Sep 17 00:00:00 2001
From: HarikrishnanD <harikrishnan@mulecraft.in>
Date: Tue, 2 Sep 2025 19:17:46 +0530
Subject: [PATCH 1/5] feat(ui): add default "Dokploy" option to server
 selection dropdown  - Add "Dokploy" as default option in server selection
 dropdowns - Hide dropdown when only one server is available (servers.length
 <= 1) - Show dropdown only when multiple servers exist (servers.length > 1) -
 Update placeholder text from "Select a Server" to "Dokploy" - Fix issue where
 users couldn't switch back to default server - Update form submission logic
 to handle "dokploy" default value - Apply changes to all deployment
 components (application, compose, template, database, certificate, AI) 
 Resolves #1852

---
 .../dashboard/project/add-application.tsx     | 18 +++-
 .../dashboard/project/add-compose.tsx         | 18 +++-
 .../dashboard/project/add-database.tsx        | 28 ++++--
 .../dashboard/project/add-template.tsx        | 17 +++-
 .../dashboard/project/ai/step-one.tsx         | 29 ++++--
 .../settings/certificates/add-certificate.tsx | 93 +++++++++++--------
 6 files changed, 131 insertions(+), 72 deletions(-)

diff --git a/apps/dokploy/components/dashboard/project/add-application.tsx b/apps/dokploy/components/dashboard/project/add-application.tsx
index 137f75a51..7d53b3095 100644
--- a/apps/dokploy/components/dashboard/project/add-application.tsx
+++ b/apps/dokploy/components/dashboard/project/add-application.tsx
@@ -95,7 +95,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
 			appName: data.appName,
 			description: data.description,
 			projectId,
-			serverId: data.serverId,
+			serverId: data.serverId === "dokploy" ? undefined : data.serverId,
 		})
 			.then(async () => {
 				toast.success("Service Created");
@@ -157,7 +157,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
 								</FormItem>
 							)}
 						/>
-						{hasServers && (
+						{hasServers && servers.length > 1 && (
 							<FormField
 								control={form.control}
 								name="serverId"
@@ -186,13 +186,21 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
 
 										<Select
 											onValueChange={field.onChange}
-											defaultValue={field.value}
+											defaultValue={field.value || "dokploy"}
 										>
 											<SelectTrigger>
-												<SelectValue placeholder="Select a Server" />
+												<SelectValue placeholder="Dokploy" />
 											</SelectTrigger>
 											<SelectContent>
 												<SelectGroup>
+													<SelectItem value="dokploy">
+														<span className="flex items-center gap-2 justify-between w-full">
+															<span>Dokploy</span>
+															<span className="text-muted-foreground text-xs self-center">
+																Default
+															</span>
+														</span>
+													</SelectItem>
 													{servers?.map((server) => (
 														<SelectItem
 															key={server.serverId}
@@ -206,7 +214,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
 															</span>
 														</SelectItem>
 													))}
-													<SelectLabel>Servers ({servers?.length})</SelectLabel>
+													<SelectLabel>Servers ({servers?.length + 1})</SelectLabel>
 												</SelectGroup>
 											</SelectContent>
 										</Select>
diff --git a/apps/dokploy/components/dashboard/project/add-compose.tsx b/apps/dokploy/components/dashboard/project/add-compose.tsx
index c32e55c16..7249d2745 100644
--- a/apps/dokploy/components/dashboard/project/add-compose.tsx
+++ b/apps/dokploy/components/dashboard/project/add-compose.tsx
@@ -101,7 +101,7 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
 			projectId,
 			composeType: data.composeType,
 			appName: data.appName,
-			serverId: data.serverId,
+			serverId: data.serverId === "dokploy" ? undefined : data.serverId,
 		})
 			.then(async () => {
 				toast.success("Compose Created");
@@ -165,7 +165,7 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
 								)}
 							/>
 						</div>
-						{hasServers && (
+						{hasServers && servers.length > 1 && (
 							<FormField
 								control={form.control}
 								name="serverId"
@@ -194,13 +194,21 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
 
 										<Select
 											onValueChange={field.onChange}
-											defaultValue={field.value}
+											defaultValue={field.value || "dokploy"}
 										>
 											<SelectTrigger>
-												<SelectValue placeholder="Select a Server" />
+												<SelectValue placeholder="Dokploy" />
 											</SelectTrigger>
 											<SelectContent>
 												<SelectGroup>
+													<SelectItem value="dokploy">
+														<span className="flex items-center gap-2 justify-between w-full">
+															<span>Dokploy</span>
+															<span className="text-muted-foreground text-xs self-center">
+																Default
+															</span>
+														</span>
+													</SelectItem>
 													{servers?.map((server) => (
 														<SelectItem
 															key={server.serverId}
@@ -214,7 +222,7 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
 															</span>
 														</SelectItem>
 													))}
-													<SelectLabel>Servers ({servers?.length})</SelectLabel>
+													<SelectLabel>Servers ({servers?.length + 1})</SelectLabel>
 												</SelectGroup>
 											</SelectContent>
 										</Select>
diff --git a/apps/dokploy/components/dashboard/project/add-database.tsx b/apps/dokploy/components/dashboard/project/add-database.tsx
index 104413908..e7a72afe1 100644
--- a/apps/dokploy/components/dashboard/project/add-database.tsx
+++ b/apps/dokploy/components/dashboard/project/add-database.tsx
@@ -220,7 +220,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 			appName: data.appName,
 			dockerImage: defaultDockerImage,
 			projectId,
-			serverId: data.serverId,
+			serverId: data.serverId === "dokploy" ? undefined : data.serverId,
 			description: data.description,
 		};
 
@@ -232,7 +232,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 
 				databaseUser:
 					data.databaseUser || databasesUserDefaultPlaceholder[data.type],
-				serverId: data.serverId,
+				serverId: data.serverId === "dokploy" ? undefined : data.serverId,
 			});
 		} else if (data.type === "mongo") {
 			promise = mongoMutation.mutateAsync({
@@ -240,14 +240,14 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 				databasePassword: data.databasePassword,
 				databaseUser:
 					data.databaseUser || databasesUserDefaultPlaceholder[data.type],
-				serverId: data.serverId,
+				serverId: data.serverId === "dokploy" ? undefined : data.serverId,
 				replicaSets: data.replicaSets,
 			});
 		} else if (data.type === "redis") {
 			promise = redisMutation.mutateAsync({
 				...commonParams,
 				databasePassword: data.databasePassword,
-				serverId: data.serverId,
+				serverId: data.serverId === "dokploy" ? undefined : data.serverId,
 				projectId,
 			});
 		} else if (data.type === "mariadb") {
@@ -258,7 +258,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 				databaseName: data.databaseName || "mariadb",
 				databaseUser:
 					data.databaseUser || databasesUserDefaultPlaceholder[data.type],
-				serverId: data.serverId,
+				serverId: data.serverId === "dokploy" ? undefined : data.serverId,
 			});
 		} else if (data.type === "mysql") {
 			promise = mysqlMutation.mutateAsync({
@@ -268,7 +268,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 				databaseUser:
 					data.databaseUser || databasesUserDefaultPlaceholder[data.type],
 				databaseRootPassword: data.databaseRootPassword,
-				serverId: data.serverId,
+				serverId: data.serverId === "dokploy" ? undefined : data.serverId,
 			});
 		}
 
@@ -398,7 +398,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 										</FormItem>
 									)}
 								/>
-								{hasServers && (
+								{hasServers && servers.length > 1 && (
 									<FormField
 										control={form.control}
 										name="serverId"
@@ -407,13 +407,21 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 												<FormLabel>Select a Server</FormLabel>
 												<Select
 													onValueChange={field.onChange}
-													defaultValue={field.value || ""}
+													defaultValue={field.value || "dokploy"}
 												>
 													<SelectTrigger>
-														<SelectValue placeholder="Select a Server" />
+														<SelectValue placeholder="Dokploy" />
 													</SelectTrigger>
 													<SelectContent>
 														<SelectGroup>
+															<SelectItem value="dokploy">
+																<span className="flex items-center gap-2 justify-between w-full">
+																	<span>Dokploy</span>
+																	<span className="text-muted-foreground text-xs self-center">
+																		Default
+																	</span>
+																</span>
+															</SelectItem>
 															{servers?.map((server) => (
 																<SelectItem
 																	key={server.serverId}
@@ -423,7 +431,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 																</SelectItem>
 															))}
 															<SelectLabel>
-																Servers ({servers?.length})
+																Servers ({servers?.length + 1})
 															</SelectLabel>
 														</SelectGroup>
 													</SelectContent>
diff --git a/apps/dokploy/components/dashboard/project/add-template.tsx b/apps/dokploy/components/dashboard/project/add-template.tsx
index b42806e52..66466bfc7 100644
--- a/apps/dokploy/components/dashboard/project/add-template.tsx
+++ b/apps/dokploy/components/dashboard/project/add-template.tsx
@@ -427,7 +427,7 @@ export const AddTemplate = ({ projectId, baseUrl }: Props) => {
 															project.
 														</AlertDialogDescription>
 
-														{hasServers && (
+														{hasServers && servers.length > 1 && (
 															<div>
 																<TooltipProvider delayDuration={0}>
 																	<Tooltip>
@@ -456,12 +456,21 @@ export const AddTemplate = ({ projectId, baseUrl }: Props) => {
 																	onValueChange={(e) => {
 																		setServerId(e);
 																	}}
+																	defaultValue="dokploy"
 																>
 																	<SelectTrigger>
-																		<SelectValue placeholder="Select a Server" />
+																		<SelectValue placeholder="Dokploy" />
 																	</SelectTrigger>
 																	<SelectContent>
 																		<SelectGroup>
+																			<SelectItem value="dokploy">
+																				<span className="flex items-center gap-2 justify-between w-full">
+																					<span>Dokploy</span>
+																					<span className="text-muted-foreground text-xs self-center">
+																						Default
+																					</span>
+																				</span>
+																			</SelectItem>
 																			{servers?.map((server) => (
 																				<SelectItem
 																					key={server.serverId}
@@ -476,7 +485,7 @@ export const AddTemplate = ({ projectId, baseUrl }: Props) => {
 																				</SelectItem>
 																			))}
 																			<SelectLabel>
-																				Servers ({servers?.length})
+																				Servers ({servers?.length + 1})
 																			</SelectLabel>
 																		</SelectGroup>
 																	</SelectContent>
@@ -491,7 +500,7 @@ export const AddTemplate = ({ projectId, baseUrl }: Props) => {
 															onClick={async () => {
 																const promise = mutateAsync({
 																	projectId,
-																	serverId: serverId || undefined,
+																	serverId: serverId === "dokploy" ? undefined : serverId,
 																	id: template.id,
 																	baseUrl: customBaseUrl,
 																});
diff --git a/apps/dokploy/components/dashboard/project/ai/step-one.tsx b/apps/dokploy/components/dashboard/project/ai/step-one.tsx
index 29cf90305..e81c5623c 100644
--- a/apps/dokploy/components/dashboard/project/ai/step-one.tsx
+++ b/apps/dokploy/components/dashboard/project/ai/step-one.tsx
@@ -48,34 +48,49 @@ export const StepOne = ({ setTemplateInfo, templateInfo }: any) => {
 						/>
 					</div>
 
-					{hasServers && (
+					{hasServers && servers.length > 1 && (
 						<div className="space-y-2">
 							<Label htmlFor="server-deploy">
 								Select the server where you want to deploy (optional)
 							</Label>
 							<Select
-								value={templateInfo.server?.serverId}
+								value={templateInfo.server?.serverId || "dokploy"}
 								onValueChange={(value) => {
-									const server = servers?.find((s) => s.serverId === value);
-									if (server) {
+									if (value === "dokploy") {
 										setTemplateInfo({
 											...templateInfo,
-											server: server,
+											server: undefined,
 										});
+									} else {
+										const server = servers?.find((s) => s.serverId === value);
+										if (server) {
+											setTemplateInfo({
+												...templateInfo,
+												server: server,
+											});
+										}
 									}
 								}}
 							>
 								<SelectTrigger className="w-full">
-									<SelectValue placeholder="Select a server" />
+									<SelectValue placeholder="Dokploy" />
 								</SelectTrigger>
 								<SelectContent>
 									<SelectGroup>
+										<SelectItem value="dokploy">
+											<span className="flex items-center gap-2 justify-between w-full">
+												<span>Dokploy</span>
+												<span className="text-muted-foreground text-xs self-center">
+													Default
+												</span>
+											</span>
+										</SelectItem>
 										{servers?.map((server) => (
 											<SelectItem key={server.serverId} value={server.serverId}>
 												{server.name}
 											</SelectItem>
 										))}
-										<SelectLabel>Servers ({servers?.length})</SelectLabel>
+										<SelectLabel>Servers ({servers?.length + 1})</SelectLabel>
 									</SelectGroup>
 								</SelectContent>
 							</Select>
diff --git a/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx b/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
index ab19f6185..57e3115ac 100644
--- a/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
+++ b/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
@@ -65,6 +65,7 @@ export const AddCertificate = () => {
 	const { mutateAsync, isError, error, isLoading } =
 		api.certificates.create.useMutation();
 	const { data: servers } = api.server.withSSHKey.useQuery();
+	const hasServers = servers && servers.length > 0;
 
 	const form = useForm<AddCertificate>({
 		defaultValues: {
@@ -85,7 +86,7 @@ export const AddCertificate = () => {
 			certificateData: data.certificateData,
 			privateKey: data.privateKey,
 			autoRenew: data.autoRenew,
-			serverId: data.serverId,
+			serverId: data.serverId === "dokploy" ? undefined : data.serverId,
 			organizationId: "",
 		})
 			.then(async () => {
@@ -174,52 +175,62 @@ export const AddCertificate = () => {
 								</FormItem>
 							)}
 						/>
-						<FormField
-							control={form.control}
-							name="serverId"
-							render={({ field }) => (
-								<FormItem>
-									<TooltipProvider delayDuration={0}>
-										<Tooltip>
-											<TooltipTrigger asChild>
-												<FormLabel className="break-all w-fit flex flex-row gap-1 items-center">
-													Select a Server {!isCloud && "(Optional)"}
-													<HelpCircle className="size-4 text-muted-foreground" />
-												</FormLabel>
-											</TooltipTrigger>
-										</Tooltip>
-									</TooltipProvider>
+						{hasServers && servers.length > 1 && (
+							<FormField
+								control={form.control}
+								name="serverId"
+								render={({ field }) => (
+									<FormItem>
+										<TooltipProvider delayDuration={0}>
+											<Tooltip>
+												<TooltipTrigger asChild>
+													<FormLabel className="break-all w-fit flex flex-row gap-1 items-center">
+														Select a Server {!isCloud && "(Optional)"}
+														<HelpCircle className="size-4 text-muted-foreground" />
+													</FormLabel>
+												</TooltipTrigger>
+											</Tooltip>
+										</TooltipProvider>
 
-									<Select
-										onValueChange={field.onChange}
-										defaultValue={field.value}
-									>
-										<SelectTrigger>
-											<SelectValue placeholder="Select a Server" />
-										</SelectTrigger>
-										<SelectContent>
-											<SelectGroup>
-												{servers?.map((server) => (
-													<SelectItem
-														key={server.serverId}
-														value={server.serverId}
-													>
+										<Select
+											onValueChange={field.onChange}
+											defaultValue={field.value || "dokploy"}
+										>
+											<SelectTrigger>
+												<SelectValue placeholder="Dokploy" />
+											</SelectTrigger>
+											<SelectContent>
+												<SelectGroup>
+													<SelectItem value="dokploy">
 														<span className="flex items-center gap-2 justify-between w-full">
-															<span>{server.name}</span>
+															<span>Dokploy</span>
 															<span className="text-muted-foreground text-xs self-center">
-																{server.ipAddress}
+																Default
 															</span>
 														</span>
 													</SelectItem>
-												))}
-												<SelectLabel>Servers ({servers?.length})</SelectLabel>
-											</SelectGroup>
-										</SelectContent>
-									</Select>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
+													{servers?.map((server) => (
+														<SelectItem
+															key={server.serverId}
+															value={server.serverId}
+														>
+															<span className="flex items-center gap-2 justify-between w-full">
+																<span>{server.name}</span>
+																<span className="text-muted-foreground text-xs self-center">
+																	{server.ipAddress}
+																</span>
+															</span>
+														</SelectItem>
+													))}
+													<SelectLabel>Servers ({servers?.length + 1})</SelectLabel>
+												</SelectGroup>
+											</SelectContent>
+										</Select>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
+						)}
 					</form>
 
 					<DialogFooter className="flex w-full flex-row !justify-end">

From 4a3a7fa47bf65d8cec5c7a689540b95c521ddfd4 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Thu, 4 Sep 2025 02:43:53 +0000
Subject: [PATCH 2/5] [autofix.ci] apply automated fixes

---
 .../dokploy/components/dashboard/project/add-application.tsx | 4 +++-
 apps/dokploy/components/dashboard/project/add-compose.tsx    | 4 +++-
 apps/dokploy/components/dashboard/project/add-template.tsx   | 5 ++++-
 .../dashboard/settings/certificates/add-certificate.tsx      | 4 +++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/dokploy/components/dashboard/project/add-application.tsx b/apps/dokploy/components/dashboard/project/add-application.tsx
index 7d53b3095..7c5c1a69c 100644
--- a/apps/dokploy/components/dashboard/project/add-application.tsx
+++ b/apps/dokploy/components/dashboard/project/add-application.tsx
@@ -214,7 +214,9 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
 															</span>
 														</SelectItem>
 													))}
-													<SelectLabel>Servers ({servers?.length + 1})</SelectLabel>
+													<SelectLabel>
+														Servers ({servers?.length + 1})
+													</SelectLabel>
 												</SelectGroup>
 											</SelectContent>
 										</Select>
diff --git a/apps/dokploy/components/dashboard/project/add-compose.tsx b/apps/dokploy/components/dashboard/project/add-compose.tsx
index 7249d2745..7c1dbfd47 100644
--- a/apps/dokploy/components/dashboard/project/add-compose.tsx
+++ b/apps/dokploy/components/dashboard/project/add-compose.tsx
@@ -222,7 +222,9 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
 															</span>
 														</SelectItem>
 													))}
-													<SelectLabel>Servers ({servers?.length + 1})</SelectLabel>
+													<SelectLabel>
+														Servers ({servers?.length + 1})
+													</SelectLabel>
 												</SelectGroup>
 											</SelectContent>
 										</Select>
diff --git a/apps/dokploy/components/dashboard/project/add-template.tsx b/apps/dokploy/components/dashboard/project/add-template.tsx
index 66466bfc7..56ff6705f 100644
--- a/apps/dokploy/components/dashboard/project/add-template.tsx
+++ b/apps/dokploy/components/dashboard/project/add-template.tsx
@@ -500,7 +500,10 @@ export const AddTemplate = ({ projectId, baseUrl }: Props) => {
 															onClick={async () => {
 																const promise = mutateAsync({
 																	projectId,
-																	serverId: serverId === "dokploy" ? undefined : serverId,
+																	serverId:
+																		serverId === "dokploy"
+																			? undefined
+																			: serverId,
 																	id: template.id,
 																	baseUrl: customBaseUrl,
 																});
diff --git a/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx b/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
index 57e3115ac..95405d9d6 100644
--- a/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
+++ b/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
@@ -222,7 +222,9 @@ export const AddCertificate = () => {
 															</span>
 														</SelectItem>
 													))}
-													<SelectLabel>Servers ({servers?.length + 1})</SelectLabel>
+													<SelectLabel>
+														Servers ({servers?.length + 1})
+													</SelectLabel>
 												</SelectGroup>
 											</SelectContent>
 										</Select>

From 52e21dab4e184e0cf866829f045243cc1ba8dd16 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Wed, 3 Sep 2025 20:45:47 -0600
Subject: [PATCH 3/5] refactor(ui): simplify server selection logic across
 components - Remove redundant server count check in server selection
 dropdowns across multiple components (AddApplication, AddCompose,
 AddDatabase, AddTemplate, StepOne, AddCertificate) to streamline UI behavior.

---
 .../components/dashboard/project/add-application.tsx |  2 +-
 .../components/dashboard/project/add-compose.tsx     |  2 +-
 .../components/dashboard/project/add-database.tsx    | 12 ++++++------
 .../components/dashboard/project/add-template.tsx    |  2 +-
 .../components/dashboard/project/ai/step-one.tsx     |  2 +-
 .../settings/certificates/add-certificate.tsx        |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/dokploy/components/dashboard/project/add-application.tsx b/apps/dokploy/components/dashboard/project/add-application.tsx
index 7c5c1a69c..1a83cdb64 100644
--- a/apps/dokploy/components/dashboard/project/add-application.tsx
+++ b/apps/dokploy/components/dashboard/project/add-application.tsx
@@ -157,7 +157,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
 								</FormItem>
 							)}
 						/>
-						{hasServers && servers.length > 1 && (
+						{hasServers && (
 							<FormField
 								control={form.control}
 								name="serverId"
diff --git a/apps/dokploy/components/dashboard/project/add-compose.tsx b/apps/dokploy/components/dashboard/project/add-compose.tsx
index 7c1dbfd47..dd3d9b73a 100644
--- a/apps/dokploy/components/dashboard/project/add-compose.tsx
+++ b/apps/dokploy/components/dashboard/project/add-compose.tsx
@@ -165,7 +165,7 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
 								)}
 							/>
 						</div>
-						{hasServers && servers.length > 1 && (
+						{hasServers && (
 							<FormField
 								control={form.control}
 								name="serverId"
diff --git a/apps/dokploy/components/dashboard/project/add-database.tsx b/apps/dokploy/components/dashboard/project/add-database.tsx
index e7a72afe1..07af43312 100644
--- a/apps/dokploy/components/dashboard/project/add-database.tsx
+++ b/apps/dokploy/components/dashboard/project/add-database.tsx
@@ -232,7 +232,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 
 				databaseUser:
 					data.databaseUser || databasesUserDefaultPlaceholder[data.type],
-				serverId: data.serverId === "dokploy" ? undefined : data.serverId,
+				serverId: data.serverId === "dokploy" ? null : data.serverId,
 			});
 		} else if (data.type === "mongo") {
 			promise = mongoMutation.mutateAsync({
@@ -240,14 +240,14 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 				databasePassword: data.databasePassword,
 				databaseUser:
 					data.databaseUser || databasesUserDefaultPlaceholder[data.type],
-				serverId: data.serverId === "dokploy" ? undefined : data.serverId,
+				serverId: data.serverId === "dokploy" ? null : data.serverId,
 				replicaSets: data.replicaSets,
 			});
 		} else if (data.type === "redis") {
 			promise = redisMutation.mutateAsync({
 				...commonParams,
 				databasePassword: data.databasePassword,
-				serverId: data.serverId === "dokploy" ? undefined : data.serverId,
+				serverId: data.serverId === "dokploy" ? null : data.serverId,
 				projectId,
 			});
 		} else if (data.type === "mariadb") {
@@ -258,7 +258,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 				databaseName: data.databaseName || "mariadb",
 				databaseUser:
 					data.databaseUser || databasesUserDefaultPlaceholder[data.type],
-				serverId: data.serverId === "dokploy" ? undefined : data.serverId,
+				serverId: data.serverId === "dokploy" ? null : data.serverId,
 			});
 		} else if (data.type === "mysql") {
 			promise = mysqlMutation.mutateAsync({
@@ -268,7 +268,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 				databaseUser:
 					data.databaseUser || databasesUserDefaultPlaceholder[data.type],
 				databaseRootPassword: data.databaseRootPassword,
-				serverId: data.serverId === "dokploy" ? undefined : data.serverId,
+				serverId: data.serverId === "dokploy" ? null : data.serverId,
 			});
 		}
 
@@ -398,7 +398,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 										</FormItem>
 									)}
 								/>
-								{hasServers && servers.length > 1 && (
+								{hasServers && (
 									<FormField
 										control={form.control}
 										name="serverId"
diff --git a/apps/dokploy/components/dashboard/project/add-template.tsx b/apps/dokploy/components/dashboard/project/add-template.tsx
index 56ff6705f..bd0153592 100644
--- a/apps/dokploy/components/dashboard/project/add-template.tsx
+++ b/apps/dokploy/components/dashboard/project/add-template.tsx
@@ -427,7 +427,7 @@ export const AddTemplate = ({ projectId, baseUrl }: Props) => {
 															project.
 														</AlertDialogDescription>
 
-														{hasServers && servers.length > 1 && (
+														{hasServers && (
 															<div>
 																<TooltipProvider delayDuration={0}>
 																	<Tooltip>
diff --git a/apps/dokploy/components/dashboard/project/ai/step-one.tsx b/apps/dokploy/components/dashboard/project/ai/step-one.tsx
index e81c5623c..2099a8505 100644
--- a/apps/dokploy/components/dashboard/project/ai/step-one.tsx
+++ b/apps/dokploy/components/dashboard/project/ai/step-one.tsx
@@ -48,7 +48,7 @@ export const StepOne = ({ setTemplateInfo, templateInfo }: any) => {
 						/>
 					</div>
 
-					{hasServers && servers.length > 1 && (
+					{hasServers && (
 						<div className="space-y-2">
 							<Label htmlFor="server-deploy">
 								Select the server where you want to deploy (optional)
diff --git a/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx b/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
index 95405d9d6..75b903874 100644
--- a/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
+++ b/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
@@ -175,7 +175,7 @@ export const AddCertificate = () => {
 								</FormItem>
 							)}
 						/>
-						{hasServers && servers.length > 1 && (
+						{hasServers && (
 							<FormField
 								control={form.control}
 								name="serverId"

From 46f1af3bb30797030237ee856f16c598d8a45a18 Mon Sep 17 00:00:00 2001
From: HarikrishnanD <harikrishnan@mulecraft.in>
Date: Thu, 4 Sep 2025 13:54:19 +0530
Subject: [PATCH 4/5] feat(ui): add conditional server dropdown with Dokploy
 default option  - Add IS_CLOUD flag support for server selection dropdown -
 Show "Dokploy" as default option in self-hosted environments - Hide dropdown
 when no remote servers exist - Add conditional placeholder text and server
 count display - Handle "dokploy" value in form submission (converts to
 undefined) - Apply changes to all relevant components: add-application,
 add-compose, add-template, add-database, add-certificate, and AI step-one 
 Resolves #1852

---
 .../dashboard/project/add-application.tsx     | 28 +++++++++++-------
 .../dashboard/project/add-compose.tsx         | 28 +++++++++++-------
 .../dashboard/project/add-database.tsx        | 29 ++++++++++++-------
 .../dashboard/project/add-template.tsx        | 28 +++++++++++-------
 .../dashboard/project/ai/step-one.tsx         | 29 ++++++++++++-------
 .../settings/certificates/add-certificate.tsx | 28 +++++++++++-------
 6 files changed, 104 insertions(+), 66 deletions(-)

diff --git a/apps/dokploy/components/dashboard/project/add-application.tsx b/apps/dokploy/components/dashboard/project/add-application.tsx
index 1a83cdb64..5f4d9c8e5 100644
--- a/apps/dokploy/components/dashboard/project/add-application.tsx
+++ b/apps/dokploy/components/dashboard/project/add-application.tsx
@@ -76,6 +76,10 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
 	const { data: servers } = api.server.withSSHKey.useQuery();
 
 	const hasServers = servers && servers.length > 0;
+	// Show dropdown logic based on cloud environment
+	// Cloud: show only if there are remote servers (no Dokploy option)
+	// Self-hosted: show only if there are remote servers (Dokploy is default, hide if no remote servers)
+	const shouldShowServerDropdown = hasServers;
 
 	const { mutateAsync, isLoading, error, isError } =
 		api.application.create.useMutation();
@@ -157,7 +161,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
 								</FormItem>
 							)}
 						/>
-						{hasServers && (
+						{shouldShowServerDropdown && (
 							<FormField
 								control={form.control}
 								name="serverId"
@@ -186,21 +190,23 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
 
 										<Select
 											onValueChange={field.onChange}
-											defaultValue={field.value || "dokploy"}
+											defaultValue={field.value || (!isCloud ? "dokploy" : undefined)}
 										>
 											<SelectTrigger>
-												<SelectValue placeholder="Dokploy" />
+												<SelectValue placeholder={!isCloud ? "Dokploy" : "Select a Server"} />
 											</SelectTrigger>
 											<SelectContent>
 												<SelectGroup>
-													<SelectItem value="dokploy">
-														<span className="flex items-center gap-2 justify-between w-full">
-															<span>Dokploy</span>
-															<span className="text-muted-foreground text-xs self-center">
-																Default
+													{!isCloud && (
+														<SelectItem value="dokploy">
+															<span className="flex items-center gap-2 justify-between w-full">
+																<span>Dokploy</span>
+																<span className="text-muted-foreground text-xs self-center">
+																	Default
+																</span>
 															</span>
-														</span>
-													</SelectItem>
+														</SelectItem>
+													)}
 													{servers?.map((server) => (
 														<SelectItem
 															key={server.serverId}
@@ -215,7 +221,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
 														</SelectItem>
 													))}
 													<SelectLabel>
-														Servers ({servers?.length + 1})
+														Servers ({servers?.length + (!isCloud ? 1 : 0)})
 													</SelectLabel>
 												</SelectGroup>
 											</SelectContent>
diff --git a/apps/dokploy/components/dashboard/project/add-compose.tsx b/apps/dokploy/components/dashboard/project/add-compose.tsx
index dd3d9b73a..89a1672c2 100644
--- a/apps/dokploy/components/dashboard/project/add-compose.tsx
+++ b/apps/dokploy/components/dashboard/project/add-compose.tsx
@@ -79,6 +79,10 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
 		api.compose.create.useMutation();
 
 	const hasServers = servers && servers.length > 0;
+	// Show dropdown logic based on cloud environment
+	// Cloud: show only if there are remote servers (no Dokploy option)
+	// Self-hosted: show only if there are remote servers (Dokploy is default, hide if no remote servers)
+	const shouldShowServerDropdown = hasServers;
 
 	const form = useForm<AddCompose>({
 		defaultValues: {
@@ -165,7 +169,7 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
 								)}
 							/>
 						</div>
-						{hasServers && (
+						{shouldShowServerDropdown && (
 							<FormField
 								control={form.control}
 								name="serverId"
@@ -194,21 +198,23 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
 
 										<Select
 											onValueChange={field.onChange}
-											defaultValue={field.value || "dokploy"}
+											defaultValue={field.value || (!isCloud ? "dokploy" : undefined)}
 										>
 											<SelectTrigger>
-												<SelectValue placeholder="Dokploy" />
+												<SelectValue placeholder={!isCloud ? "Dokploy" : "Select a Server"} />
 											</SelectTrigger>
 											<SelectContent>
 												<SelectGroup>
-													<SelectItem value="dokploy">
-														<span className="flex items-center gap-2 justify-between w-full">
-															<span>Dokploy</span>
-															<span className="text-muted-foreground text-xs self-center">
-																Default
+													{!isCloud && (
+														<SelectItem value="dokploy">
+															<span className="flex items-center gap-2 justify-between w-full">
+																<span>Dokploy</span>
+																<span className="text-muted-foreground text-xs self-center">
+																	Default
+																</span>
 															</span>
-														</span>
-													</SelectItem>
+														</SelectItem>
+													)}
 													{servers?.map((server) => (
 														<SelectItem
 															key={server.serverId}
@@ -223,7 +229,7 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
 														</SelectItem>
 													))}
 													<SelectLabel>
-														Servers ({servers?.length + 1})
+														Servers ({servers?.length + (!isCloud ? 1 : 0)})
 													</SelectLabel>
 												</SelectGroup>
 											</SelectContent>
diff --git a/apps/dokploy/components/dashboard/project/add-database.tsx b/apps/dokploy/components/dashboard/project/add-database.tsx
index 07af43312..8c8ec9650 100644
--- a/apps/dokploy/components/dashboard/project/add-database.tsx
+++ b/apps/dokploy/components/dashboard/project/add-database.tsx
@@ -178,6 +178,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 	const utils = api.useUtils();
 	const [visible, setVisible] = useState(false);
 	const slug = slugify(projectName);
+	const { data: isCloud } = api.settings.isCloud.useQuery();
 	const { data: servers } = api.server.withSSHKey.useQuery();
 	const postgresMutation = api.postgres.create.useMutation();
 	const mongoMutation = api.mongo.create.useMutation();
@@ -186,6 +187,10 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 	const mysqlMutation = api.mysql.create.useMutation();
 
 	const hasServers = servers && servers.length > 0;
+	// Show dropdown logic based on cloud environment
+	// Cloud: show only if there are remote servers (no Dokploy option)
+	// Self-hosted: show only if there are remote servers (Dokploy is default, hide if no remote servers)
+	const shouldShowServerDropdown = hasServers;
 
 	const form = useForm<AddDatabase>({
 		defaultValues: {
@@ -398,7 +403,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 										</FormItem>
 									)}
 								/>
-								{hasServers && (
+								{shouldShowServerDropdown && (
 									<FormField
 										control={form.control}
 										name="serverId"
@@ -407,21 +412,23 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 												<FormLabel>Select a Server</FormLabel>
 												<Select
 													onValueChange={field.onChange}
-													defaultValue={field.value || "dokploy"}
+													defaultValue={field.value || (!isCloud ? "dokploy" : undefined)}
 												>
 													<SelectTrigger>
-														<SelectValue placeholder="Dokploy" />
+														<SelectValue placeholder={!isCloud ? "Dokploy" : "Select a Server"} />
 													</SelectTrigger>
 													<SelectContent>
 														<SelectGroup>
-															<SelectItem value="dokploy">
-																<span className="flex items-center gap-2 justify-between w-full">
-																	<span>Dokploy</span>
-																	<span className="text-muted-foreground text-xs self-center">
-																		Default
+															{!isCloud && (
+																<SelectItem value="dokploy">
+																	<span className="flex items-center gap-2 justify-between w-full">
+																		<span>Dokploy</span>
+																		<span className="text-muted-foreground text-xs self-center">
+																			Default
+																		</span>
 																	</span>
-																</span>
-															</SelectItem>
+																</SelectItem>
+															)}
 															{servers?.map((server) => (
 																<SelectItem
 																	key={server.serverId}
@@ -431,7 +438,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 																</SelectItem>
 															))}
 															<SelectLabel>
-																Servers ({servers?.length + 1})
+																Servers ({servers?.length + (!isCloud ? 1 : 0)})
 															</SelectLabel>
 														</SelectGroup>
 													</SelectContent>
diff --git a/apps/dokploy/components/dashboard/project/add-template.tsx b/apps/dokploy/components/dashboard/project/add-template.tsx
index bd0153592..480d079cf 100644
--- a/apps/dokploy/components/dashboard/project/add-template.tsx
+++ b/apps/dokploy/components/dashboard/project/add-template.tsx
@@ -138,6 +138,10 @@ export const AddTemplate = ({ projectId, baseUrl }: Props) => {
 		}) || [];
 
 	const hasServers = servers && servers.length > 0;
+	// Show dropdown logic based on cloud environment
+	// Cloud: show only if there are remote servers (no Dokploy option)
+	// Self-hosted: show only if there are remote servers (Dokploy is default, hide if no remote servers)
+	const shouldShowServerDropdown = hasServers;
 
 	return (
 		<Dialog open={open} onOpenChange={setOpen}>
@@ -427,7 +431,7 @@ export const AddTemplate = ({ projectId, baseUrl }: Props) => {
 															project.
 														</AlertDialogDescription>
 
-														{hasServers && (
+														{shouldShowServerDropdown && (
 															<div>
 																<TooltipProvider delayDuration={0}>
 																	<Tooltip>
@@ -456,21 +460,23 @@ export const AddTemplate = ({ projectId, baseUrl }: Props) => {
 																	onValueChange={(e) => {
 																		setServerId(e);
 																	}}
-																	defaultValue="dokploy"
+																	defaultValue={!isCloud ? "dokploy" : undefined}
 																>
 																	<SelectTrigger>
-																		<SelectValue placeholder="Dokploy" />
+																		<SelectValue placeholder={!isCloud ? "Dokploy" : "Select a Server"} />
 																	</SelectTrigger>
 																	<SelectContent>
 																		<SelectGroup>
-																			<SelectItem value="dokploy">
-																				<span className="flex items-center gap-2 justify-between w-full">
-																					<span>Dokploy</span>
-																					<span className="text-muted-foreground text-xs self-center">
-																						Default
+																			{!isCloud && (
+																				<SelectItem value="dokploy">
+																					<span className="flex items-center gap-2 justify-between w-full">
+																						<span>Dokploy</span>
+																						<span className="text-muted-foreground text-xs self-center">
+																							Default
+																						</span>
 																					</span>
-																				</span>
-																			</SelectItem>
+																				</SelectItem>
+																			)}
 																			{servers?.map((server) => (
 																				<SelectItem
 																					key={server.serverId}
@@ -485,7 +491,7 @@ export const AddTemplate = ({ projectId, baseUrl }: Props) => {
 																				</SelectItem>
 																			))}
 																			<SelectLabel>
-																				Servers ({servers?.length + 1})
+																				Servers ({servers?.length + (!isCloud ? 1 : 0)})
 																			</SelectLabel>
 																		</SelectGroup>
 																	</SelectContent>
diff --git a/apps/dokploy/components/dashboard/project/ai/step-one.tsx b/apps/dokploy/components/dashboard/project/ai/step-one.tsx
index 2099a8505..006458e7f 100644
--- a/apps/dokploy/components/dashboard/project/ai/step-one.tsx
+++ b/apps/dokploy/components/dashboard/project/ai/step-one.tsx
@@ -25,7 +25,12 @@ const examples = [
 export const StepOne = ({ setTemplateInfo, templateInfo }: any) => {
 	// Get servers from the API
 	const { data: servers } = api.server.withSSHKey.useQuery();
+	const { data: isCloud } = api.settings.isCloud.useQuery();
 	const hasServers = servers && servers.length > 0;
+	// Show dropdown logic based on cloud environment
+	// Cloud: show only if there are remote servers (no Dokploy option)
+	// Self-hosted: show only if there are remote servers (Dokploy is default, hide if no remote servers)
+	const shouldShowServerDropdown = hasServers;
 
 	const handleExampleClick = (example: string) => {
 		setTemplateInfo({ ...templateInfo, userInput: example });
@@ -48,13 +53,13 @@ export const StepOne = ({ setTemplateInfo, templateInfo }: any) => {
 						/>
 					</div>
 
-					{hasServers && (
+					{shouldShowServerDropdown && (
 						<div className="space-y-2">
 							<Label htmlFor="server-deploy">
 								Select the server where you want to deploy (optional)
 							</Label>
 							<Select
-								value={templateInfo.server?.serverId || "dokploy"}
+								value={templateInfo.server?.serverId || (!isCloud ? "dokploy" : undefined)}
 								onValueChange={(value) => {
 									if (value === "dokploy") {
 										setTemplateInfo({
@@ -73,24 +78,26 @@ export const StepOne = ({ setTemplateInfo, templateInfo }: any) => {
 								}}
 							>
 								<SelectTrigger className="w-full">
-									<SelectValue placeholder="Dokploy" />
+									<SelectValue placeholder={!isCloud ? "Dokploy" : "Select a Server"} />
 								</SelectTrigger>
 								<SelectContent>
 									<SelectGroup>
-										<SelectItem value="dokploy">
-											<span className="flex items-center gap-2 justify-between w-full">
-												<span>Dokploy</span>
-												<span className="text-muted-foreground text-xs self-center">
-													Default
+										{!isCloud && (
+											<SelectItem value="dokploy">
+												<span className="flex items-center gap-2 justify-between w-full">
+													<span>Dokploy</span>
+													<span className="text-muted-foreground text-xs self-center">
+														Default
+													</span>
 												</span>
-											</span>
-										</SelectItem>
+											</SelectItem>
+										)}
 										{servers?.map((server) => (
 											<SelectItem key={server.serverId} value={server.serverId}>
 												{server.name}
 											</SelectItem>
 										))}
-										<SelectLabel>Servers ({servers?.length + 1})</SelectLabel>
+										<SelectLabel>Servers ({servers?.length + (!isCloud ? 1 : 0)})</SelectLabel>
 									</SelectGroup>
 								</SelectContent>
 							</Select>
diff --git a/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx b/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
index 75b903874..938e719b2 100644
--- a/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
+++ b/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
@@ -66,6 +66,10 @@ export const AddCertificate = () => {
 		api.certificates.create.useMutation();
 	const { data: servers } = api.server.withSSHKey.useQuery();
 	const hasServers = servers && servers.length > 0;
+	// Show dropdown logic based on cloud environment
+	// Cloud: show only if there are remote servers (no Dokploy option)
+	// Self-hosted: show only if there are remote servers (Dokploy is default, hide if no remote servers)
+	const shouldShowServerDropdown = hasServers;
 
 	const form = useForm<AddCertificate>({
 		defaultValues: {
@@ -175,7 +179,7 @@ export const AddCertificate = () => {
 								</FormItem>
 							)}
 						/>
-						{hasServers && (
+						{shouldShowServerDropdown && (
 							<FormField
 								control={form.control}
 								name="serverId"
@@ -194,21 +198,23 @@ export const AddCertificate = () => {
 
 										<Select
 											onValueChange={field.onChange}
-											defaultValue={field.value || "dokploy"}
+											defaultValue={field.value || (!isCloud ? "dokploy" : undefined)}
 										>
 											<SelectTrigger>
-												<SelectValue placeholder="Dokploy" />
+												<SelectValue placeholder={!isCloud ? "Dokploy" : "Select a Server"} />
 											</SelectTrigger>
 											<SelectContent>
 												<SelectGroup>
-													<SelectItem value="dokploy">
-														<span className="flex items-center gap-2 justify-between w-full">
-															<span>Dokploy</span>
-															<span className="text-muted-foreground text-xs self-center">
-																Default
+													{!isCloud && (
+														<SelectItem value="dokploy">
+															<span className="flex items-center gap-2 justify-between w-full">
+																<span>Dokploy</span>
+																<span className="text-muted-foreground text-xs self-center">
+																	Default
+																</span>
 															</span>
-														</span>
-													</SelectItem>
+														</SelectItem>
+													)}
 													{servers?.map((server) => (
 														<SelectItem
 															key={server.serverId}
@@ -223,7 +229,7 @@ export const AddCertificate = () => {
 														</SelectItem>
 													))}
 													<SelectLabel>
-														Servers ({servers?.length + 1})
+														Servers ({servers?.length + (!isCloud ? 1 : 0)})
 													</SelectLabel>
 												</SelectGroup>
 											</SelectContent>

From 081ba60f6e5bb0bdcbe6fdeff0010726ed2f1832 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Sat, 6 Sep 2025 19:36:11 +0000
Subject: [PATCH 5/5] [autofix.ci] apply automated fixes

---
 .../components/dashboard/project/add-compose.tsx    |  8 ++++++--
 .../components/dashboard/project/ai/step-one.tsx    | 13 ++++++++++---
 .../settings/certificates/add-certificate.tsx       |  8 ++++++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/apps/dokploy/components/dashboard/project/add-compose.tsx b/apps/dokploy/components/dashboard/project/add-compose.tsx
index a4f1d8536..a187104ec 100644
--- a/apps/dokploy/components/dashboard/project/add-compose.tsx
+++ b/apps/dokploy/components/dashboard/project/add-compose.tsx
@@ -202,10 +202,14 @@ export const AddCompose = ({ environmentId, projectName }: Props) => {
 
 										<Select
 											onValueChange={field.onChange}
-											defaultValue={field.value || (!isCloud ? "dokploy" : undefined)}
+											defaultValue={
+												field.value || (!isCloud ? "dokploy" : undefined)
+											}
 										>
 											<SelectTrigger>
-												<SelectValue placeholder={!isCloud ? "Dokploy" : "Select a Server"} />
+												<SelectValue
+													placeholder={!isCloud ? "Dokploy" : "Select a Server"}
+												/>
 											</SelectTrigger>
 											<SelectContent>
 												<SelectGroup>
diff --git a/apps/dokploy/components/dashboard/project/ai/step-one.tsx b/apps/dokploy/components/dashboard/project/ai/step-one.tsx
index 006458e7f..2a7039f6c 100644
--- a/apps/dokploy/components/dashboard/project/ai/step-one.tsx
+++ b/apps/dokploy/components/dashboard/project/ai/step-one.tsx
@@ -59,7 +59,10 @@ export const StepOne = ({ setTemplateInfo, templateInfo }: any) => {
 								Select the server where you want to deploy (optional)
 							</Label>
 							<Select
-								value={templateInfo.server?.serverId || (!isCloud ? "dokploy" : undefined)}
+								value={
+									templateInfo.server?.serverId ||
+									(!isCloud ? "dokploy" : undefined)
+								}
 								onValueChange={(value) => {
 									if (value === "dokploy") {
 										setTemplateInfo({
@@ -78,7 +81,9 @@ export const StepOne = ({ setTemplateInfo, templateInfo }: any) => {
 								}}
 							>
 								<SelectTrigger className="w-full">
-									<SelectValue placeholder={!isCloud ? "Dokploy" : "Select a Server"} />
+									<SelectValue
+										placeholder={!isCloud ? "Dokploy" : "Select a Server"}
+									/>
 								</SelectTrigger>
 								<SelectContent>
 									<SelectGroup>
@@ -97,7 +102,9 @@ export const StepOne = ({ setTemplateInfo, templateInfo }: any) => {
 												{server.name}
 											</SelectItem>
 										))}
-										<SelectLabel>Servers ({servers?.length + (!isCloud ? 1 : 0)})</SelectLabel>
+										<SelectLabel>
+											Servers ({servers?.length + (!isCloud ? 1 : 0)})
+										</SelectLabel>
 									</SelectGroup>
 								</SelectContent>
 							</Select>
diff --git a/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx b/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
index 938e719b2..6f7ef6821 100644
--- a/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
+++ b/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
@@ -198,10 +198,14 @@ export const AddCertificate = () => {
 
 										<Select
 											onValueChange={field.onChange}
-											defaultValue={field.value || (!isCloud ? "dokploy" : undefined)}
+											defaultValue={
+												field.value || (!isCloud ? "dokploy" : undefined)
+											}
 										>
 											<SelectTrigger>
-												<SelectValue placeholder={!isCloud ? "Dokploy" : "Select a Server"} />
+												<SelectValue
+													placeholder={!isCloud ? "Dokploy" : "Select a Server"}
+												/>
 											</SelectTrigger>
 											<SelectContent>
 												<SelectGroup>