feat: add network management schema and update related tables

- Introduced a new ENUM type "networkDriver" and created the "network" table with various attributes for network management.
- Added "networkIds" column to multiple existing tables (application, compose, mariadb, mongo, mysql, postgres, redis) to support network associations.
- Established foreign key constraints for "organizationId" and "serverId" in the "network" table to ensure referential integrity.
- Updated migration journal and added a new snapshot for version 0166 to reflect these changes.

apps/dokploy/__test__/traefik/traefik.test.ts

@@ -424,6 +424,26 @@ test("Custom entrypoint with internalPath adds addprefix middleware", async () =
 	expect(router.entryPoints).toEqual(["custom"]);
 });
 
+test("stripPath and internalPath together: stripprefix must come before addprefix", async () => {
+	const router = await createRouterConfig(
+		baseApp,
+		{
+			...baseDomain,
+			path: "/public",
+			stripPath: true,
+			internalPath: "/app/v2",
+		},
+		"web",
+	);
+
+	const stripIndex = router.middlewares?.indexOf("stripprefix--1") ?? -1;
+	const addIndex = router.middlewares?.indexOf("addprefix--1") ?? -1;
+
+	expect(stripIndex).toBeGreaterThanOrEqual(0);
+	expect(addIndex).toBeGreaterThanOrEqual(0);
+	expect(stripIndex).toBeLessThan(addIndex);
+});
+
 test("Custom entrypoint with https and custom cert resolver", async () => {
 	const router = await createRouterConfig(
 		baseApp,

apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx

@@ -1,6 +1,7 @@
 import copy from "copy-to-clipboard";
 import { Check, Copy, Loader2 } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
+import { AnalyzeLogs } from "@/components/dashboard/docker/logs/analyze-logs";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";
@@ -165,6 +166,7 @@ export const ShowDeployment = ({
 								<Copy className="h-3.5 w-3.5" />
 							)}
 						</Button>
+						<AnalyzeLogs logs={filteredLogs} context="build" />
 
 						{serverId && (
 							<div className="flex items-center space-x-2">

apps/dokploy/components/dashboard/application/general/generic/save-git-provider.tsx

@@ -55,7 +55,7 @@ interface Props {
 
 export const SaveGitProvider = ({ applicationId }: Props) => {
 	const { data, refetch } = api.application.one.useQuery({ applicationId });
-	const { data: sshKeys } = api.sshKey.all.useQuery();
+	const { data: sshKeys } = api.sshKey.allForApps.useQuery();
 	const router = useRouter();
 
 	const { mutateAsync, isPending } =

apps/dokploy/components/dashboard/compose/general/generic/save-git-provider-compose.tsx

@@ -55,7 +55,7 @@ interface Props {
 
 export const SaveGitProviderCompose = ({ composeId }: Props) => {
 	const { data, refetch } = api.compose.one.useQuery({ composeId });
-	const { data: sshKeys } = api.sshKey.all.useQuery();
+	const { data: sshKeys } = api.sshKey.allForApps.useQuery();
 	const router = useRouter();
 
 	const { mutateAsync, isPending } = api.compose.update.useMutation();

apps/dokploy/components/dashboard/docker/logs/analyze-logs.tsx

@@ -0,0 +1,189 @@
+"use client";
+import { Bot, Loader2, RotateCcw, Settings, X } from "lucide-react";
+import Link from "next/link";
+import { useState } from "react";
+import ReactMarkdown from "react-markdown";
+import { toast } from "sonner";
+import { Button } from "@/components/ui/button";
+import {
+	Popover,
+	PopoverContent,
+	PopoverTrigger,
+} from "@/components/ui/popover";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
+import { api } from "@/utils/api";
+import type { LogLine } from "./utils";
+
+interface Props {
+	logs: LogLine[];
+	context: "build" | "runtime";
+}
+
+const MAX_LOG_LINES = 200;
+
+export function AnalyzeLogs({ logs, context }: Props) {
+	const [open, setOpen] = useState(false);
+	const [aiId, setAiId] = useState<string>("");
+	const { data: providers } = api.ai.getEnabledProviders.useQuery(undefined, {
+		enabled: open,
+	});
+	const { mutate, isPending, data, reset } = api.ai.analyzeLogs.useMutation({
+		onError: (error) => {
+			toast.error("Analysis failed", {
+				description: error.message,
+			});
+		},
+	});
+
+	const handleAnalyze = () => {
+		if (!aiId || logs.length === 0) return;
+
+		const logsText = logs
+			.slice(-MAX_LOG_LINES)
+			.map((l) => l.message)
+			.join("\n");
+
+		mutate({ aiId, logs: logsText, context });
+	};
+
+	return (
+		<Popover
+			open={open}
+			onOpenChange={(isOpen) => {
+				setOpen(isOpen);
+				if (!isOpen) {
+					reset();
+					setAiId("");
+				}
+			}}
+		>
+			<PopoverTrigger asChild>
+				<Button
+					variant="outline"
+					size="sm"
+					className="h-9"
+					disabled={logs.length === 0}
+					title="Analyze logs with AI"
+				>
+					<Bot className="mr-2 h-4 w-4" />
+					AI
+				</Button>
+			</PopoverTrigger>
+			<PopoverContent className="w-[550px] p-0" align="end">
+				<div className="flex items-center justify-between border-b px-4 py-3">
+					<div className="flex items-center gap-2">
+						<Bot className="h-4 w-4" />
+						<span className="text-sm font-medium">Log Analysis</span>
+					</div>
+					<Button
+						variant="ghost"
+						size="icon"
+						className="h-6 w-6"
+						onClick={() => setOpen(false)}
+					>
+						<X className="h-3.5 w-3.5" />
+					</Button>
+				</div>
+				<div className="p-4 space-y-3">
+					{!data?.analysis ? (
+						providers && providers.length === 0 ? (
+							<div className="flex flex-col items-center gap-3 py-2 text-center">
+								<p className="text-sm text-muted-foreground">
+									No AI providers configured. Set up a provider to start
+									analyzing logs.
+								</p>
+								<Button size="sm" variant="outline" asChild>
+									<Link href="/dashboard/settings/ai">
+										<Settings className="mr-2 h-3.5 w-3.5" />
+										Configure AI Provider
+									</Link>
+								</Button>
+							</div>
+						) : (
+							<>
+								<Select value={aiId} onValueChange={setAiId}>
+									<SelectTrigger className="h-9 text-sm">
+										<SelectValue placeholder="Select AI provider..." />
+									</SelectTrigger>
+									<SelectContent>
+										{providers?.map((p) => (
+											<SelectItem key={p.aiId} value={p.aiId}>
+												{p.name} ({p.model})
+											</SelectItem>
+										))}
+									</SelectContent>
+								</Select>
+								<Button
+									size="sm"
+									className="w-full"
+									disabled={!aiId || isPending || logs.length === 0}
+									onClick={handleAnalyze}
+								>
+									{isPending ? (
+										<>
+											<Loader2 className="mr-2 h-3.5 w-3.5 animate-spin" />
+											Analyzing...
+										</>
+									) : (
+										<>
+											<Bot className="mr-2 h-3.5 w-3.5" />
+											Analyze{" "}
+											{logs.length > MAX_LOG_LINES
+												? `last ${MAX_LOG_LINES}`
+												: logs.length}{" "}
+											lines
+										</>
+									)}
+								</Button>
+							</>
+						)
+					) : (
+						<>
+							<div className="max-h-[400px] overflow-y-auto">
+								<div className="prose prose-sm dark:prose-invert max-w-none text-sm break-words">
+									<ReactMarkdown>{data.analysis}</ReactMarkdown>
+								</div>
+							</div>
+							<div className="flex gap-2">
+								<Button
+									size="sm"
+									variant="outline"
+									className="flex-1"
+									onClick={() => {
+										reset();
+										handleAnalyze();
+									}}
+									disabled={isPending}
+								>
+									{isPending ? (
+										<Loader2 className="mr-2 h-3.5 w-3.5 animate-spin" />
+									) : (
+										<RotateCcw className="mr-2 h-3.5 w-3.5" />
+									)}
+									Re-analyze
+								</Button>
+								<Button
+									size="sm"
+									variant="ghost"
+									onClick={() => {
+										reset();
+										setAiId("");
+									}}
+									title="Change provider"
+								>
+									<X className="h-3.5 w-3.5" />
+								</Button>
+							</div>
+						</>
+					)}
+				</div>
+			</PopoverContent>
+		</Popover>
+	);
+}

apps/dokploy/components/dashboard/docker/logs/docker-logs-id.tsx

@@ -12,6 +12,7 @@ import { AlertBlock } from "@/components/shared/alert-block";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { api } from "@/utils/api";
+import { AnalyzeLogs } from "./analyze-logs";
 import { LineCountFilter } from "./line-count-filter";
 import { SinceLogsFilter, type TimeFilter } from "./since-logs-filter";
 import { StatusLogsFilter } from "./status-logs-filter";
@@ -377,6 +378,7 @@ export const DockerLogsId: React.FC<Props> = ({
 								<DownloadIcon className="mr-2 h-4 w-4" />
 								Download logs
 							</Button>
+							<AnalyzeLogs logs={filteredLogs} context="runtime" />
 						</div>
 					</div>
 					{isPaused && (

apps/dokploy/components/dashboard/mongo/general/show-external-mongo-credentials.tsx

@@ -82,7 +82,8 @@ export const ShowExternalMongoCredentials = ({ mongoId }: Props) => {
 		const buildConnectionUrl = () => {
 			const port = form.watch("externalPort") || data?.externalPort;
 
-			return `mongodb://${data?.databaseUser}:${data?.databasePassword}@${getIp}:${port}`;
+			const params = `authSource=admin${data?.replicaSets ? "" : "&directConnection=true"}`;
+			return `mongodb://${data?.databaseUser}:${data?.databasePassword}@${getIp}:${port}/?${params}`;
 		};
 
 		setConnectionUrl(buildConnectionUrl());

apps/dokploy/components/dashboard/mongo/general/show-internal-mongo-credentials.tsx

@@ -62,7 +62,7 @@ export const ShowInternalMongoCredentials = ({ mongoId }: Props) => {
 								<Label>Internal Connection URL </Label>
 								<ToggleVisibilityInput
 									disabled
-									value={`mongodb://${data?.databaseUser}:${data?.databasePassword}@${data?.appName}:27017`}
+									value={`mongodb://${data?.databaseUser}:${data?.databasePassword}@${data?.appName}:27017/?authSource=admin${data?.replicaSets ? "" : "&directConnection=true"}`}
 								/>
 							</div>
 						</div>

apps/dokploy/components/dashboard/monitoring/free/container/show-free-container-monitoring.tsx

@@ -220,11 +220,11 @@ export const ContainerFreeMonitoring = ({
 					<CardContent>
 						<div className="flex flex-col gap-2 w-full">
 							<span className="text-sm text-muted-foreground">
-								Used: {currentData.cpu.value}
+								Used: {String(currentData.cpu.value ?? "0%")}
 							</span>
 							<Progress
 								value={Number.parseInt(
-									currentData.cpu.value.replace("%", ""),
+									String(currentData.cpu.value ?? "0%").replace("%", ""),
 									10,
 								)}
 								className="w-[100%]"

apps/dokploy/components/dashboard/networks/handle-network.tsx

@@ -0,0 +1,563 @@
+"use client";
+
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Network, Pencil, Plus } from "lucide-react";
+import { useEffect, useState } from "react";
+import { useFieldArray, useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
+import { Button } from "@/components/ui/button";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogFooter,
+	DialogHeader,
+	DialogTitle,
+	DialogTrigger,
+} from "@/components/ui/dialog";
+import {
+	Form,
+	FormControl,
+	FormDescription,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
+import { Switch } from "@/components/ui/switch";
+import { api } from "@/utils/api";
+
+const networkDriverEnum = [
+	"bridge",
+	"host",
+	"overlay",
+	"macvlan",
+	"none",
+	"ipvlan",
+] as const;
+
+/** Sentinel for "no scope" */
+const SCOPE_EMPTY = "__scope_none__";
+
+const ipamConfigEntrySchema = z.object({
+	subnet: z.string().optional(),
+	ipRange: z.string().optional(),
+	gateway: z.string().optional(),
+});
+
+const networkFormSchema = z.object({
+	name: z.string().min(1, "Name is required"),
+	driver: z.enum(networkDriverEnum).default("bridge"),
+	scope: z.string().optional(),
+	serverId: z.string().optional(),
+	internal: z.boolean().default(false),
+	attachable: z.boolean().default(false),
+	ingress: z.boolean().default(false),
+	configOnly: z.boolean().default(false),
+	enableIPv4: z.boolean().default(true),
+	enableIPv6: z.boolean().default(false),
+	ipamDriver: z.string().optional(),
+	ipamConfig: z.array(ipamConfigEntrySchema).default([]),
+});
+
+type NetworkFormValues = z.infer<typeof networkFormSchema>;
+
+const defaultValues: NetworkFormValues = {
+	name: "",
+	driver: "bridge",
+	scope: SCOPE_EMPTY,
+	serverId: undefined,
+	internal: false,
+	attachable: false,
+	ingress: false,
+	configOnly: false,
+	enableIPv4: true,
+	enableIPv6: false,
+	ipamDriver: "",
+	ipamConfig: [],
+};
+
+interface HandleNetworkProps {
+	networkId?: string;
+	children?: React.ReactNode;
+}
+
+export const HandleNetwork = ({ networkId, children }: HandleNetworkProps) => {
+	const [isOpen, setIsOpen] = useState(false);
+	const { data: isCloud } = api.settings.isCloud.useQuery();
+	const utils = api.useUtils();
+	const isEdit = !!networkId;
+
+	const { data: servers } = api.server.all.useQuery();
+	const { data: network, isLoading: isLoadingNetwork } =
+		api.network.one.useQuery(
+			{ networkId: networkId! },
+			{ enabled: isEdit && !!networkId },
+		);
+
+	const { mutateAsync, isLoading: isPending } = networkId
+		? api.network.update.useMutation()
+		: api.network.create.useMutation();
+
+	const form = useForm<NetworkFormValues>({
+		resolver: zodResolver(networkFormSchema),
+		defaultValues,
+	});
+
+	const ipamConfigFieldArray = useFieldArray({
+		control: form.control,
+		name: "ipamConfig",
+	});
+
+	useEffect(() => {
+		if (isEdit && network && isOpen) {
+			const ipam = network.ipam ?? {};
+			const ipamConfigArr = (ipam.config ?? []).map((c) => ({
+				subnet: c.subnet ?? "",
+				ipRange: c.ipRange ?? "",
+				gateway: c.gateway ?? "",
+			}));
+			form.reset({
+				...defaultValues,
+				name: network.name,
+				driver: network.driver,
+				scope: network.scope ?? SCOPE_EMPTY,
+				serverId: network.serverId || undefined,
+				internal: network.internal,
+				attachable: network.attachable,
+				enableIPv4: network.enableIPv4,
+				enableIPv6: network.enableIPv6,
+				ipamDriver: ipam.driver ?? "",
+				ipamConfig: ipamConfigArr,
+				ingress: network.ingress,
+				configOnly: network.configOnly,
+			});
+		}
+	}, [isEdit, isOpen, network, form]);
+
+	const onSubmit = async (data: NetworkFormValues) => {
+		const scope =
+			data.scope && data.scope !== SCOPE_EMPTY ? data.scope : undefined;
+
+		try {
+			await mutateAsync({
+				networkId: networkId ?? "",
+				name: data.name,
+				driver: data.driver,
+				scope,
+				serverId: data.serverId || undefined,
+				internal: data.internal,
+				attachable: data.attachable,
+				ingress: data.ingress,
+				configOnly: data.configOnly,
+				enableIPv4: data.enableIPv4,
+				enableIPv6: data.enableIPv6,
+				ipam: {
+					driver: data.ipamDriver,
+					config: data.ipamConfig,
+				},
+			});
+
+			await utils.network.all.invalidate();
+			if (networkId) await utils.network.one.invalidate({ networkId });
+			setIsOpen(false);
+			form.reset(defaultValues);
+		} catch {
+			toast.error(isEdit ? "Error updating network" : "Error creating network");
+		}
+	};
+
+	const trigger =
+		children ??
+		(isEdit ? (
+			<Button size="sm" variant="outline">
+				<Pencil className=" size-4" />
+				Edit
+			</Button>
+		) : (
+			<Button>
+				<Plus className=" size-4" />
+				Add network
+			</Button>
+		));
+
+	return (
+		<Dialog open={isOpen} onOpenChange={setIsOpen}>
+			<DialogTrigger asChild>{trigger}</DialogTrigger>
+			<DialogContent className="sm:max-w-xl max-h-[90vh] overflow-y-auto">
+				<DialogHeader>
+					<DialogTitle className="flex items-center gap-2">
+						<Network className="size-5 text-muted-foreground" />
+						{isEdit ? "Edit network" : "Add network"}
+					</DialogTitle>
+					<DialogDescription>
+						{isEdit
+							? "Update this Docker network. Changes apply to name, driver, and server assignment."
+							: "Create a new Docker network for your organization. You can optionally assign it to a server."}
+					</DialogDescription>
+				</DialogHeader>
+				{isEdit && isLoadingNetwork ? (
+					<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
+						Loading network…
+					</div>
+				) : (
+					<Form {...form}>
+						<form
+							onSubmit={form.handleSubmit(onSubmit)}
+							className="flex w-full flex-col gap-6"
+						>
+							<div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+								<FormField
+									control={form.control}
+									name="name"
+									render={({ field }) => (
+										<FormItem>
+											<FormLabel>Name</FormLabel>
+											<FormControl>
+												<Input placeholder="my-network" {...field} />
+											</FormControl>
+											<FormMessage />
+										</FormItem>
+									)}
+								/>
+								<FormField
+									control={form.control}
+									name="driver"
+									render={({ field }) => (
+										<FormItem>
+											<FormLabel>Driver</FormLabel>
+											<Select
+												onValueChange={field.onChange}
+												value={field.value}
+											>
+												<FormControl>
+													<SelectTrigger>
+														<SelectValue placeholder="Select driver" />
+													</SelectTrigger>
+												</FormControl>
+												<SelectContent>
+													{networkDriverEnum.map((d) => (
+														<SelectItem key={d} value={d}>
+															{d}
+														</SelectItem>
+													))}
+												</SelectContent>
+											</Select>
+											<FormMessage />
+										</FormItem>
+									)}
+								/>
+							</div>
+							<FormField
+								control={form.control}
+								name="serverId"
+								render={({ field }) => (
+									<FormItem>
+										<FormLabel>Server</FormLabel>
+										<Select
+											onValueChange={field.onChange}
+											value={field.value ?? undefined}
+										>
+											<FormControl>
+												<SelectTrigger>
+													<SelectValue placeholder="Select server" />
+												</SelectTrigger>
+											</FormControl>
+											<SelectContent>
+												{!isCloud && (
+													<SelectItem value={undefined}>
+														Dokploy server
+													</SelectItem>
+												)}
+												{servers?.map((server) => (
+													<SelectItem
+														key={server.serverId}
+														value={server.serverId}
+													>
+														{server.name}
+													</SelectItem>
+												))}
+											</SelectContent>
+										</Select>
+										<FormDescription className="text-muted-foreground">
+											{isCloud
+												? "Server where this network will be created."
+												: "Dokploy server is the default local server; or choose a specific server."}
+										</FormDescription>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
+							<FormField
+								control={form.control}
+								name="scope"
+								render={({ field }) => (
+									<FormItem>
+										<FormLabel>Scope (optional)</FormLabel>
+										<Select
+											onValueChange={field.onChange}
+											value={field.value ?? SCOPE_EMPTY}
+										>
+											<FormControl>
+												<SelectTrigger>
+													<SelectValue placeholder="Select scope" />
+												</SelectTrigger>
+											</FormControl>
+											<SelectContent>
+												<SelectItem value={SCOPE_EMPTY}>None</SelectItem>
+												<SelectItem value="local">local</SelectItem>
+												<SelectItem value="swarm">swarm</SelectItem>
+											</SelectContent>
+										</Select>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
+							<div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
+								<FormField
+									control={form.control}
+									name="internal"
+									render={({ field }) => (
+										<FormItem className="flex flex-row items-center justify-between rounded-lg border p-4">
+											<div className="space-y-0.5">
+												<FormLabel className="text-base">Internal</FormLabel>
+												<FormDescription className="text-muted-foreground">
+													Restrict external access; containers on this network
+													cannot reach external networks.
+												</FormDescription>
+											</div>
+											<FormControl>
+												<Switch
+													checked={field.value}
+													onCheckedChange={field.onChange}
+												/>
+											</FormControl>
+										</FormItem>
+									)}
+								/>
+								<FormField
+									control={form.control}
+									name="attachable"
+									render={({ field }) => (
+										<FormItem className="flex flex-row items-center justify-between rounded-lg border p-4">
+											<div className="space-y-0.5">
+												<FormLabel className="text-base">Attachable</FormLabel>
+												<FormDescription className="text-muted-foreground">
+													Allow standalone containers to attach to this network
+													(e.g. in Swarm, not only services).
+												</FormDescription>
+											</div>
+											<FormControl>
+												<Switch
+													checked={field.value}
+													onCheckedChange={field.onChange}
+												/>
+											</FormControl>
+										</FormItem>
+									)}
+								/>
+								<FormField
+									control={form.control}
+									name="enableIPv4"
+									render={({ field }) => (
+										<FormItem className="flex flex-row items-center justify-between rounded-lg border p-4">
+											<div className="space-y-0.5">
+												<FormLabel className="text-base">Enable IPv4</FormLabel>
+												<FormDescription className="text-muted-foreground">
+													Enable IPv4 addressing on the network.
+												</FormDescription>
+											</div>
+											<FormControl>
+												<Switch
+													checked={field.value}
+													onCheckedChange={field.onChange}
+												/>
+											</FormControl>
+										</FormItem>
+									)}
+								/>
+								<FormField
+									control={form.control}
+									name="enableIPv6"
+									render={({ field }) => (
+										<FormItem className="flex flex-row items-center justify-between rounded-lg border p-4">
+											<div className="space-y-0.5">
+												<FormLabel className="text-base">Enable IPv6</FormLabel>
+												<FormDescription className="text-muted-foreground">
+													Enable IPv6 addressing on the network.
+												</FormDescription>
+											</div>
+											<FormControl>
+												<Switch
+													checked={field.value}
+													onCheckedChange={field.onChange}
+												/>
+											</FormControl>
+										</FormItem>
+									)}
+								/>
+								<FormField
+									control={form.control}
+									name="ingress"
+									render={({ field }) => (
+										<FormItem className="flex flex-row items-center justify-between rounded-lg border p-4">
+											<div className="space-y-0.5">
+												<FormLabel className="text-base">Ingress</FormLabel>
+												<FormDescription className="text-muted-foreground">
+													Use as the routing-mesh network in Swarm mode (load
+													balancing between nodes).
+												</FormDescription>
+											</div>
+											<FormControl>
+												<Switch
+													checked={field.value}
+													onCheckedChange={field.onChange}
+												/>
+											</FormControl>
+										</FormItem>
+									)}
+								/>
+								<FormField
+									control={form.control}
+									name="configOnly"
+									render={({ field }) => (
+										<FormItem className="flex flex-row items-center justify-between rounded-lg border p-4">
+											<div className="space-y-0.5">
+												<FormLabel className="text-base">Config only</FormLabel>
+												<FormDescription className="text-muted-foreground">
+													Create a placeholder network whose config is reused by
+													other networks; cannot run containers on it.
+												</FormDescription>
+											</div>
+											<FormControl>
+												<Switch
+													checked={field.value}
+													onCheckedChange={field.onChange}
+												/>
+											</FormControl>
+										</FormItem>
+									)}
+								/>
+							</div>
+							<div className="space-y-2 rounded-lg border p-4">
+								<FormLabel>IPAM</FormLabel>
+								<FormField
+									control={form.control}
+									name="ipamDriver"
+									render={({ field }) => (
+										<FormItem>
+											<FormLabel className="text-muted-foreground">
+												Driver (optional)
+											</FormLabel>
+											<FormControl>
+												<Input {...field} placeholder="default" />
+											</FormControl>
+											<FormMessage />
+										</FormItem>
+									)}
+								/>
+								<div className="space-y-2">
+									<FormLabel className="text-muted-foreground">
+										Config (subnet / gateway / IP range)
+									</FormLabel>
+									{ipamConfigFieldArray.fields.map((field, index) => (
+										<div key={field.id} className="flex flex-wrap gap-2">
+											<FormField
+												control={form.control}
+												name={`ipamConfig.${index}.subnet`}
+												render={({ field: f }) => (
+													<FormItem className="min-w-[140px] flex-1">
+														<FormControl>
+															<Input
+																{...f}
+																placeholder="Subnet (e.g. 172.20.0.0/16)"
+															/>
+														</FormControl>
+														<FormMessage />
+													</FormItem>
+												)}
+											/>
+											<FormField
+												control={form.control}
+												name={`ipamConfig.${index}.ipRange`}
+												render={({ field: f }) => (
+													<FormItem className="min-w-[120px] flex-1">
+														<FormControl>
+															<Input {...f} placeholder="IP range" />
+														</FormControl>
+														<FormMessage />
+													</FormItem>
+												)}
+											/>
+											<FormField
+												control={form.control}
+												name={`ipamConfig.${index}.gateway`}
+												render={({ field: f }) => (
+													<FormItem className="min-w-[120px] flex-1">
+														<FormControl>
+															<Input {...f} placeholder="Gateway" />
+														</FormControl>
+														<FormMessage />
+													</FormItem>
+												)}
+											/>
+											<Button
+												type="button"
+												variant="outline"
+												size="icon"
+												onClick={() => ipamConfigFieldArray.remove(index)}
+											>
+												−
+											</Button>
+										</div>
+									))}
+									<Button
+										type="button"
+										variant="outline"
+										size="sm"
+										onClick={() =>
+											ipamConfigFieldArray.append({
+												subnet: "",
+												ipRange: "",
+												gateway: "",
+											})
+										}
+									>
+										Add IPAM config
+									</Button>
+								</div>
+							</div>
+							<DialogFooter>
+								<Button
+									type="button"
+									variant="outline"
+									onClick={() => setIsOpen(false)}
+								>
+									Cancel
+								</Button>
+								<Button type="submit" disabled={isPending}>
+									{isPending
+										? isEdit
+											? "Updating…"
+											: "Creating…"
+										: isEdit
+											? "Update network"
+											: "Create network"}
+								</Button>
+							</DialogFooter>
+						</form>
+					</Form>
+				)}
+			</DialogContent>
+		</Dialog>
+	);
+};

apps/dokploy/components/dashboard/networks/show-networks.tsx

@@ -0,0 +1,118 @@
+"use client";
+
+import { Loader2, Network } from "lucide-react";
+import { HandleNetwork } from "@/components/dashboard/networks/handle-network";
+import { Button } from "@/components/ui/button";
+import {
+	Card,
+	CardContent,
+	CardDescription,
+	CardHeader,
+	CardTitle,
+} from "@/components/ui/card";
+import {
+	Table,
+	TableBody,
+	TableCell,
+	TableHead,
+	TableHeader,
+	TableRow,
+} from "@/components/ui/table";
+import { api } from "@/utils/api";
+
+export const ShowNetworks = () => {
+	const { data: networks, isLoading } = api.network.all.useQuery();
+
+	return (
+		<div className="w-full">
+			<Card className="h-full bg-sidebar p-2.5 rounded-xl">
+				<div className="rounded-xl bg-background shadow-md ">
+					<div className="flex flex-row justify-between items-center">
+						<CardHeader className="">
+							<CardTitle className="text-xl flex flex-row gap-2">
+								<Network className="size-6 text-muted-foreground self-center" />
+								Networks
+							</CardTitle>
+							<CardDescription>
+								Manage Docker networks for your organization. Networks can be
+								scoped to a server (optional).
+							</CardDescription>
+						</CardHeader>
+						{networks && networks?.length > 0 && <HandleNetwork />}
+					</div>
+
+					<CardContent className="space-y-2 py-8 border-t">
+						<div className="gap-4 pb-20 w-full">
+							<div className="flex flex-col gap-4 w-full overflow-auto">
+								<div className="rounded-md border">
+									{isLoading ? (
+										<div className="flex flex-row gap-2 items-center justify-center text-sm text-muted-foreground h-[55vh]">
+											<span>Loading...</span>
+											<Loader2 className="animate-spin size-4" />
+										</div>
+									) : !networks?.length ? (
+										<div className="flex min-h-[55vh] w-full flex-col items-center justify-center gap-4 rounded-lg border border-dashed p-8">
+											<div className="rounded-full bg-muted p-4">
+												<Network className="size-10 text-muted-foreground" />
+											</div>
+											<div className="space-y-1 text-center">
+												<p className="text-sm font-medium">No networks yet</p>
+												<p className="max-w-sm text-sm text-muted-foreground">
+													Create Docker networks for your organization and
+													optionally attach them to a server. Add your first
+													network to get started.
+												</p>
+											</div>
+											<HandleNetwork />
+										</div>
+									) : (
+										<Table>
+											<TableHeader>
+												<TableRow>
+													<TableHead>Name</TableHead>
+													<TableHead>Driver</TableHead>
+													<TableHead>Scope</TableHead>
+													<TableHead>Internal</TableHead>
+													<TableHead>Attachable</TableHead>
+													<TableHead>Server</TableHead>
+													<TableHead>Created</TableHead>
+													<TableHead className="w-[80px]">Actions</TableHead>
+												</TableRow>
+											</TableHeader>
+											<TableBody>
+												{networks.map((n) => (
+													<TableRow key={n.networkId}>
+														<TableCell className="font-medium">
+															{n.name}
+														</TableCell>
+														<TableCell>{n.driver}</TableCell>
+														<TableCell>{n.scope ?? "—"}</TableCell>
+														<TableCell>{n.internal ? "Yes" : "No"}</TableCell>
+														<TableCell>{n.attachable ? "Yes" : "No"}</TableCell>
+														<TableCell>
+															{n.serverId ?? "Dokploy server"}
+														</TableCell>
+														<TableCell className="text-muted-foreground">
+															{new Date(n.createdAt).toLocaleDateString()}
+														</TableCell>
+														<TableCell>
+															<HandleNetwork networkId={n.networkId}>
+																<Button variant="ghost" size="sm">
+																	Edit
+																</Button>
+															</HandleNetwork>
+														</TableCell>
+													</TableRow>
+												))}
+											</TableBody>
+										</Table>
+									)}
+								</div>
+							</div>
+						</div>
+					</CardContent>
+				</div>
+			</Card>
+		</div>
+	);
+};

apps/dokploy/components/dashboard/project/ai/template-generator.tsx

@@ -298,7 +298,19 @@ export const TemplateGenerator = ({ environmentId }: Props) => {
 					<div className="flex items-center justify-between w-full">
 						<div className="flex items-center gap-2 w-full justify-end">
 							<Button
-								onClick={stepper.prev}
+								onClick={() => {
+									if (
+										stepper.current.id === "variant" &&
+										templateInfo.details
+									) {
+										setTemplateInfo((prev) => ({
+											...prev,
+											details: null,
+										}));
+										return;
+									}
+									stepper.prev();
+								}}
 								disabled={stepper.isFirst}
 								variant="secondary"
 							>

apps/dokploy/components/dashboard/settings/billing/show-billing.tsx

@@ -2,6 +2,7 @@ import { loadStripe } from "@stripe/stripe-js";
 import clsx from "clsx";
 import {
 	AlertTriangle,
+	Bell,
 	CheckIcon,
 	CreditCard,
 	FileText,
@@ -25,7 +26,17 @@ import {
 	CardTitle,
 } from "@/components/ui/card";
 import { NumberInput } from "@/components/ui/input";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogHeader,
+	DialogTitle,
+	DialogTrigger,
+} from "@/components/ui/dialog";
+import { Label } from "@/components/ui/label";
 import { Progress } from "@/components/ui/progress";
+import { Switch } from "@/components/ui/switch";
 import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
@@ -90,6 +101,8 @@ export const ShowBilling = () => {
 		api.stripe.createCustomerPortalSession.useMutation();
 	const { mutateAsync: upgradeSubscription, isPending: isUpgrading } =
 		api.stripe.upgradeSubscription.useMutation();
+	const { mutateAsync: updateInvoiceNotifications } =
+		api.stripe.updateInvoiceNotifications.useMutation();
 	const utils = api.useUtils();
 
 	const [hobbyServerQuantity, setHobbyServerQuantity] = useState(1);
@@ -151,14 +164,66 @@ export const ShowBilling = () => {
 		<div className="w-full">
 			<Card className="bg-sidebar p-2.5 rounded-xl max-w-6xl mx-auto">
 				<div className="rounded-xl bg-background shadow-md">
-					<CardHeader>
-						<CardTitle className="text-xl flex flex-row gap-2">
-							<CreditCard className="size-6 text-muted-foreground self-center" />
-							Billing
-						</CardTitle>
-						<CardDescription>
-							Manage your subscription and invoices
-						</CardDescription>
+					<CardHeader className="flex flex-row items-start justify-between">
+						<div>
+							<CardTitle className="text-xl flex flex-row gap-2">
+								<CreditCard className="size-6 text-muted-foreground self-center" />
+								Billing
+							</CardTitle>
+							<CardDescription>
+								Manage your subscription and invoices
+							</CardDescription>
+						</div>
+						{(admin?.user.stripeSubscriptionId || isEnterpriseCloud) && (
+							<Dialog>
+								<DialogTrigger asChild>
+									<Button variant="outline" size="icon">
+										<Bell className="size-4" />
+									</Button>
+								</DialogTrigger>
+								<DialogContent className="sm:max-w-md">
+									<DialogHeader>
+										<DialogTitle>Notification Settings</DialogTitle>
+										<DialogDescription>
+											Configure your billing email notifications.
+										</DialogDescription>
+									</DialogHeader>
+									<div className="flex items-center justify-between rounded-lg border p-4">
+										<div className="space-y-0.5">
+											<Label htmlFor="invoice-notifications">
+												Invoice Notifications
+											</Label>
+											<p className="text-sm text-muted-foreground">
+												Receive email notifications for payments and failed
+												charges.
+											</p>
+										</div>
+										<Switch
+											id="invoice-notifications"
+											checked={admin?.user.sendInvoiceNotifications ?? false}
+											onCheckedChange={async (checked) => {
+												await updateInvoiceNotifications({
+													enabled: checked,
+												})
+													.then(() => {
+														utils.user.get.invalidate();
+														toast.success(
+															checked
+																? "Invoice notifications enabled"
+																: "Invoice notifications disabled",
+														);
+													})
+													.catch(() => {
+														toast.error(
+															"Failed to update invoice notifications",
+														);
+													});
+											}}
+										/>
+									</div>
+								</DialogContent>
+							</Dialog>
+						)}
 					</CardHeader>
 					<CardContent className="space-y-4 py-4 border-t">
 						<nav className="flex space-x-2 border-b">

apps/dokploy/components/dashboard/settings/handle-ai.tsx

@@ -1,6 +1,13 @@
 "use client";
 import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema";
-import { Check, ChevronDown, PenBoxIcon, PlusIcon } from "lucide-react";
+import {
+	Check,
+	ChevronDown,
+	Loader2,
+	PenBoxIcon,
+	Plug,
+	PlusIcon,
+} from "lucide-react";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
@@ -37,10 +44,34 @@ import {
 	PopoverContent,
 	PopoverTrigger,
 } from "@/components/ui/popover";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
 import { Switch } from "@/components/ui/switch";
 import { cn } from "@/lib/utils";
 import { api } from "@/utils/api";
 
+const AI_PROVIDERS = [
+	{ name: "OpenAI", apiUrl: "https://api.openai.com/v1" },
+	{ name: "Anthropic", apiUrl: "https://api.anthropic.com/v1" },
+	{
+		name: "Google Gemini",
+		apiUrl: "https://generativelanguage.googleapis.com/v1beta",
+	},
+	{ name: "Mistral", apiUrl: "https://api.mistral.ai/v1" },
+	{ name: "Cohere", apiUrl: "https://api.cohere.ai/v2" },
+	{ name: "Perplexity", apiUrl: "https://api.perplexity.ai" },
+	{ name: "DeepInfra", apiUrl: "https://api.deepinfra.com/v1/openai" },
+	{ name: "Ollama", apiUrl: "http://localhost:11434" },
+	{ name: "OpenRouter", apiUrl: "https://openrouter.ai/api/v1" },
+	{ name: "Z.AI", apiUrl: "https://api.z.ai/api/paas/v4" },
+	{ name: "MiniMax", apiUrl: "https://api.minimax.io/v1" },
+] as const;
+
 const Schema = z.object({
 	name: z.string().min(1, { message: "Name is required" }),
 	apiUrl: z.string().url({ message: "Please enter a valid URL" }),
@@ -103,7 +134,7 @@ export const HandleAi = ({ aiId }: Props) => {
 	const isOllama = apiUrl.includes(":11434") || apiUrl.includes("ollama");
 	const {
 		data: models,
-		isPending: isLoadingServerModels,
+		isFetching: isLoadingServerModels,
 		error: modelsError,
 	} = api.ai.getModels.useQuery(
 		{
@@ -172,6 +203,34 @@ export const HandleAi = ({ aiId }: Props) => {
 						<AlertBlock type="error">{modelsError.message}</AlertBlock>
 					)}
 					<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-2">
+						<div className="space-y-1">
+							<FormLabel>Provider</FormLabel>
+							<Select
+								onValueChange={(value) => {
+									const provider = AI_PROVIDERS.find((p) => p.apiUrl === value);
+									if (provider) {
+										form.setValue("name", provider.name);
+										form.setValue("apiUrl", provider.apiUrl);
+										form.setValue("model", "");
+									}
+								}}
+							>
+								<SelectTrigger>
+									<SelectValue placeholder="Select a provider preset..." />
+								</SelectTrigger>
+								<SelectContent>
+									{AI_PROVIDERS.map((provider) => (
+										<SelectItem key={provider.apiUrl} value={provider.apiUrl}>
+											{provider.name}
+										</SelectItem>
+									))}
+								</SelectContent>
+							</Select>
+							<p className="text-[0.8rem] text-muted-foreground">
+								Quick-fill provider name and URL, or configure manually below
+							</p>
+						</div>
+
 						<FormField
 							control={form.control}
 							name="name"
@@ -253,101 +312,129 @@ export const HandleAi = ({ aiId }: Props) => {
 							</span>
 						)}
 
-						{!isLoadingServerModels && !models?.length && (
-							<span className="text-sm text-muted-foreground">
-								No models available
-							</span>
-						)}
+						<FormField
+							control={form.control}
+							name="model"
+							render={({ field }) => {
+								const hasModels =
+									!isLoadingServerModels && models && models.length > 0;
+								const selectedModel = models?.find((m) => m.id === field.value);
+								const filteredModels = (models ?? []).filter((model) =>
+									model.id.toLowerCase().includes(modelSearch.toLowerCase()),
+								);
 
-						{!isLoadingServerModels && models && models.length > 0 && (
-							<FormField
-								control={form.control}
-								name="model"
-								render={({ field }) => {
-									const selectedModel = models.find(
-										(m) => m.id === field.value,
-									);
-									const filteredModels = models.filter((model) =>
-										model.id.toLowerCase().includes(modelSearch.toLowerCase()),
-									);
+								const displayModels =
+									field.value &&
+									!filteredModels.find((m) => m.id === field.value) &&
+									selectedModel
+										? [selectedModel, ...filteredModels]
+										: filteredModels;
 
-									// Ensure selected model is always in the filtered list
-									const displayModels =
-										field.value &&
-										!filteredModels.find((m) => m.id === field.value) &&
-										selectedModel
-											? [selectedModel, ...filteredModels]
-											: filteredModels;
-
-									return (
-										<FormItem>
-											<FormLabel>Model</FormLabel>
-											<Popover
-												open={modelPopoverOpen}
-												onOpenChange={setModelPopoverOpen}
-											>
-												<PopoverTrigger asChild>
-													<FormControl>
-														<Button
-															variant="outline"
-															className={cn(
-																"w-full justify-between",
-																!field.value && "text-muted-foreground",
-															)}
+								return (
+									<FormItem>
+										<FormLabel>Model</FormLabel>
+										<div className="flex gap-2">
+											<div className="flex-1">
+												{hasModels ? (
+													<Popover
+														open={modelPopoverOpen}
+														onOpenChange={setModelPopoverOpen}
+													>
+														<PopoverTrigger asChild>
+															<FormControl>
+																<Button
+																	variant="outline"
+																	className={cn(
+																		"w-full justify-between",
+																		!field.value && "text-muted-foreground",
+																	)}
+																>
+																	{field.value
+																		? (selectedModel?.id ?? field.value)
+																		: "Select a model"}
+																	<ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+																</Button>
+															</FormControl>
+														</PopoverTrigger>
+														<PopoverContent
+															className="w-[400px] p-0"
+															align="start"
 														>
-															{field.value
-																? (selectedModel?.id ?? field.value)
-																: "Select a model"}
-															<ChevronDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-														</Button>
-													</FormControl>
-												</PopoverTrigger>
-												<PopoverContent className="w-[400px] p-0" align="start">
-													<Command>
-														<CommandInput
-															placeholder="Search models..."
-															value={modelSearch}
-															onValueChange={setModelSearch}
+															<Command>
+																<CommandInput
+																	placeholder="Search or type a custom model..."
+																	value={modelSearch}
+																	onValueChange={setModelSearch}
+																/>
+																<CommandList>
+																	<CommandEmpty>
+																		{modelSearch ? (
+																			<button
+																				type="button"
+																				className="w-full cursor-pointer px-2 py-1.5 text-left text-sm hover:bg-accent"
+																				onClick={() => {
+																					field.onChange(modelSearch);
+																					setModelPopoverOpen(false);
+																					setModelSearch("");
+																				}}
+																			>
+																				Use custom model: "{modelSearch}"
+																			</button>
+																		) : (
+																			"No models found."
+																		)}
+																	</CommandEmpty>
+																	{displayModels.map((model) => {
+																		const isSelected = field.value === model.id;
+																		return (
+																			<CommandItem
+																				key={model.id}
+																				value={model.id}
+																				onSelect={() => {
+																					field.onChange(model.id);
+																					setModelPopoverOpen(false);
+																					setModelSearch("");
+																				}}
+																			>
+																				<Check
+																					className={cn(
+																						"mr-2 h-4 w-4",
+																						isSelected
+																							? "opacity-100"
+																							: "opacity-0",
+																					)}
+																				/>
+																				{model.id}
+																			</CommandItem>
+																		);
+																	})}
+																</CommandList>
+															</Command>
+														</PopoverContent>
+													</Popover>
+												) : (
+													<FormControl>
+														<Input
+															placeholder={
+																isLoadingServerModels
+																	? "Loading models..."
+																	: "Enter model name (e.g. gpt-4o)"
+															}
+															disabled={isLoadingServerModels}
+															{...field}
 														/>
-														<CommandList>
-															<CommandEmpty>No models found.</CommandEmpty>
-															{displayModels.map((model) => {
-																const isSelected = field.value === model.id;
-																return (
-																	<CommandItem
-																		key={model.id}
-																		value={model.id}
-																		onSelect={() => {
-																			field.onChange(model.id);
-																			setModelPopoverOpen(false);
-																			setModelSearch("");
-																		}}
-																	>
-																		<Check
-																			className={cn(
-																				"mr-2 h-4 w-4",
-																				isSelected
-																					? "opacity-100"
-																					: "opacity-0",
-																			)}
-																		/>
-																		{model.id}
-																	</CommandItem>
-																);
-															})}
-														</CommandList>
-													</Command>
-												</PopoverContent>
-											</Popover>
-											<FormDescription>
-												Select an AI model to use
-											</FormDescription>
-											<FormMessage />
-										</FormItem>
-									);
-								}}
-							/>
-						)}
+													</FormControl>
+												)}
+											</div>
+										</div>
+										<FormDescription>
+											Select a model from the list or type a custom model name
+										</FormDescription>
+										<FormMessage />
+									</FormItem>
+								);
+							}}
+						/>
 
 						<FormField
 							control={form.control}
@@ -372,7 +459,12 @@ export const HandleAi = ({ aiId }: Props) => {
 							)}
 						/>
 
-						<div className="flex justify-end  gap-2 pt-4">
+						<div className="flex justify-end gap-2 pt-4">
+							<TestConnectionButton
+								apiUrl={apiUrl}
+								apiKey={apiKey}
+								model={form.watch("model")}
+							/>
 							<Button type="submit" isLoading={isPending}>
 								{aiId ? "Update" : "Create"}
 							</Button>
@@ -383,3 +475,42 @@ export const HandleAi = ({ aiId }: Props) => {
 		</Dialog>
 	);
 };
+
+function TestConnectionButton({
+	apiUrl,
+	apiKey,
+	model,
+}: {
+	apiUrl: string;
+	apiKey: string;
+	model: string;
+}) {
+	const { mutate, isPending } = api.ai.testConnection.useMutation({
+		onSuccess: () => {
+			toast.success("Connection successful");
+		},
+		onError: (error) => {
+			toast.error("Connection failed", {
+				description: error.message,
+			});
+		},
+	});
+
+	const isDisabled = !apiUrl || !model;
+
+	return (
+		<Button
+			type="button"
+			variant="outline"
+			disabled={isDisabled || isPending}
+			onClick={() => mutate({ apiUrl, apiKey, model })}
+		>
+			{isPending ? (
+				<Loader2 className="mr-2 h-4 w-4 animate-spin" />
+			) : (
+				<Plug className="mr-2 h-4 w-4" />
+			)}
+			Test Connection
+		</Button>
+	);
+}

apps/dokploy/components/dashboard/settings/servers/welcome-stripe/welcome-subscription.tsx

@@ -55,7 +55,8 @@ export const WelcomeSubscription = () => {
 	const [showConfetti, setShowConfetti] = useState(false);
 	const stepper = useStepper();
 	const [isOpen, setIsOpen] = useState(true);
-	const { push } = useRouter();
+	const router = useRouter();
+	const { push } = router;
 
 	useEffect(() => {
 		const confettiShown = localStorage.getItem("hasShownConfetti");
@@ -66,7 +67,22 @@ export const WelcomeSubscription = () => {
 	}, [showConfetti]);
 
 	return (
-		<Dialog open={isOpen}>
+		<Dialog
+			open={isOpen}
+			onOpenChange={(open) => {
+				setIsOpen(open);
+				if (!open) {
+					const { success, ...rest } = router.query;
+					router.replace(
+						{ pathname: router.pathname, query: rest },
+						undefined,
+						{
+							shallow: true,
+						},
+					);
+				}
+			}}
+		>
 			<DialogContent className="sm:max-w-7xl min-h-[75vh]">
 				{showConfetti ?? "Flaso"}
 				<div className="flex justify-center items-center w-full">

apps/dokploy/components/layouts/side.tsx

@@ -24,6 +24,7 @@ import {
 	Loader2,
 	LogIn,
 	type LucideIcon,
+	Network,
 	Package,
 	Palette,
 	PieChart,
@@ -206,6 +207,20 @@ const MENU: Menu = {
 			isEnabled: ({ permissions, isCloud }) =>
 				!!(permissions?.docker.read && !isCloud),
 		},
+		{
+			isSingle: true,
+			title: "Networks",
+			url: "/dashboard/networks",
+			icon: Network,
+			// Only enabled for admins and users with access to Docker in non-cloud environments
+			isEnabled: ({ auth, isCloud }) =>
+				!!(
+					(auth?.role === "owner" ||
+						auth?.role === "admin" ||
+						auth?.canAccessToDocker) &&
+					!isCloud
+				),
+		},
 		{
 			isSingle: true,
 			title: "Requests",

apps/dokploy/drizzle/0165_abnormal_greymalkin.sql

@@ -0,0 +1 @@
+ALTER TABLE "user" ADD COLUMN "sendInvoiceNotifications" boolean DEFAULT false NOT NULL;

apps/dokploy/drizzle/0166_pale_multiple_man.sql

@@ -0,0 +1,27 @@
+CREATE TYPE "public"."networkDriver" AS ENUM('bridge', 'host', 'overlay', 'macvlan', 'none', 'ipvlan');--> statement-breakpoint
+CREATE TABLE "network" (
+	"networkId" text PRIMARY KEY NOT NULL,
+	"name" text NOT NULL,
+	"driver" "networkDriver" DEFAULT 'bridge' NOT NULL,
+	"scope" text,
+	"internal" boolean DEFAULT false NOT NULL,
+	"attachable" boolean DEFAULT false NOT NULL,
+	"ingress" boolean DEFAULT false NOT NULL,
+	"configOnly" boolean DEFAULT false NOT NULL,
+	"enableIPv4" boolean DEFAULT true NOT NULL,
+	"enableIPv6" boolean DEFAULT false NOT NULL,
+	"ipam" jsonb DEFAULT '{}'::jsonb,
+	"createdAt" text NOT NULL,
+	"organizationId" text NOT NULL,
+	"serverId" text
+);
+--> statement-breakpoint
+ALTER TABLE "application" ADD COLUMN "networkIds" text[] DEFAULT '{}';--> statement-breakpoint
+ALTER TABLE "compose" ADD COLUMN "networkIds" text[] DEFAULT '{}';--> statement-breakpoint
+ALTER TABLE "mariadb" ADD COLUMN "networkIds" text[] DEFAULT '{}';--> statement-breakpoint
+ALTER TABLE "mongo" ADD COLUMN "networkIds" text[] DEFAULT '{}';--> statement-breakpoint
+ALTER TABLE "mysql" ADD COLUMN "networkIds" text[] DEFAULT '{}';--> statement-breakpoint
+ALTER TABLE "postgres" ADD COLUMN "networkIds" text[] DEFAULT '{}';--> statement-breakpoint
+ALTER TABLE "redis" ADD COLUMN "networkIds" text[] DEFAULT '{}';--> statement-breakpoint
+ALTER TABLE "network" ADD CONSTRAINT "network_organizationId_organization_id_fk" FOREIGN KEY ("organizationId") REFERENCES "public"."organization"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "network" ADD CONSTRAINT "network_serverId_server_serverId_fk" FOREIGN KEY ("serverId") REFERENCES "public"."server"("serverId") ON DELETE cascade ON UPDATE no action;

apps/dokploy/drizzle/meta/_journal.json

@@ -1156,6 +1156,20 @@
       "when": 1775369858244,
       "tag": "0164_slippery_sasquatch",
       "breakpoints": true
+    },
+    {
+      "idx": 165,
+      "version": "7",
+      "when": 1775845419261,
+      "tag": "0165_abnormal_greymalkin",
+      "breakpoints": true
+    },
+    {
+      "idx": 166,
+      "version": "7",
+      "when": 1776117573148,
+      "tag": "0166_pale_multiple_man",
+      "breakpoints": true
     }
   ]
 }

apps/dokploy/pages/api/stripe/webhook.ts

@@ -5,6 +5,10 @@ import { and, asc, eq } from "drizzle-orm";
 import type { NextApiRequest, NextApiResponse } from "next";
 import Stripe from "stripe";
 import { organization, server, user } from "@/server/db/schema";
+import {
+	sendInvoiceEmail,
+	sendPaymentFailedEmail,
+} from "@/server/utils/stripe-notifications";
 
 const endpointSecret = process.env.STRIPE_WEBHOOK_SECRET!;
 
@@ -241,6 +245,11 @@ export default async function handler(
 			}
 			const newServersQuantity = admin.serversQuantity;
 			await updateServersBasedOnQuantity(admin.id, newServersQuantity);
+
+			if (admin.sendInvoiceNotifications) {
+				await sendInvoiceEmail(newInvoice, admin);
+			}
+
 			break;
 		}
 		case "invoice.payment_failed": {
@@ -249,7 +258,6 @@ export default async function handler(
 			const subscription = await stripe.subscriptions.retrieve(
 				newInvoice.subscription as string,
 			);
-
 			if (subscription.status !== "active") {
 				const admin = await findUserByStripeCustomerId(
 					newInvoice.customer as string,
@@ -263,6 +271,10 @@ export default async function handler(
 					break;
 				}
 
+				if (admin.sendInvoiceNotifications) {
+					await sendPaymentFailedEmail(newInvoice, admin);
+				}
+
 				await db
 					.update(user)
 					.set({

apps/dokploy/pages/dashboard/deployments.tsx

@@ -40,7 +40,7 @@ function DeploymentsPage() {
 
 	return (
 		<div className="w-full">
-			<Card className="h-full bg-sidebar p-2.5 rounded-xl max-w-8xl mx-auto min-h-[45vh]">
+			<Card className="h-full bg-sidebar p-2.5 rounded-xl min-h-[45vh]">
 				<div className="rounded-xl bg-background shadow-md h-full">
 					<CardHeader>
 						<div className="flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">

apps/dokploy/pages/dashboard/networks.tsx

@@ -0,0 +1,84 @@
+import { IS_CLOUD } from "@dokploy/server/constants";
+import { validateRequest } from "@dokploy/server/lib/auth";
+import { createServerSideHelpers } from "@trpc/react-query/server";
+import type { GetServerSidePropsContext } from "next";
+import type { ReactElement } from "react";
+import superjson from "superjson";
+import { ShowNetworks } from "@/components/dashboard/networks/show-networks";
+import { DashboardLayout } from "@/components/layouts/dashboard-layout";
+import { appRouter } from "@/server/api/root";
+
+const Dashboard = () => {
+	return <ShowNetworks />;
+};
+
+export default Dashboard;
+
+Dashboard.getLayout = (page: ReactElement) => {
+	return <DashboardLayout>{page}</DashboardLayout>;
+};
+
+export async function getServerSideProps(
+	ctx: GetServerSidePropsContext<{ serviceId: string }>,
+) {
+	if (IS_CLOUD) {
+		return {
+			redirect: {
+				permanent: true,
+				destination: "/dashboard/projects",
+			},
+		};
+	}
+	const { user, session } = await validateRequest(ctx.req);
+	if (!user) {
+		return {
+			redirect: {
+				permanent: true,
+				destination: "/",
+			},
+		};
+	}
+	const { req } = ctx;
+
+	const helpers = createServerSideHelpers({
+		router: appRouter,
+		ctx: {
+			req: req as any,
+			res: ctx.res as any,
+			db: null as any,
+			session: session as any,
+			user: user as any,
+		},
+		transformer: superjson,
+	});
+	try {
+		await helpers.project.all.prefetch();
+
+		if (user.role === "member") {
+			const userR = await helpers.user.one.fetch({
+				userId: user.id,
+			});
+
+			if (!userR?.canAccessToDocker) {
+				return {
+					redirect: {
+						permanent: true,
+						destination: "/",
+					},
+				};
+			}
+		}
+
+		await helpers.network.all.prefetch();
+
+		return {
+			props: {
+				trpcState: helpers.dehydrate(),
+			},
+		};
+	} catch {
+		return {
+			props: {},
+		};
+	}
+}

apps/dokploy/server/api/root.ts

@@ -21,6 +21,7 @@ import { mariadbRouter } from "./routers/mariadb";
 import { mongoRouter } from "./routers/mongo";
 import { mountRouter } from "./routers/mount";
 import { mysqlRouter } from "./routers/mysql";
+import { networkRouter } from "./routers/network";
 import { notificationRouter } from "./routers/notification";
 import { organizationRouter } from "./routers/organization";
 import { patchRouter } from "./routers/patch";
@@ -58,6 +59,7 @@ export const appRouter = createTRPCRouter({
 	application: applicationRouter,
 	backup: backupRouter,
 	bitbucket: bitbucketRouter,
+	network: networkRouter,
 	certificates: certificateRouter,
 	cluster: clusterRouter,
 	compose: composeRouter,

apps/dokploy/server/api/routers/ai.ts

@@ -25,9 +25,11 @@ import { findProjectById } from "@dokploy/server/services/project";
 import {
 	getProviderHeaders,
 	getProviderName,
+	selectAIProvider,
 	type Model,
 } from "@dokploy/server/utils/ai/select-ai-provider";
 import { TRPCError } from "@trpc/server";
+import { generateText } from "ai";
 import { z } from "zod";
 import { slugify } from "@/lib/slug";
 import {
@@ -95,6 +97,30 @@ export const aiRouter = createTRPCRouter({
 								owned_by: "perplexity",
 							},
 						] as Model[];
+					case "zai":
+						return [
+							{
+								id: "glm-5",
+								object: "model",
+								created: Date.now(),
+								owned_by: "zai",
+							},
+							{
+								id: "glm-4.7",
+								object: "model",
+								created: Date.now(),
+								owned_by: "zai",
+							},
+						] as Model[];
+					case "minimax":
+						return [
+							{
+								id: "MiniMax-M2.7",
+								object: "model",
+								created: Date.now(),
+								owned_by: "minimax",
+							},
+						] as Model[];
 					default:
 						if (!input.apiKey)
 							throw new TRPCError({
@@ -174,6 +200,107 @@ export const aiRouter = createTRPCRouter({
 			return await deleteAiSettings(input.aiId);
 		}),
 
+	getEnabledProviders: protectedProcedure.query(async ({ ctx }) => {
+		const settings = await getAiSettingsByOrganizationId(
+			ctx.session.activeOrganizationId,
+		);
+		return settings
+			.filter((s) => s.isEnabled)
+			.map((s) => ({ aiId: s.aiId, name: s.name, model: s.model }));
+	}),
+
+	analyzeLogs: protectedProcedure
+		.input(
+			z.object({
+				aiId: z.string().min(1),
+				logs: z.string().min(1),
+				context: z.enum(["build", "runtime"]),
+			}),
+		)
+		.mutation(async ({ input, ctx }) => {
+			try {
+				const aiSettings = await getAiSettingById(input.aiId);
+				if (!aiSettings?.isEnabled) {
+					throw new TRPCError({
+						code: "BAD_REQUEST",
+						message: "AI provider is not enabled",
+					});
+				}
+
+				if (aiSettings.organizationId !== ctx.session.activeOrganizationId) {
+					throw new TRPCError({
+						code: "FORBIDDEN",
+						message: "Access denied",
+					});
+				}
+
+				const provider = selectAIProvider(aiSettings);
+				const model = provider(aiSettings.model);
+
+				const contextLabel =
+					input.context === "build" ? "build/deployment" : "runtime/container";
+
+				const result = await generateText({
+					model,
+					prompt: `You are a DevOps engineer analyzing ${contextLabel} logs. Analyze the following logs and provide:
+
+1. **Summary**: A brief summary of what's happening
+2. **Issues Found**: Any errors, warnings, or problems detected
+3. **Root Cause**: The most likely root cause if there are errors
+4. **Suggested Fix**: Actionable steps to resolve the issues
+
+Be concise and practical. Focus on the most important issues. If the logs look healthy, say so briefly.
+
+Logs:
+${input.logs}`,
+				});
+
+				return { analysis: result.text };
+			} catch (error) {
+				throw new TRPCError({
+					code: "BAD_REQUEST",
+					message:
+						error instanceof Error
+							? error.message
+							: `Analysis failed: ${error}`,
+				});
+			}
+		}),
+
+	testConnection: protectedProcedure
+		.input(
+			z.object({
+				apiUrl: z.string().min(1),
+				apiKey: z.string(),
+				model: z.string().min(1),
+			}),
+		)
+		.mutation(async ({ input }) => {
+			try {
+				const provider = selectAIProvider({
+					apiUrl: input.apiUrl,
+					apiKey: input.apiKey,
+				});
+				const model = provider(input.model);
+				const result = await generateText({
+					model,
+					prompt: "Reply with 'ok'",
+				});
+				if (!result.text) {
+					throw new Error("No response received from the model");
+				}
+				return { success: true, message: "Connection successful" };
+			} catch (error) {
+				throw new TRPCError({
+					code: "BAD_REQUEST",
+					message:
+						error instanceof Error
+							? error.message
+							: `Connection failed: ${error}`,
+				});
+			}
+		}),
+
 	suggest: protectedProcedure
 		.input(
 			z.object({

apps/dokploy/server/api/routers/application.ts

@@ -6,7 +6,9 @@ import {
 	findEnvironmentById,
 	findGitProviderById,
 	findProjectById,
+	getAccessibleServerIds,
 	getApplicationStats,
+	getContainerLogs,
 	IS_CLOUD,
 	mechanizeDockerContainer,
 	readConfig,
@@ -26,7 +28,6 @@ import {
 	updateDeploymentStatus,
 	writeConfig,
 	writeConfigRemote,
-	getAccessibleServerIds,
 } from "@dokploy/server";
 import { db } from "@dokploy/server/db";
 import {
@@ -1101,4 +1102,39 @@ export const applicationRouter = createTRPCRouter({
 				total: countResult[0]?.count ?? 0,
 			};
 		}),
+
+	readLogs: protectedProcedure
+		.input(
+			apiFindOneApplication.extend({
+				tail: z.number().int().min(1).max(10000).default(100),
+				since: z
+					.string()
+					.regex(/^(all|\d+[smhd])$/, "Invalid since format")
+					.default("all"),
+				search: z
+					.string()
+					.regex(/^[a-zA-Z0-9 ._-]{0,500}$/)
+					.optional(),
+			}),
+		)
+		.query(async ({ input, ctx }) => {
+			await checkServiceAccess(ctx, input.applicationId, "read");
+			const application = await findApplicationById(input.applicationId);
+			if (
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
+				throw new TRPCError({
+					code: "UNAUTHORIZED",
+					message: "You are not authorized to access this application",
+				});
+			}
+			return await getContainerLogs(
+				application.appName,
+				input.tail,
+				input.since,
+				input.search,
+				application.serverId,
+			);
+		}),
 });

apps/dokploy/server/api/routers/compose.ts

@@ -16,7 +16,9 @@ import {
 	findGitProviderById,
 	findProjectById,
 	findServerById,
+	getAccessibleServerIds,
 	getComposeContainer,
+	getContainerLogs,
 	getWebServerSettings,
 	IS_CLOUD,
 	loadServices,
@@ -30,7 +32,6 @@ import {
 	stopCompose,
 	updateCompose,
 	updateDeploymentStatus,
-	getAccessibleServerIds,
 } from "@dokploy/server";
 import { db } from "@dokploy/server/db";
 import {
@@ -1130,4 +1131,44 @@ export const composeRouter = createTRPCRouter({
 				total: countResult[0]?.count ?? 0,
 			};
 		}),
+
+	readLogs: protectedProcedure
+		.input(
+			apiFindCompose.extend({
+				containerId: z
+					.string()
+					.min(1)
+					.regex(/^[a-zA-Z0-9.\-_]+$/, "Invalid container id."),
+				tail: z.number().int().min(1).max(10000).default(100),
+				since: z
+					.string()
+					.regex(/^(all|\d+[smhd])$/, "Invalid since format")
+					.default("all"),
+				search: z
+					.string()
+					.regex(/^[a-zA-Z0-9 ._-]{0,500}$/)
+					.optional(),
+			}),
+		)
+		.query(async ({ input, ctx }) => {
+			await checkServiceAccess(ctx, input.composeId, "read");
+			const compose = await findComposeById(input.composeId);
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
+				throw new TRPCError({
+					code: "UNAUTHORIZED",
+					message: "You are not authorized to access this compose",
+				});
+			}
+			return await getContainerLogs(
+				input.containerId,
+				input.tail,
+				input.since,
+				input.search,
+				compose.serverId,
+				true,
+			);
+		}),
 });

apps/dokploy/server/api/routers/libsql.ts

@@ -6,6 +6,7 @@ import {
 	findEnvironmentById,
 	findLibsqlById,
 	findProjectById,
+	getContainerLogs,
 	IS_CLOUD,
 	rebuildDatabase,
 	removeLibsqlById,
@@ -466,4 +467,39 @@ export const libsqlRouter = createTRPCRouter({
 			});
 			return true;
 		}),
+
+	readLogs: protectedProcedure
+		.input(
+			apiFindOneLibsql.extend({
+				tail: z.number().int().min(1).max(10000).default(100),
+				since: z
+					.string()
+					.regex(/^(all|\d+[smhd])$/, "Invalid since format")
+					.default("all"),
+				search: z
+					.string()
+					.regex(/^[a-zA-Z0-9 ._-]{0,500}$/)
+					.optional(),
+			}),
+		)
+		.query(async ({ input, ctx }) => {
+			await checkServiceAccess(ctx, input.libsqlId, "read");
+			const libsql = await findLibsqlById(input.libsqlId);
+			if (
+				libsql.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
+				throw new TRPCError({
+					code: "UNAUTHORIZED",
+					message: "You are not authorized to access this LibSQL",
+				});
+			}
+			return await getContainerLogs(
+				libsql.appName,
+				input.tail,
+				input.since,
+				input.search,
+				libsql.serverId,
+			);
+		}),
 });

apps/dokploy/server/api/routers/mariadb.ts

@@ -9,6 +9,8 @@ import {
 	findEnvironmentById,
 	findMariadbById,
 	findProjectById,
+	getAccessibleServerIds,
+	getContainerLogs,
 	getServiceContainerCommand,
 	IS_CLOUD,
 	rebuildDatabase,
@@ -19,7 +21,6 @@ import {
 	stopService,
 	stopServiceRemote,
 	updateMariadbById,
-	getAccessibleServerIds,
 } from "@dokploy/server";
 import { db } from "@dokploy/server/db";
 import {
@@ -590,4 +591,39 @@ export const mariadbRouter = createTRPCRouter({
 			]);
 			return { items, total: countResult[0]?.count ?? 0 };
 		}),
+
+	readLogs: protectedProcedure
+		.input(
+			apiFindOneMariaDB.extend({
+				tail: z.number().int().min(1).max(10000).default(100),
+				since: z
+					.string()
+					.regex(/^(all|\d+[smhd])$/, "Invalid since format")
+					.default("all"),
+				search: z
+					.string()
+					.regex(/^[a-zA-Z0-9 ._-]{0,500}$/)
+					.optional(),
+			}),
+		)
+		.query(async ({ input, ctx }) => {
+			await checkServiceAccess(ctx, input.mariadbId, "read");
+			const mariadb = await findMariadbById(input.mariadbId);
+			if (
+				mariadb.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
+				throw new TRPCError({
+					code: "UNAUTHORIZED",
+					message: "You are not authorized to access this MariaDB",
+				});
+			}
+			return await getContainerLogs(
+				mariadb.appName,
+				input.tail,
+				input.since,
+				input.search,
+				mariadb.serverId,
+			);
+		}),
 });

apps/dokploy/server/api/routers/mongo.ts

@@ -10,6 +10,7 @@ import {
 	findMongoById,
 	findProjectById,
 	getAccessibleServerIds,
+	getContainerLogs,
 	getServiceContainerCommand,
 	IS_CLOUD,
 	rebuildDatabase,
@@ -601,4 +602,39 @@ export const mongoRouter = createTRPCRouter({
 			]);
 			return { items, total: countResult[0]?.count ?? 0 };
 		}),
+
+	readLogs: protectedProcedure
+		.input(
+			apiFindOneMongo.extend({
+				tail: z.number().int().min(1).max(10000).default(100),
+				since: z
+					.string()
+					.regex(/^(all|\d+[smhd])$/, "Invalid since format")
+					.default("all"),
+				search: z
+					.string()
+					.regex(/^[a-zA-Z0-9 ._-]{0,500}$/)
+					.optional(),
+			}),
+		)
+		.query(async ({ input, ctx }) => {
+			await checkServiceAccess(ctx, input.mongoId, "read");
+			const mongo = await findMongoById(input.mongoId);
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
+				throw new TRPCError({
+					code: "UNAUTHORIZED",
+					message: "You are not authorized to access this MongoDB",
+				});
+			}
+			return await getContainerLogs(
+				mongo.appName,
+				input.tail,
+				input.since,
+				input.search,
+				mongo.serverId,
+			);
+		}),
 });

apps/dokploy/server/api/routers/mysql.ts

@@ -9,6 +9,7 @@ import {
 	findEnvironmentById,
 	findMySqlById,
 	findProjectById,
+	getContainerLogs,
 	getServiceContainerCommand,
 	IS_CLOUD,
 	rebuildDatabase,
@@ -604,4 +605,39 @@ export const mysqlRouter = createTRPCRouter({
 			]);
 			return { items, total: countResult[0]?.count ?? 0 };
 		}),
+
+	readLogs: protectedProcedure
+		.input(
+			apiFindOneMySql.extend({
+				tail: z.number().int().min(1).max(10000).default(100),
+				since: z
+					.string()
+					.regex(/^(all|\d+[smhd])$/, "Invalid since format")
+					.default("all"),
+				search: z
+					.string()
+					.regex(/^[a-zA-Z0-9 ._-]{0,500}$/)
+					.optional(),
+			}),
+		)
+		.query(async ({ input, ctx }) => {
+			await checkServiceAccess(ctx, input.mysqlId, "read");
+			const mysql = await findMySqlById(input.mysqlId);
+			if (
+				mysql.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
+				throw new TRPCError({
+					code: "UNAUTHORIZED",
+					message: "You are not authorized to access this MySQL",
+				});
+			}
+			return await getContainerLogs(
+				mysql.appName,
+				input.tail,
+				input.since,
+				input.search,
+				mysql.serverId,
+			);
+		}),
 });

apps/dokploy/server/api/routers/network.ts

@@ -0,0 +1,71 @@
+import {
+	createNetwork,
+	findNetworkById,
+	removeNetwork,
+	updateNetwork,
+} from "@dokploy/server";
+import { TRPCError } from "@trpc/server";
+import { desc, eq } from "drizzle-orm";
+import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
+import { db } from "@/server/db";
+import {
+	apiCreateNetwork,
+	apiFindOneNetwork,
+	apiRemoveNetwork,
+	apiUpdateNetwork,
+	network as networkTable,
+} from "@/server/db/schema";
+
+export const networkRouter = createTRPCRouter({
+	all: protectedProcedure.query(async ({ ctx }) => {
+		const rows = await db
+			.select()
+			.from(networkTable)
+			.where(eq(networkTable.organizationId, ctx.session.activeOrganizationId))
+			.orderBy(desc(networkTable.createdAt));
+		return rows;
+	}),
+
+	one: protectedProcedure
+		.input(apiFindOneNetwork)
+		.query(async ({ ctx, input }) => {
+			const row = await findNetworkById(input.networkId);
+			if (row.organizationId !== ctx.session.activeOrganizationId) {
+				throw new TRPCError({
+					code: "NOT_FOUND",
+					message: "Network not found",
+				});
+			}
+			return row;
+		}),
+	create: protectedProcedure
+		.input(apiCreateNetwork)
+		.mutation(async ({ ctx, input }) => {
+			return createNetwork(input, ctx.session.activeOrganizationId);
+		}),
+	update: protectedProcedure
+		.input(apiUpdateNetwork)
+		.mutation(async ({ ctx, input }) => {
+			const network = await findNetworkById(input.networkId);
+			if (network.organizationId !== ctx.session.activeOrganizationId) {
+				throw new TRPCError({
+					code: "UNAUTHORIZED",
+					message: "Not authorized to update this network",
+				});
+			}
+			return updateNetwork(input);
+		}),
+
+	remove: protectedProcedure
+		.input(apiRemoveNetwork)
+		.mutation(async ({ ctx, input }) => {
+			const network = await findNetworkById(input.networkId);
+			if (network.organizationId !== ctx.session.activeOrganizationId) {
+				throw new TRPCError({
+					code: "UNAUTHORIZED",
+					message: "Not authorized to delete this network",
+				});
+			}
+			return removeNetwork(input.networkId);
+		}),
+});

apps/dokploy/server/api/routers/postgres.ts

@@ -9,6 +9,7 @@ import {
 	findEnvironmentById,
 	findPostgresById,
 	findProjectById,
+	getContainerLogs,
 	getMountPath,
 	getServiceContainerCommand,
 	IS_CLOUD,
@@ -614,4 +615,39 @@ export const postgresRouter = createTRPCRouter({
 			]);
 			return { items, total: countResult[0]?.count ?? 0 };
 		}),
+
+	readLogs: protectedProcedure
+		.input(
+			apiFindOnePostgres.extend({
+				tail: z.number().int().min(1).max(10000).default(100),
+				since: z
+					.string()
+					.regex(/^(all|\d+[smhd])$/, "Invalid since format")
+					.default("all"),
+				search: z
+					.string()
+					.regex(/^[a-zA-Z0-9 ._-]{0,500}$/)
+					.optional(),
+			}),
+		)
+		.query(async ({ input, ctx }) => {
+			await checkServiceAccess(ctx, input.postgresId, "read");
+			const postgres = await findPostgresById(input.postgresId);
+			if (
+				postgres.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
+				throw new TRPCError({
+					code: "UNAUTHORIZED",
+					message: "You are not authorized to access this Postgres",
+				});
+			}
+			return await getContainerLogs(
+				postgres.appName,
+				input.tail,
+				input.since,
+				input.search,
+				postgres.serverId,
+			);
+		}),
 });

apps/dokploy/server/api/routers/redis.ts

@@ -8,6 +8,7 @@ import {
 	findEnvironmentById,
 	findProjectById,
 	findRedisById,
+	getContainerLogs,
 	getServiceContainerCommand,
 	IS_CLOUD,
 	rebuildDatabase,
@@ -587,4 +588,39 @@ export const redisRouter = createTRPCRouter({
 			]);
 			return { items, total: countResult[0]?.count ?? 0 };
 		}),
+
+	readLogs: protectedProcedure
+		.input(
+			apiFindOneRedis.extend({
+				tail: z.number().int().min(1).max(10000).default(100),
+				since: z
+					.string()
+					.regex(/^(all|\d+[smhd])$/, "Invalid since format")
+					.default("all"),
+				search: z
+					.string()
+					.regex(/^[a-zA-Z0-9 ._-]{0,500}$/)
+					.optional(),
+			}),
+		)
+		.query(async ({ input, ctx }) => {
+			await checkServiceAccess(ctx, input.redisId, "read");
+			const redis = await findRedisById(input.redisId);
+			if (
+				redis.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
+				throw new TRPCError({
+					code: "UNAUTHORIZED",
+					message: "You are not authorized to access this Redis",
+				});
+			}
+			return await getContainerLogs(
+				redis.appName,
+				input.tail,
+				input.since,
+				input.search,
+				redis.serverId,
+			);
+		}),
 });

apps/dokploy/server/api/routers/ssh-key.ts

@@ -8,7 +8,11 @@ import {
 import { db } from "@dokploy/server/db";
 import { TRPCError } from "@trpc/server";
 import { desc, eq } from "drizzle-orm";
-import { createTRPCRouter, withPermission } from "@/server/api/trpc";
+import {
+	createTRPCRouter,
+	protectedProcedure,
+	withPermission,
+} from "@/server/api/trpc";
 import { audit } from "@/server/api/utils/audit";
 import {
 	apiCreateSshKey,
@@ -83,6 +87,16 @@ export const sshRouter = createTRPCRouter({
 			orderBy: desc(sshKeys.createdAt),
 		});
 	}),
+	allForApps: protectedProcedure.query(async ({ ctx }) => {
+		return await db.query.sshKeys.findMany({
+			columns: {
+				sshKeyId: true,
+				name: true,
+			},
+			where: eq(sshKeys.organizationId, ctx.session.activeOrganizationId),
+			orderBy: desc(sshKeys.createdAt),
+		});
+	}),
 	generate: withPermission("sshKeys", "read")
 		.input(apiGenerateSSHKey)
 		.mutation(async ({ input }) => {

apps/dokploy/server/api/routers/stripe.ts

@@ -205,11 +205,16 @@ export const stripeRouter = createTRPCRouter({
 				mode: "subscription",
 				line_items: items,
 				...(stripeCustomerId
-					? { customer: stripeCustomerId }
+					? {
+							customer: stripeCustomerId,
+							customer_update: { name: "auto", address: "auto" },
+						}
 					: { customer_email: owner.email }),
 				metadata: {
 					adminId: owner.id,
 				},
+				billing_address_collection: "required",
+				tax_id_collection: { enabled: true },
 				allow_promotion_codes: true,
 				success_url: `${WEBSITE_URL}/dashboard/settings/servers?success=true`,
 				cancel_url: `${WEBSITE_URL}/dashboard/settings/billing`,
@@ -332,6 +337,22 @@ export const stripeRouter = createTRPCRouter({
 		},
 	),
 
+	updateInvoiceNotifications: adminProcedure
+		.input(z.object({ enabled: z.boolean() }))
+		.mutation(async ({ ctx, input }) => {
+			if (!IS_CLOUD) {
+				throw new TRPCError({
+					code: "BAD_REQUEST",
+					message: "This feature is only available in Dokploy Cloud",
+				});
+			}
+			const owner = await findUserById(ctx.user.ownerId);
+			await updateUser(owner.id, {
+				sendInvoiceNotifications: input.enabled,
+			});
+			return { ok: true };
+		}),
+
 	getInvoices: adminProcedure.query(async ({ ctx }) => {
 		const user = await findUserById(ctx.user.ownerId);
 		const stripeCustomerId = user.stripeCustomerId;

apps/dokploy/server/server.ts

@@ -56,6 +56,8 @@ void app.prepare().then(async () => {
 			setupDockerStatsMonitoringSocketServer(server);
 		}
 
+		server.listen(PORT, HOST);
+		console.log(`Server Started on: http://${HOST}:${PORT}`);
 		if (process.env.NODE_ENV === "production" && !IS_CLOUD) {
 			createDefaultMiddlewares();
 			await initializeNetwork();
@@ -65,9 +67,6 @@ void app.prepare().then(async () => {
 			await initVolumeBackupsCronJobs();
 			await sendDokployRestartNotifications();
 		}
-
-		server.listen(PORT, HOST);
-		console.log(`Server Started on: http://${HOST}:${PORT}`);
 		await initEnterpriseBackupCronJobs();
 
 		if (!IS_CLOUD) {

apps/dokploy/server/utils/stripe-notifications.ts

@@ -0,0 +1,113 @@
+import InvoiceNotificationEmail from "@dokploy/server/emails/emails/invoice-notification";
+import PaymentFailedEmail from "@dokploy/server/emails/emails/payment-failed";
+import { sendEmail } from "@dokploy/server/verification/send-verification-email";
+import { renderAsync } from "@react-email/components";
+import { format } from "date-fns";
+import type Stripe from "stripe";
+
+function formatAmount(amountInCents: number, currency: string): string {
+	const amount = amountInCents / 100;
+	const formatter = new Intl.NumberFormat("en-US", {
+		style: "currency",
+		currency: currency.toUpperCase(),
+	});
+	return formatter.format(amount);
+}
+
+const downloadPdf = async (url: string): Promise<Buffer | null> => {
+	try {
+		const response = await fetch(url);
+		if (!response.ok) return null;
+		const arrayBuffer = await response.arrayBuffer();
+		return Buffer.from(arrayBuffer);
+	} catch {
+		return null;
+	}
+};
+
+export const sendInvoiceEmail = async (
+	invoice: Stripe.Invoice,
+	admin: { email: string; firstName: string },
+) => {
+	if (!invoice.hosted_invoice_url) return;
+
+	try {
+		const amountFormatted = formatAmount(invoice.amount_paid, invoice.currency);
+
+		const htmlContent = await renderAsync(
+			InvoiceNotificationEmail({
+				userName: admin.firstName || "User",
+				invoiceNumber: invoice.number || invoice.id,
+				amountPaid: amountFormatted,
+				currency: invoice.currency,
+				date: format(new Date(invoice.created * 1000), "MMM dd, yyyy"),
+				hostedInvoiceUrl: invoice.hosted_invoice_url,
+			}),
+		);
+
+		const attachments: { filename: string; content: Buffer }[] = [];
+
+		if (invoice.invoice_pdf) {
+			const pdfBuffer = await downloadPdf(invoice.invoice_pdf);
+			if (pdfBuffer) {
+				attachments.push({
+					filename: `dokploy-invoice-${invoice.number || invoice.id}.pdf`,
+					content: pdfBuffer,
+				});
+			}
+		}
+
+		await sendEmail({
+			email: admin.email,
+			subject: `Dokploy Invoice ${invoice.number || ""} - ${amountFormatted}`,
+			text: htmlContent,
+			attachments,
+		});
+
+		console.log(
+			`Invoice email sent to ${admin.email} for invoice ${invoice.number}`,
+		);
+	} catch (error) {
+		console.error(
+			`Failed to send invoice email to ${admin.email}:`,
+			error instanceof Error ? error.message : error,
+		);
+	}
+};
+
+export const sendPaymentFailedEmail = async (
+	invoice: Stripe.Invoice,
+	admin: { email: string; firstName: string },
+) => {
+	if (!invoice.hosted_invoice_url) return;
+
+	try {
+		const amountFormatted = formatAmount(invoice.amount_due, invoice.currency);
+
+		const htmlContent = await renderAsync(
+			PaymentFailedEmail({
+				userName: admin.firstName || "User",
+				invoiceNumber: invoice.number || invoice.id,
+				amountDue: amountFormatted,
+				currency: invoice.currency,
+				date: format(new Date(invoice.created * 1000), "MMM dd, yyyy"),
+				hostedInvoiceUrl: invoice.hosted_invoice_url,
+			}),
+		);
+
+		await sendEmail({
+			email: admin.email,
+			subject: `Action required: Dokploy payment failed - ${amountFormatted}`,
+			text: htmlContent,
+		});
+
+		console.log(
+			`Payment failed email sent to ${admin.email} for invoice ${invoice.number}`,
+		);
+	} catch (error) {
+		console.error(
+			`Failed to send payment failed email to ${admin.email}:`,
+			error instanceof Error ? error.message : error,
+		);
+	}
+};

apps/schedules/src/index.ts

@@ -33,7 +33,7 @@ app.use(async (c, next) => {
 
 app.post("/create-backup", zValidator("json", jobQueueSchema), async (c) => {
 	const data = c.req.valid("json");
-	scheduleJob(data);
+	await scheduleJob(data);
 	logger.info({ data }, `[${data.type}]  created successfully`);
 	return c.json({ message: `[${data.type}]  created successfully` });
 });
@@ -70,7 +70,7 @@ app.post("/update-backup", zValidator("json", jobQueueSchema), async (c) => {
 		}
 		logger.info({ result }, "Job removed");
 	}
-	scheduleJob(data);
+	await scheduleJob(data);
 	logger.info("Backup updated successfully");
 
 	return c.json({ message: "Backup updated successfully" });
@@ -103,8 +103,11 @@ process.on("uncaughtException", (err) => {
 	logger.error(err, "Uncaught exception");
 });
 
-process.on("unhandledRejection", (reason, promise) => {
-	logger.error({ promise, reason }, "Unhandled Rejection at: Promise");
+process.on("unhandledRejection", (reason, _promise) => {
+	logger.error(
+		reason instanceof Error ? reason : { reason: String(reason) },
+		"Unhandled Rejection at: Promise",
+	);
 });
 
 const port = Number.parseInt(process.env.PORT || "3000");

apps/schedules/src/queue.ts

@@ -21,28 +21,28 @@ export const cleanQueue = async () => {
 	}
 };
 
-export const scheduleJob = (job: QueueJob) => {
+export const scheduleJob = async (job: QueueJob) => {
 	if (job.type === "backup") {
-		jobQueue.add(job.backupId, job, {
+		await jobQueue.add(job.backupId, job, {
 			repeat: {
 				pattern: job.cronSchedule,
 			},
 		});
 	} else if (job.type === "server") {
-		jobQueue.add(`${job.serverId}-cleanup`, job, {
+		await jobQueue.add(`${job.serverId}-cleanup`, job, {
 			repeat: {
 				pattern: job.cronSchedule,
 			},
 		});
 	} else if (job.type === "schedule") {
-		jobQueue.add(job.scheduleId, job, {
+		await jobQueue.add(job.scheduleId, job, {
 			repeat: {
 				pattern: job.cronSchedule,
 				tz: job.timezone || "UTC",
 			},
 		});
 	} else if (job.type === "volume-backup") {
-		jobQueue.add(job.volumeBackupId, job, {
+		await jobQueue.add(job.volumeBackupId, job, {
 			repeat: {
 				pattern: job.cronSchedule,
 			},

apps/schedules/src/utils.ts

@@ -135,11 +135,18 @@ export const initializeJobs = async () => {
 
 	for (const server of servers) {
 		const { serverId } = server;
-		scheduleJob({
-			serverId,
-			type: "server",
-			cronSchedule: CLEANUP_CRON_JOB,
-		});
+		try {
+			await scheduleJob({
+				serverId,
+				type: "server",
+				cronSchedule: CLEANUP_CRON_JOB,
+			});
+		} catch (error) {
+			logger.error(
+				error,
+				`Failed to schedule cleanup job for server ${serverId}`,
+			);
+		}
 	}
 
 	logger.info({ Quantity: servers.length }, "Active Servers Initialized");
@@ -157,11 +164,15 @@ export const initializeJobs = async () => {
 	});
 
 	for (const backup of backupsResult) {
-		scheduleJob({
-			backupId: backup.backupId,
-			type: "backup",
-			cronSchedule: backup.schedule,
-		});
+		try {
+			await scheduleJob({
+				backupId: backup.backupId,
+				type: "backup",
+				cronSchedule: backup.schedule,
+			});
+		} catch (error) {
+			logger.error(error, `Failed to schedule backup ${backup.backupId}`);
+		}
 	}
 	logger.info({ Quantity: backupsResult.length }, "Backups Initialized");
 
@@ -197,11 +208,15 @@ export const initializeJobs = async () => {
 	);
 
 	for (const schedule of filteredSchedulesBasedOnServerStatus) {
-		scheduleJob({
-			scheduleId: schedule.scheduleId,
-			type: "schedule",
-			cronSchedule: schedule.cronExpression,
-		});
+		try {
+			await scheduleJob({
+				scheduleId: schedule.scheduleId,
+				type: "schedule",
+				cronSchedule: schedule.cronExpression,
+			});
+		} catch (error) {
+			logger.error(error, `Failed to schedule ${schedule.scheduleId}`);
+		}
 	}
 	logger.info(
 		{ Quantity: filteredSchedulesBasedOnServerStatus.length },
@@ -236,11 +251,18 @@ export const initializeJobs = async () => {
 	);
 
 	for (const volumeBackup of filteredVolumeBackupsBasedOnServerStatus) {
-		scheduleJob({
-			volumeBackupId: volumeBackup.volumeBackupId,
-			type: "volume-backup",
-			cronSchedule: volumeBackup.cronExpression,
-		});
+		try {
+			await scheduleJob({
+				volumeBackupId: volumeBackup.volumeBackupId,
+				type: "volume-backup",
+				cronSchedule: volumeBackup.cronExpression,
+			});
+		} catch (error) {
+			logger.error(
+				error,
+				`Failed to schedule volume backup ${volumeBackup.volumeBackupId}`,
+			);
+		}
 	}
 
 	logger.info(

packages/server/src/db/schema/account.ts

@@ -8,6 +8,7 @@ import {
 	timestamp,
 } from "drizzle-orm/pg-core";
 import { nanoid } from "nanoid";
+import { network } from "./network";
 import { projects } from "./project";
 import { server } from "./server";
 import { ssoProvider } from "./sso";
@@ -108,6 +109,7 @@ export const organizationRelations = relations(
 			references: [user.id],
 		}),
 		servers: many(server),
+		networks: many(network),
 		projects: many(projects),
 		members: many(member),
 		ssoProviders: many(ssoProvider),

packages/server/src/db/schema/application.ts

@@ -227,6 +227,7 @@ export const applications = pgTable("application", {
 			onDelete: "set null",
 		},
 	),
+	networkIds: text("networkIds").array().default([]),
 });
 
 export const applicationsRelations = relations(
@@ -368,6 +369,7 @@ const createSchema = createInsertSchema(applications, {
 	previewRequireCollaboratorPermissions: z.boolean().optional(),
 	watchPaths: z.array(z.string()).optional().optional(),
 	previewLabels: z.array(z.string()).optional(),
+	networkIds: z.array(z.string()).optional(),
 	cleanCache: z.boolean().optional(),
 	stopGracePeriodSwarm: z.number().nullable(),
 	endpointSpecSwarm: EndpointSpecSwarmSchema.nullable(),

packages/server/src/db/schema/compose.ts

@@ -108,6 +108,7 @@ export const compose = pgTable("compose", {
 	serverId: text("serverId").references(() => server.serverId, {
 		onDelete: "cascade",
 	}),
+	networkIds: text("networkIds").array().default([]),
 });
 
 export const composeRelations = relations(compose, ({ one, many }) => ({

packages/server/src/db/schema/index.ts

@@ -18,6 +18,7 @@ export * from "./libsql";
 export * from "./mariadb";
 export * from "./mongo";
 export * from "./mount";
+export * from "./network";
 export * from "./mysql";
 export * from "./notification";
 export * from "./patch";

packages/server/src/db/schema/mariadb.ts

@@ -87,6 +87,7 @@ export const mariadb = pgTable("mariadb", {
 	serverId: text("serverId").references(() => server.serverId, {
 		onDelete: "cascade",
 	}),
+	networkIds: text("networkIds").array().default([]),
 });
 
 export const mariadbRelations = relations(mariadb, ({ one, many }) => ({

packages/server/src/db/schema/mongo.ts

@@ -91,6 +91,7 @@ export const mongo = pgTable("mongo", {
 		onDelete: "cascade",
 	}),
 	replicaSets: boolean("replicaSets").default(false),
+	networkIds: text("networkIds").array().default([]),
 });
 
 export const mongoRelations = relations(mongo, ({ one, many }) => ({

packages/server/src/db/schema/mysql.ts

@@ -85,6 +85,7 @@ export const mysql = pgTable("mysql", {
 	serverId: text("serverId").references(() => server.serverId, {
 		onDelete: "cascade",
 	}),
+	networkIds: text("networkIds").array().default([]),
 });
 
 export const mysqlRelations = relations(mysql, ({ one, many }) => ({

packages/server/src/db/schema/network.ts

@@ -0,0 +1,137 @@
+import { relations } from "drizzle-orm";
+import { boolean, jsonb, pgEnum, pgTable, text } from "drizzle-orm/pg-core";
+import { createInsertSchema } from "drizzle-zod";
+import { nanoid } from "nanoid";
+import { z } from "zod";
+import { organization } from "./account";
+import { server } from "./server";
+
+/** Docker network driver types */
+export const networkDriver = pgEnum("networkDriver", [
+	"bridge",
+	"host",
+	"overlay",
+	"macvlan",
+	"none",
+	"ipvlan",
+]);
+
+export const network = pgTable("network", {
+	networkId: text("networkId")
+		.notNull()
+		.primaryKey()
+		.$defaultFn(() => nanoid()),
+	name: text("name").notNull(),
+	driver: networkDriver("driver").notNull().default("bridge"),
+	scope: text("scope"), // e.g. "local", "swarm"
+	internal: boolean("internal").notNull().default(false),
+	attachable: boolean("attachable").notNull().default(false),
+	ingress: boolean("ingress").notNull().default(false),
+	configOnly: boolean("configOnly").notNull().default(false),
+	enableIPv4: boolean("enableIPv4").notNull().default(true),
+	enableIPv6: boolean("enableIPv6").notNull().default(false),
+	ipam: jsonb("ipam")
+		.$type<{
+			driver?: string;
+			config?: Array<{ subnet?: string; gateway?: string; ipRange?: string }>;
+		}>()
+		.default({}),
+	createdAt: text("createdAt")
+		.notNull()
+		.$defaultFn(() => new Date().toISOString()),
+	organizationId: text("organizationId")
+		.notNull()
+		.references(() => organization.id, { onDelete: "cascade" }),
+	serverId: text("serverId").references(() => server.serverId, {
+		onDelete: "cascade",
+	}),
+});
+
+export const networkRelations = relations(network, ({ one }) => ({
+	organization: one(organization, {
+		fields: [network.organizationId],
+		references: [organization.id],
+	}),
+	server: one(server, {
+		fields: [network.serverId],
+		references: [server.serverId],
+	}),
+}));
+
+const createSchema = createInsertSchema(network, {
+	networkId: z.string().min(1),
+	name: z.string().min(1),
+	driver: z
+		.enum(["bridge", "host", "overlay", "macvlan", "none", "ipvlan"])
+		.optional(),
+	scope: z.string().optional(),
+	internal: z.boolean().optional(),
+	attachable: z.boolean().optional(),
+	ingress: z.boolean().optional(),
+	configOnly: z.boolean().optional(),
+	enableIPv4: z.boolean().optional(),
+	enableIPv6: z.boolean().optional(),
+	ipam: z
+		.object({
+			driver: z.string().optional(),
+			config: z
+				.array(
+					z.object({
+						subnet: z.string().optional(),
+						gateway: z.string().optional(),
+						ipRange: z.string().optional(),
+					}),
+				)
+				.optional(),
+		})
+		.optional(),
+	organizationId: z.string().min(1),
+	serverId: z.string().optional().nullable(),
+});
+
+export const apiCreateNetwork = createSchema
+	.pick({
+		name: true,
+		driver: true,
+		scope: true,
+		internal: true,
+		attachable: true,
+		ingress: true,
+		configOnly: true,
+		enableIPv4: true,
+		enableIPv6: true,
+		ipam: true,
+		serverId: true,
+	})
+	.partial()
+	.required({ name: true });
+
+export const apiFindOneNetwork = createSchema
+	.pick({
+		networkId: true,
+	})
+	.required();
+
+export const apiRemoveNetwork = createSchema
+	.pick({
+		networkId: true,
+	})
+	.required();
+
+export const apiUpdateNetwork = createSchema
+	.pick({
+		networkId: true,
+		name: true,
+		driver: true,
+		scope: true,
+		internal: true,
+		attachable: true,
+		ingress: true,
+		configOnly: true,
+		enableIPv4: true,
+		enableIPv6: true,
+		ipam: true,
+		serverId: true,
+	})
+	.partial()
+	.required({ networkId: true });

packages/server/src/db/schema/postgres.ts

@@ -85,6 +85,7 @@ export const postgres = pgTable("postgres", {
 	serverId: text("serverId").references(() => server.serverId, {
 		onDelete: "cascade",
 	}),
+	networkIds: text("networkIds").array().default([]),
 });
 
 export const postgresRelations = relations(postgres, ({ one, many }) => ({

packages/server/src/db/schema/redis.ts

@@ -75,6 +75,7 @@ export const redis = pgTable("redis", {
 	serverId: text("serverId").references(() => server.serverId, {
 		onDelete: "cascade",
 	}),
+	networkIds: text("networkIds").array().default([]),
 });
 
 export const redisRelations = relations(redis, ({ one, many }) => ({

packages/server/src/db/schema/server.ts

@@ -19,6 +19,7 @@ import { libsql } from "./libsql";
 import { mariadb } from "./mariadb";
 import { mongo } from "./mongo";
 import { mysql } from "./mysql";
+import { network } from "./network";
 import { postgres } from "./postgres";
 import { redis } from "./redis";
 import { schedules } from "./schedule";
@@ -124,6 +125,7 @@ export const serverRelations = relations(server, ({ one, many }) => ({
 	mysql: many(mysql),
 	postgres: many(postgres),
 	certificates: many(certificates),
+	networks: many(network),
 	organization: one(organization, {
 		fields: [server.organizationId],
 		references: [organization.id],

packages/server/src/db/schema/user.ts

@@ -65,6 +65,9 @@ export const user = pgTable("user", {
 	stripeCustomerId: text("stripeCustomerId"),
 	stripeSubscriptionId: text("stripeSubscriptionId"),
 	serversQuantity: integer("serversQuantity").notNull().default(0),
+	sendInvoiceNotifications: boolean("sendInvoiceNotifications")
+		.notNull()
+		.default(false),
 	isEnterpriseCloud: boolean("isEnterpriseCloud").notNull().default(false),
 	trustedOrigins: text("trustedOrigins").array(),
 	bookmarkedTemplates: text("bookmarkedTemplates")

packages/server/src/emails/emails/invoice-notification.tsx

@@ -0,0 +1,171 @@
+import {
+	Body,
+	Button,
+	Column,
+	Container,
+	Head,
+	Heading,
+	Hr,
+	Html,
+	Img,
+	Link,
+	Preview,
+	Row,
+	Section,
+	Tailwind,
+	Text,
+} from "@react-email/components";
+
+export type TemplateProps = {
+	userName: string;
+	invoiceNumber: string;
+	amountPaid: string;
+	currency: string;
+	date: string;
+	hostedInvoiceUrl: string;
+};
+
+export const InvoiceNotificationEmail = ({
+	userName = "User",
+	invoiceNumber = "INV-0001",
+	amountPaid = "$4.50",
+	currency = "usd",
+	date = "2024-01-01",
+	hostedInvoiceUrl = "https://invoice.stripe.com/example",
+}: TemplateProps) => {
+	const previewText = `Your Dokploy invoice ${invoiceNumber} for ${amountPaid} is ready`;
+	return (
+		<Html>
+			<Head />
+			<Preview>{previewText}</Preview>
+			<Tailwind
+				config={{
+					theme: {
+						extend: {
+							colors: {
+								brand: "#007291",
+							},
+						},
+					},
+				}}
+			>
+				<Body className="bg-[#f4f4f5] my-auto mx-auto font-sans">
+					<Container className="my-[40px] mx-auto max-w-[520px]">
+						{/* Header */}
+						<Section className="bg-[#09090b] rounded-t-xl px-[40px] py-[32px] text-center">
+							<Img
+								src="https://raw.githubusercontent.com/Dokploy/website/refs/heads/main/apps/docs/public/logo-dokploy-blackpng.png"
+								width="190"
+								height="120"
+								alt="Dokploy"
+								className="my-0 mx-auto"
+							/>
+						</Section>
+
+						{/* Body */}
+						<Section className="bg-white px-[40px] py-[32px]">
+							<Heading className="text-[#09090b] text-[22px] font-semibold m-0 mb-[8px]">
+								Invoice Payment Confirmed
+							</Heading>
+							<Text className="text-[#71717a] text-[14px] leading-[22px] m-0 mb-[24px]">
+								Hello {userName}, thank you for your payment. Here's a summary
+								of your invoice.
+							</Text>
+
+							{/* Invoice Details Card */}
+							<Section className="border border-solid border-[#e4e4e7] rounded-lg overflow-hidden mb-[24px]">
+								<Row className="bg-[#fafafa]">
+									<Column className="px-[20px] py-[14px] w-[50%]">
+										<Text className="text-[#71717a] text-[12px] font-medium uppercase tracking-wider m-0">
+											Invoice No.
+										</Text>
+										<Text className="text-[#09090b] text-[14px] font-semibold m-0 mt-[4px]">
+											{invoiceNumber}
+										</Text>
+									</Column>
+									<Column className="px-[20px] py-[14px] w-[50%]">
+										<Text className="text-[#71717a] text-[12px] font-medium uppercase tracking-wider m-0">
+											Date
+										</Text>
+										<Text className="text-[#09090b] text-[14px] font-semibold m-0 mt-[4px]">
+											{date}
+										</Text>
+									</Column>
+								</Row>
+								<Hr className="border-[#e4e4e7] m-0" />
+								<Row>
+									<Column className="px-[20px] py-[14px]">
+										<Text className="text-[#71717a] text-[12px] font-medium uppercase tracking-wider m-0">
+											Amount Paid
+										</Text>
+										<Text className="text-[#09090b] text-[20px] font-bold m-0 mt-[4px]">
+											{amountPaid}{" "}
+											<span className="text-[#71717a] text-[12px] font-normal uppercase">
+												{currency}
+											</span>
+										</Text>
+									</Column>
+								</Row>
+							</Section>
+
+							{/* Status Badge */}
+							<Section className="mb-[24px]">
+								<Row>
+									<Column>
+										<div
+											className="inline-block rounded-full bg-[#dcfce7] px-[12px] py-[6px]"
+											style={{ display: "inline-block" }}
+										>
+											<Text className="text-[#15803d] text-[12px] font-semibold m-0">
+												Payment Successful
+											</Text>
+										</div>
+									</Column>
+								</Row>
+							</Section>
+
+							{/* CTA Button */}
+							<Section className="text-center mb-[24px]">
+								<Button
+									href={hostedInvoiceUrl}
+									className="bg-[#09090b] rounded-lg text-white text-[14px] font-semibold no-underline text-center px-[24px] py-[12px]"
+								>
+									View Invoice Online
+								</Button>
+							</Section>
+
+							<Text className="text-[#a1a1aa] text-[13px] leading-[20px] m-0 text-center">
+								A PDF copy of this invoice is attached to this email for your
+								records.
+							</Text>
+						</Section>
+
+						{/* Footer */}
+						<Section className="bg-[#fafafa] rounded-b-xl px-[40px] py-[24px] text-center border-t border-solid border-[#e4e4e7]">
+							<Text className="text-[#a1a1aa] text-[12px] leading-[18px] m-0">
+								This is an automated email from{" "}
+								<Link
+									href="https://dokploy.com"
+									className="text-[#71717a] underline"
+								>
+									Dokploy Cloud
+								</Link>
+								. If you have any questions about your billing, please contact
+								our{" "}
+								<Link
+									href="https://discord.gg/2tBnJ3jDJc"
+									className="text-[#71717a] underline"
+								>
+									support team
+								</Link>
+								.
+							</Text>
+						</Section>
+					</Container>
+				</Body>
+			</Tailwind>
+		</Html>
+	);
+};
+
+export default InvoiceNotificationEmail;

packages/server/src/emails/emails/payment-failed.tsx

@@ -0,0 +1,175 @@
+import {
+	Body,
+	Button,
+	Column,
+	Container,
+	Head,
+	Heading,
+	Hr,
+	Html,
+	Img,
+	Link,
+	Preview,
+	Row,
+	Section,
+	Tailwind,
+	Text,
+} from "@react-email/components";
+
+export type TemplateProps = {
+	userName: string;
+	invoiceNumber: string;
+	amountDue: string;
+	currency: string;
+	date: string;
+	hostedInvoiceUrl: string;
+};
+
+export const PaymentFailedEmail = ({
+	userName = "User",
+	invoiceNumber = "INV-0001",
+	amountDue = "$4.50",
+	currency = "usd",
+	date = "2024-01-01",
+	hostedInvoiceUrl = "https://invoice.stripe.com/example",
+}: TemplateProps) => {
+	const previewText = `Action required: Your Dokploy payment for ${amountDue} failed`;
+	return (
+		<Html>
+			<Head />
+			<Preview>{previewText}</Preview>
+			<Tailwind
+				config={{
+					theme: {
+						extend: {
+							colors: {
+								brand: "#007291",
+							},
+						},
+					},
+				}}
+			>
+				<Body className="bg-[#f4f4f5] my-auto mx-auto font-sans">
+					<Container className="my-[40px] mx-auto max-w-[520px]">
+						{/* Header */}
+						<Section className="bg-[#09090b] rounded-t-xl px-[40px] py-[32px] text-center">
+							<Img
+								src="https://raw.githubusercontent.com/Dokploy/website/refs/heads/main/apps/docs/public/logo-dokploy-blackpng.png"
+								width="190"
+								height="120"
+								alt="Dokploy"
+								className="my-0 mx-auto"
+							/>
+						</Section>
+
+						{/* Body */}
+						<Section className="bg-white px-[40px] py-[32px]">
+							<Heading className="text-[#09090b] text-[22px] font-semibold m-0 mb-[8px]">
+								Payment Failed
+							</Heading>
+							<Text className="text-[#71717a] text-[14px] leading-[22px] m-0 mb-[24px]">
+								Hello {userName}, we were unable to process your payment. Please
+								update your payment method to avoid service interruption.
+							</Text>
+
+							{/* Invoice Details Card */}
+							<Section className="border border-solid border-[#e4e4e7] rounded-lg overflow-hidden mb-[24px]">
+								<Row className="bg-[#fafafa]">
+									<Column className="px-[20px] py-[14px] w-[50%]">
+										<Text className="text-[#71717a] text-[12px] font-medium uppercase tracking-wider m-0">
+											Invoice No.
+										</Text>
+										<Text className="text-[#09090b] text-[14px] font-semibold m-0 mt-[4px]">
+											{invoiceNumber}
+										</Text>
+									</Column>
+									<Column className="px-[20px] py-[14px] w-[50%]">
+										<Text className="text-[#71717a] text-[12px] font-medium uppercase tracking-wider m-0">
+											Date
+										</Text>
+										<Text className="text-[#09090b] text-[14px] font-semibold m-0 mt-[4px]">
+											{date}
+										</Text>
+									</Column>
+								</Row>
+								<Hr className="border-[#e4e4e7] m-0" />
+								<Row>
+									<Column className="px-[20px] py-[14px]">
+										<Text className="text-[#71717a] text-[12px] font-medium uppercase tracking-wider m-0">
+											Amount Due
+										</Text>
+										<Text className="text-[#09090b] text-[20px] font-bold m-0 mt-[4px]">
+											{amountDue}{" "}
+											<span className="text-[#71717a] text-[12px] font-normal uppercase">
+												{currency}
+											</span>
+										</Text>
+									</Column>
+								</Row>
+							</Section>
+
+							{/* Status Badge */}
+							<Section className="mb-[24px]">
+								<Row>
+									<Column>
+										<div
+											className="inline-block rounded-full bg-[#fee2e2] px-[12px] py-[6px]"
+											style={{ display: "inline-block" }}
+										>
+											<Text className="text-[#dc2626] text-[12px] font-semibold m-0">
+												Payment Failed
+											</Text>
+										</div>
+									</Column>
+								</Row>
+							</Section>
+
+							{/* Warning */}
+							<Section className="bg-[#fefce8] border border-solid border-[#fef08a] rounded-lg px-[20px] py-[16px] mb-[24px]">
+								<Text className="text-[#854d0e] text-[13px] leading-[20px] m-0">
+									If the payment issue is not resolved, your servers will be
+									deactivated. Please update your payment method as soon as
+									possible.
+								</Text>
+							</Section>
+
+							{/* CTA Button */}
+							<Section className="text-center mb-[24px]">
+								<Button
+									href={hostedInvoiceUrl}
+									className="bg-[#dc2626] rounded-lg text-white text-[14px] font-semibold no-underline text-center px-[24px] py-[12px]"
+								>
+									Update Payment Method
+								</Button>
+							</Section>
+						</Section>
+
+						{/* Footer */}
+						<Section className="bg-[#fafafa] rounded-b-xl px-[40px] py-[24px] text-center border-t border-solid border-[#e4e4e7]">
+							<Text className="text-[#a1a1aa] text-[12px] leading-[18px] m-0">
+								This is an automated email from{" "}
+								<Link
+									href="https://dokploy.com"
+									className="text-[#71717a] underline"
+								>
+									Dokploy Cloud
+								</Link>
+								. If you have any questions about your billing, please contact
+								our{" "}
+								<Link
+									href="https://discord.gg/2tBnJ3jDJc"
+									className="text-[#71717a] underline"
+								>
+									support team
+								</Link>
+								.
+							</Text>
+						</Section>
+					</Container>
+				</Body>
+			</Tailwind>
+		</Html>
+	);
+};
+
+export default PaymentFailedEmail;

packages/server/src/index.ts

@@ -28,6 +28,7 @@ export * from "./services/mariadb";
 export * from "./services/mongo";
 export * from "./services/mount";
 export * from "./services/mysql";
+export * from "./services/network";
 export * from "./services/notification";
 export * from "./services/patch";
 export * from "./services/patch-repo";

packages/server/src/services/ai.ts

@@ -108,22 +108,45 @@ export const suggestVariants = async ({
 			ip = "127.0.0.1";
 		}
 
-		const suggestionsSchema = z.object({
+		const fullSchema = z.object({
 			suggestions: z.array(
 				z.object({
 					id: z.string(),
 					name: z.string(),
 					shortDescription: z.string(),
 					description: z.string(),
+					dockerCompose: z.string(),
+					envVariables: z.array(
+						z.object({
+							name: z.string(),
+							value: z.string(),
+						}),
+					),
+					domains: z.array(
+						z.object({
+							host: z.string(),
+							port: z.number(),
+							serviceName: z.string(),
+						}),
+					),
+					configFiles: z
+						.array(
+							z.object({
+								content: z.string(),
+								filePath: z.string(),
+							}),
+						)
+						.optional(),
 				}),
 			),
 		});
-		const suggestionsResult = await generateText({
+
+		const result = await generateText({
 			model,
 			// @ts-ignore - Zod + AI SDK Output.object() causes excessively deep instantiation
-			output: Output.object({ schema: suggestionsSchema }),
+			output: Output.object({ schema: fullSchema }),
 			prompt: `
-		    Act as advanced DevOps engineer and analyze the user's request to determine the appropriate suggestions (up to 3 items).
+		    Act as advanced DevOps engineer. Analyze the user's request and generate up to 3 deployment suggestions, each with a complete docker compose configuration.
 
 		    CRITICAL - Read the user's request carefully and follow the appropriate strategy:
 
@@ -139,163 +162,94 @@ export const suggestVariants = async ({
 		    - Example: For "personal blog" → "WordPress", "Ghost", "Hugo with Nginx"
 		    - The name should be the actual project name
 
-		    Return your response as a JSON object with the following structure:
+		    Return your response as a JSON object with this structure:
 		    {
 		      "suggestions": [
 		        {
 		          "id": "project-or-variant-slug",
 		          "name": "Project Name or Variant Name",
 		          "shortDescription": "Brief one-line description",
-		          "description": "Detailed description"
+		          "description": "Detailed description of the project/variant",
+		          "dockerCompose": "yaml string here",
+		          "envVariables": [{"name": "VAR_NAME", "value": "example_value"}],
+		          "domains": [{"host": "domain.com", "port": 3000, "serviceName": "service"}],
+		          "configFiles": [{"content": "file content", "filePath": "path/to/file"}]
 		        }
 		      ]
 		    }
 
-		    Important rules for the response:
+		    Suggestion Rules:
 		    1. Use slug format for the id field (lowercase, hyphenated)
-		    2. Determine which strategy to use based on whether the user specified a particular application or described a general need
-		    3. For Strategy A (specific app): The name must include the app name and describe the variant configuration
-		    4. For Strategy B (general need): The name should be the actual project/tool name that fulfills the need
-		    5. The description field should ONLY contain a plain text description of the project or variant, its features, and use cases
-		    6. Do NOT include any code snippets, configuration examples, or installation instructions in the description
-		    7. The shortDescription should be a single-line summary focusing on key technologies or differentiators
-		    8. All suggestions should be installable in docker and have docker compose support
-		    9. Provide variety in your suggestions - different complexity levels, tech stacks, or approaches
+		    2. The description field should ONLY contain plain text — no code snippets or installation instructions
+		    3. The shortDescription should be a single-line summary focusing on key technologies or differentiators
+		    4. All suggestions should be installable in docker and have docker compose support
+		    5. Provide variety in your suggestions - different complexity levels, tech stacks, or approaches
 
-		    User wants to create a new project with the following details:
+		    Docker Compose Rules:
+		    1. Use placeholder like \${VARIABLE_NAME-default} for generated variables in the docker-compose.yml
+		    2. Use complex values for passwords/secrets variables
+		    3. Don't set container_name field in services
+		    4. Don't set version field in the docker compose
+		    5. Don't set ports like 'ports: 3000:3000', use 'ports: "3000"' instead
+		    6. If a service depends on a database or other service, INCLUDE that service in the docker-compose
+		    7. Make sure all required services are defined in the docker-compose
 
-		    ${input}
+		    Docker Image Rules (CRITICAL):
+		    1. ALWAYS use 'image:' field, NEVER use 'build:' field
+		    2. NEVER use 'build: .' or any build directive - we don't have local Dockerfiles
+		    3. Use images from Docker Hub or other public registries (e.g., docker.io, ghcr.io, quay.io)
+		    4. For dependencies (databases, redis, etc.), use official images (e.g., postgres:16, redis:7, etc.)
+		    5. Always specify image tags - avoid using 'latest' tag, use specific versions when possible
+		    6. Examples of correct image usage:
+		       - image: sendingtk/chatwoot:develop
+		       - image: postgres:16-alpine
+		       - image: redis:7-alpine
+		    7. Examples of INCORRECT usage (DO NOT USE):
+		       - build: .
+		       - build: ./app
+		       - build:
+		           context: .
+		           dockerfile: Dockerfile
+
+		    Volume Mounting and Configuration Rules:
+		    1. DO NOT create configuration files unless the service CANNOT work without them
+		    2. Most services can work with just environment variables - USE THEM FIRST
+		    3. If and ONLY IF a config file is absolutely required:
+		       - Keep it minimal with only critical settings
+		       - Use "../files/" prefix for all mounts
+		       - Format: "../files/folder:/container/path"
+		    4. DO NOT add configuration files for default configs, env-configurable settings, or proxy/routing configs
+
+		    Environment Variables Rules:
+		    1. For the envVariables array, provide ACTUAL example values, not placeholders
+		    2. Use realistic example values (e.g., "admin@example.com" for emails, "mypassword123" for passwords)
+		    3. DO NOT use \${VARIABLE_NAME-default} syntax in the envVariables values
+		    4. ONLY include environment variables that are actually used in the docker-compose
+		    5. Every environment variable referenced in the docker-compose MUST have a corresponding entry in envVariables
+
+		    Domain Rules - For each service that needs to be exposed to the internet:
+		    1. Define a domain with:
+		       - host: {service-name}-{random-3-chars-hex}-${ip ? ip.replaceAll(".", "-") : ""}.traefik.me
+		       - port: the internal port the service runs on
+		       - serviceName: the name of the service in the docker-compose
+		    2. Make sure the service is properly configured to work with the specified port
+
+		    User's request: ${input}
 		  `,
 		});
-		const object = suggestionsResult.output as SuggestionsOutput | undefined;
 
-		if (object?.suggestions?.length) {
-			const dockerSchema = z.object({
-				dockerCompose: z.string(),
-				envVariables: z.array(
-					z.object({
-						name: z.string(),
-						value: z.string(),
-					}),
-				),
-				domains: z.array(
-					z.object({
-						host: z.string(),
-						port: z.number(),
-						serviceName: z.string(),
-					}),
-				),
-				configFiles: z
-					.array(
-						z.object({
-							content: z.string(),
-							filePath: z.string(),
-						}),
-					)
-					.optional(),
+		const output = result.output as
+			| { suggestions: (SuggestionItem & DockerOutput)[] }
+			| undefined;
+
+		if (!output?.suggestions?.length) {
+			throw new TRPCError({
+				code: "NOT_FOUND",
+				message: "No suggestions found",
 			});
-			const result = [];
-			for (const suggestion of object.suggestions) {
-				try {
-					const dockerResult = await generateText({
-						model,
-						// @ts-ignore - Zod + AI SDK Output.object() causes excessively deep instantiation
-						output: Output.object({ schema: dockerSchema }),
-						prompt: `
-		          Act as advanced DevOps engineer and generate docker compose with environment variables and domain configurations needed to install the following project.
-
-		          Return your response as a JSON object with this structure:
-		          {
-		            "dockerCompose": "yaml string here",
-		            "envVariables": [{"name": "VAR_NAME", "value": "example_value"}],
-		            "domains": [{"host": "domain.com", "port": 3000, "serviceName": "service"}],
-		            "configFiles": [{"content": "file content", "filePath": "path/to/file"}]
-		          }
-
-		          Note: configFiles is optional - only include it if configuration files are absolutely required.
-
-		          Follow these rules:
-
-		          Docker Compose Rules:
-		          1. Use placeholder like \${VARIABLE_NAME-default} for generated variables in the docker-compose.yml
-		          2. Use complex values for passwords/secrets variables
-		          3. Don't set container_name field in services
-		          4. Don't set version field in the docker compose
-		          5. Don't set ports like 'ports: 3000:3000', use 'ports: "3000"' instead
-		          6. If a service depends on a database or other service, INCLUDE that service in the docker-compose
-		          7. Make sure all required services are defined in the docker-compose
-
-		          Docker Image Rules (CRITICAL):
-		          1. ALWAYS use 'image:' field, NEVER use 'build:' field
-		          2. NEVER use 'build: .' or any build directive - we don't have local Dockerfiles
-		          3. Use images from Docker Hub or other public registries (e.g., docker.io, ghcr.io, quay.io)
-		          4. For dependencies (databases, redis, etc.), use official images (e.g., postgres:16, redis:7, etc.)
-		          5. Always specify image tags - avoid using 'latest' tag, use specific versions when possible
-		          6. Examples of correct image usage:
-		             - image: sendingtk/chatwoot:develop
-		             - image: postgres:16-alpine
-		             - image: redis:7-alpine
-		             - image: chatwoot/chatwoot:latest
-		          7. Examples of INCORRECT usage (DO NOT USE):
-		             - build: .
-		             - build: ./app
-		             - build:
-		                 context: .
-		                 dockerfile: Dockerfile
-
-				  Volume Mounting and Configuration Rules:
-		          1. DO NOT create configuration files unless the service CANNOT work without them
-		          2. Most services can work with just environment variables - USE THEM FIRST
-		          3. Ask yourself: "Can this be configured with an environment variable instead?"
-		          4. If and ONLY IF a config file is absolutely required:
-		             - Keep it minimal with only critical settings
-		             - Use "../files/" prefix for all mounts
-		             - Format: "../files/folder:/container/path"
-		          5. DO NOT add configuration files for:
-		             - Default configurations that work out of the box
-		             - Settings that can be handled by environment variables
-		             - Proxy or routing configurations (these are handled elsewhere)
-
-				  Environment Variables Rules:
-		          1. For the envVariables array, provide ACTUAL example values, not placeholders
-		          2. Use realistic example values (e.g., "admin@example.com" for emails, "mypassword123" for passwords)
-				  3. DO NOT use \${VARIABLE_NAME-default} syntax in the envVariables values
-		          4. ONLY include environment variables that are actually used in the docker-compose
-		          5. Every environment variable referenced in the docker-compose MUST have a corresponding entry in envVariables
-		          6. Do not include environment variables for services that don't exist in the docker-compose
-
-		          For each service that needs to be exposed to the internet:
-		          1. Define a domain configuration with:
-		            - host: the domain name for the service in format: {service-name}-{random-3-chars-hex}-${ip ? ip.replaceAll(".", "-") : ""}.traefik.me
-		            - port: the internal port the service runs on
-		            - serviceName: the name of the service in the docker-compose
-		          2. Make sure the service is properly configured to work with the specified port
-
-		          User's original request: ${input}
-
-		          Project details:
-		          ${suggestion?.description}
-		        `,
-					});
-					const docker = dockerResult.output as DockerOutput | undefined;
-					if (docker?.dockerCompose) {
-						result.push({
-							...suggestion,
-							...docker,
-						});
-					}
-				} catch (error) {
-					console.error("Error in docker compose generation:", error);
-				}
-			}
-
-			return result;
 		}
 
-		throw new TRPCError({
-			code: "NOT_FOUND",
-			message: "No suggestions found",
-		});
+		return output.suggestions.filter((s) => s.dockerCompose);
 	} catch (error) {
 		console.error("Error in suggestVariants:", error);
 		throw error;

packages/server/src/services/application.ts

@@ -100,6 +100,7 @@ export const findApplicationById = async (applicationId: string) => {
 					project: true,
 				},
 			},
+
 			domains: true,
 			deployments: true,
 			mounts: true,

packages/server/src/services/compose.ts

@@ -440,17 +440,16 @@ export const removeCompose = async (
 			}
 		} else {
 			const command = `
-			 docker network disconnect ${compose.appName} dokploy-traefik;
-			cd ${projectPath} && env -i PATH="$PATH" docker compose -p ${compose.appName} down ${
+			docker network disconnect ${compose.appName} dokploy-traefik;
+			env -i PATH="$PATH" docker compose -p ${compose.appName} down ${
 				deleteVolumes ? "--volumes" : ""
-			} && rm -rf ${projectPath}`;
+			};
+			rm -rf ${projectPath}`;
 
 			if (compose.serverId) {
 				await execAsyncRemote(compose.serverId, command);
 			} else {
-				await execAsync(command, {
-					cwd: projectPath,
-				});
+				await execAsync(command);
 			}
 		}
 	} catch (error) {

packages/server/src/services/docker.ts

@@ -354,6 +354,69 @@ export const getContainersByAppLabel = async (
 	return [];
 };
 
+export const getContainerLogs = async (
+	appNameOrId: string,
+	tail = 100,
+	since = "all",
+	search?: string,
+	serverId?: string | null,
+	useContainerIdDirectly = false,
+): Promise<string> => {
+	const exec = (cmd: string) =>
+		serverId ? execAsyncRemote(serverId, cmd) : execAsync(cmd);
+
+	let target = appNameOrId;
+	let isService = false;
+
+	if (!useContainerIdDirectly) {
+		// Find the real container ID by appName filter
+		const findResult = await exec(
+			`docker ps -q --filter "name=^${appNameOrId}" | head -1`,
+		);
+		const containerId = findResult.stdout.trim();
+
+		if (!containerId) {
+			// Fallback: try as a swarm service
+			const svcResult = await exec(
+				`docker service ls -q --filter "name=${appNameOrId}" | head -1`,
+			);
+			const serviceId = svcResult.stdout.trim();
+			if (!serviceId) {
+				throw new Error(`No container or service found for: ${appNameOrId}`);
+			}
+			isService = true;
+		} else {
+			target = containerId;
+		}
+	}
+
+	const sinceFlag = since === "all" ? "" : `--since ${since}`;
+	const baseCommand = isService
+		? `docker service logs --timestamps --raw --tail ${tail} ${sinceFlag} ${target}`
+		: `docker container logs --timestamps --tail ${tail} ${sinceFlag} ${target}`;
+
+	const escapedSearch = search?.replace(/'/g, "'\\''") ?? "";
+	const command = search
+		? `${baseCommand} 2>&1 | grep -iF '${escapedSearch}'`
+		: `${baseCommand} 2>&1`;
+
+	try {
+		const result = await exec(command);
+		return result.stdout;
+	} catch (error: unknown) {
+		if (
+			error &&
+			typeof error === "object" &&
+			"stdout" in error &&
+			typeof (error as { stdout: string }).stdout === "string" &&
+			(error as { stdout: string }).stdout.length > 0
+		) {
+			return (error as { stdout: string }).stdout;
+		}
+		throw error;
+	}
+};
+
 export const containerRestart = async (containerId: string) => {
 	try {
 		const { stdout, stderr } = await execAsync(

packages/server/src/services/network.ts

@@ -0,0 +1,121 @@
+import { db } from "@dokploy/server/db";
+import {
+	type apiCreateNetwork,
+	type apiUpdateNetwork,
+	network,
+} from "@dokploy/server/db/schema";
+import { TRPCError } from "@trpc/server";
+import { eq } from "drizzle-orm";
+import { IS_CLOUD } from "../constants";
+import { getRemoteDocker } from "../utils/servers/remote-docker";
+
+export const findNetworkById = async (networkId: string) => {
+	const [row] = await db
+		.select()
+		.from(network)
+		.where(eq(network.networkId, networkId))
+		.limit(1);
+
+	if (!row) {
+		throw new TRPCError({
+			code: "NOT_FOUND",
+			message: "Network not found",
+		});
+	}
+
+	return row;
+};
+
+export const createNetwork = async (
+	input: typeof apiCreateNetwork._type,
+	organizationId: string,
+) => {
+	if (IS_CLOUD) {
+		if (!input.serverId) {
+			throw new TRPCError({
+				code: "BAD_REQUEST",
+				message: "Server is required",
+			});
+		}
+	}
+
+	const created = await db.transaction(async (tx) => {
+		const [row] = await tx
+			.insert(network)
+			.values({
+				...input,
+				organizationId,
+			})
+			.returning();
+
+		if (!row) {
+			throw new TRPCError({
+				code: "INTERNAL_SERVER_ERROR",
+				message: "Failed to create network",
+			});
+		}
+
+		const ipam = row.ipam ?? {};
+		const ipamConfig = (ipam.config ?? [])
+			.map((c) => {
+				const entry: Record<string, string> = {};
+				if (c.subnet) entry.Subnet = c.subnet;
+				if (c.gateway) entry.Gateway = c.gateway;
+				if (c.ipRange) entry.IPRange = c.ipRange;
+				return entry;
+			})
+			.filter((e) => Object.keys(e).length > 0);
+
+		const docker = await getRemoteDocker(input.serverId ?? null);
+		await docker.createNetwork({
+			Name: row.name,
+			Driver: row.driver,
+			Internal: row.internal,
+			Attachable: row.attachable,
+			Ingress: row.ingress,
+			EnableIPv6: row.enableIPv6,
+			IPAM: {
+				Driver: ipam.driver ?? "default",
+				Config: ipamConfig.length > 0 ? ipamConfig : undefined,
+			},
+		});
+
+		return row;
+	});
+
+	return created;
+};
+
+export const updateNetwork = async (input: typeof apiUpdateNetwork._type) => {
+	const { networkId, ...rest } = input;
+	const [updated] = await db
+		.update(network)
+		.set(rest)
+		.where(eq(network.networkId, networkId))
+		.returning();
+
+	if (!updated) {
+		throw new TRPCError({
+			code: "NOT_FOUND",
+			message: "Network not found",
+		});
+	}
+
+	return updated;
+};
+
+export const removeNetwork = async (networkId: string) => {
+	const [deleted] = await db
+		.delete(network)
+		.where(eq(network.networkId, networkId))
+		.returning();
+
+	if (!deleted) {
+		throw new TRPCError({
+			code: "NOT_FOUND",
+			message: "Network not found",
+		});
+	}
+
+	return deleted;
+};

packages/server/src/utils/ai/select-ai-provider.ts

@@ -17,6 +17,9 @@ export function getProviderName(apiUrl: string) {
 	if (apiUrl.includes(":11434") || apiUrl.includes("ollama")) return "ollama";
 	if (apiUrl.includes("api.deepinfra.com")) return "deepinfra";
 	if (apiUrl.includes("generativelanguage.googleapis.com")) return "gemini";
+	if (apiUrl.includes("openrouter.ai")) return "openrouter";
+	if (apiUrl.includes("api.z.ai")) return "zai";
+	if (apiUrl.includes("api.minimax.io")) return "minimax";
 	return "custom";
 }
 
@@ -87,6 +90,30 @@ export function selectAIProvider(config: { apiUrl: string; apiKey: string }) {
 					Authorization: `Bearer ${config.apiKey}`,
 				},
 			});
+		case "openrouter":
+			return createOpenAICompatible({
+				name: "openrouter",
+				baseURL: config.apiUrl,
+				headers: {
+					Authorization: `Bearer ${config.apiKey}`,
+				},
+			});
+		case "zai":
+			return createOpenAICompatible({
+				name: "zai",
+				baseURL: config.apiUrl,
+				headers: {
+					Authorization: `Bearer ${config.apiKey}`,
+				},
+			});
+		case "minimax":
+			return createOpenAICompatible({
+				name: "minimax",
+				baseURL: config.apiUrl,
+				headers: {
+					Authorization: `Bearer ${config.apiKey}`,
+				},
+			});
 		case "custom":
 			return createOpenAICompatible({
 				name: "custom",

packages/server/src/utils/builders/compose.ts

@@ -106,6 +106,7 @@ export const getCreateEnvFileCommand = (compose: ComposeNested) => {
 	const envFilePath = join(dirname(composeFilePath), ".env");
 
 	let envContent = `APP_NAME=${appName}\n`;
+	envContent += `COMPOSE_PROJECT_NAME=${appName}\n`;
 	envContent += env || "";
 	if (!envContent.includes("DOCKER_CONFIG")) {
 		envContent += "\nDOCKER_CONFIG=/root/.docker";

packages/server/src/utils/notifications/utils.ts

@@ -19,6 +19,7 @@ export const sendEmailNotification = async (
 	connection: typeof email.$inferInsert,
 	subject: string,
 	htmlContent: string,
+	attachments?: { filename: string; content: Buffer }[],
 ) => {
 	try {
 		const {
@@ -41,6 +42,7 @@ export const sendEmailNotification = async (
 			subject,
 			html: htmlContent,
 			textEncoding: "base64",
+			attachments,
 		});
 	} catch (err) {
 		console.log(err);

packages/server/src/utils/traefik/domain.ts

@@ -151,16 +151,18 @@ export const createRouterConfig = async (
 		routerConfig.middlewares?.push("redirect-to-https");
 	} else {
 		// Add path rewriting middleware if needed
-		if (internalPath && internalPath !== "/" && internalPath !== path) {
-			const pathMiddleware = `addprefix-${appName}-${uniqueConfigKey}`;
-			routerConfig.middlewares?.push(pathMiddleware);
-		}
-
+		// stripPrefix must come before addPrefix so Traefik strips the
+		// public path first, then prepends the internal path.
 		if (stripPath && path && path !== "/") {
 			const stripMiddleware = `stripprefix-${appName}-${uniqueConfigKey}`;
 			routerConfig.middlewares?.push(stripMiddleware);
 		}
 
+		if (internalPath && internalPath !== "/" && internalPath !== path) {
+			const pathMiddleware = `addprefix-${appName}-${uniqueConfigKey}`;
+			routerConfig.middlewares?.push(pathMiddleware);
+		}
+
 		// redirects - skip for preview deployments as wildcard subdomains
 		// should not inherit parent redirect rules (e.g., www-redirect)
 		if (domain.domainType !== "preview") {

packages/server/src/verification/send-verification-email.tsx

@@ -3,10 +3,12 @@ export const sendEmail = async ({
 	email,
 	subject,
 	text,
+	attachments,
 }: {
 	email: string;
 	subject: string;
 	text: string;
+	attachments?: { filename: string; content: Buffer }[];
 }) => {
 	await sendEmailNotification(
 		{
@@ -19,6 +21,7 @@ export const sendEmail = async ({
 		},
 		subject,
 		text,
+		attachments,
 	);
 
 	return true;