diff --git a/apps/dokploy/components/dashboard/settings/web-server/toggle-auto-check-updates.tsx b/apps/dokploy/components/dashboard/settings/web-server/toggle-auto-check-updates.tsx
index 5c07d5df..fb3776b1 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/toggle-auto-check-updates.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/toggle-auto-check-updates.tsx
@@ -2,7 +2,7 @@ import { Label } from "@/components/ui/label";
 import { Switch } from "@/components/ui/switch";
 import { useState } from "react";
 
-export const ToggleAutoCheckUpdates = () => {
+export const ToggleAutoCheckUpdates = ({ disabled }: { disabled: boolean }) => {
 	const [enabled, setEnabled] = useState<boolean>(
 		localStorage.getItem("enableAutoCheckUpdates") === "true",
 	);
@@ -18,6 +18,7 @@ export const ToggleAutoCheckUpdates = () => {
 				checked={enabled}
 				onCheckedChange={handleToggle}
 				id="autoCheckUpdatesToggle"
+				disabled={disabled}
 			/>
 			<Label className="text-primary" htmlFor="autoCheckUpdatesToggle">
 				Automatically check for new updates
diff --git a/apps/dokploy/components/dashboard/settings/web-server/update-server.tsx b/apps/dokploy/components/dashboard/settings/web-server/update-server.tsx
index 1b8798e4..da4ee83a 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/update-server.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/update-server.tsx
@@ -3,38 +3,53 @@ import { Button } from "@/components/ui/button";
 import {
 	Dialog,
 	DialogContent,
-	DialogDescription,
-	DialogHeader,
 	DialogTitle,
 	DialogTrigger,
 } from "@/components/ui/dialog";
 import { api } from "@/utils/api";
-import { RefreshCcw } from "lucide-react";
+import {
+	Bug,
+	Download,
+	Info,
+	RefreshCcw,
+	Server,
+	ServerCrash,
+	Sparkles,
+	Stars,
+} from "lucide-react";
 import Link from "next/link";
 import { useState } from "react";
 import { toast } from "sonner";
-import { UpdateWebServer } from "./update-webserver";
 import { ToggleAutoCheckUpdates } from "./toggle-auto-check-updates";
+import { UpdateWebServer } from "./update-webserver";
 
 export const UpdateServer = () => {
-	const [isUpdateAvailable, setIsUpdateAvailable] = useState<null | boolean>(
-		null,
-	);
+	const [hasCheckedUpdate, setHasCheckedUpdate] = useState(false);
+	const [isUpdateAvailable, setIsUpdateAvailable] = useState(false);
 	const { mutateAsync: getUpdateData, isLoading } =
 		api.settings.getUpdateData.useMutation();
+	const { data: dokployVersion } = api.settings.getDokployVersion.useQuery();
 	const [isOpen, setIsOpen] = useState(false);
+	const [latestVersion, setLatestVersion] = useState("");
 
 	const handleCheckUpdates = async () => {
 		try {
-			const { updateAvailable, latestVersion } = await getUpdateData();
-			setIsUpdateAvailable(updateAvailable);
-			if (updateAvailable) {
-				toast.success(`${latestVersion} update is available!`);
+			const updateData = await getUpdateData();
+			const versionToUpdate = updateData.latestVersion || "";
+			setHasCheckedUpdate(true);
+			setIsUpdateAvailable(updateData.updateAvailable);
+			setLatestVersion(versionToUpdate);
+
+			if (updateData.updateAvailable) {
+				toast.success(versionToUpdate, {
+					description: "New version available!",
+				});
 			} else {
 				toast.info("No updates available");
 			}
 		} catch (error) {
 			console.error("Error checking for updates:", error);
+			setHasCheckedUpdate(true);
 			setIsUpdateAvailable(false);
 			toast.error(
 				"An error occurred while checking for updates, please try again.",
@@ -45,59 +60,166 @@ export const UpdateServer = () => {
 	return (
 		<Dialog open={isOpen} onOpenChange={setIsOpen}>
 			<DialogTrigger asChild>
-				<Button variant="secondary">
-					<RefreshCcw className="h-4 w-4" />
+				<Button variant="secondary" className="gap-2">
+					<Sparkles className="h-4 w-4" />
 					Updates
 				</Button>
 			</DialogTrigger>
-			<DialogContent className="sm:m:max-w-lg ">
-				<DialogHeader>
-					<DialogTitle>Web Server Update</DialogTitle>
-					<DialogDescription>
-						Check new releases and update your dokploy
-					</DialogDescription>
-				</DialogHeader>
+			<DialogContent className="max-w-lg p-6">
+				<div className="flex items-center justify-between mb-8">
+					<DialogTitle className="text-2xl font-semibold">
+						Web Server Update
+					</DialogTitle>
+					{dokployVersion && (
+						<div className="flex items-center gap-1.5 rounded-full px-3 py-1 mr-2 bg-muted">
+							<Server className="h-4 w-4 text-muted-foreground" />
+							<span className="text-sm text-muted-foreground">
+								{dokployVersion}
+							</span>
+						</div>
+					)}
+				</div>
 
-				<div className="flex flex-col gap-4">
-					<span className="text-sm text-muted-foreground">
-						We suggest to update your dokploy to the latest version only if you:
-					</span>
-					<ul className="list-disc list-inside text-sm text-muted-foreground">
-						<li>Want to try the latest features</li>
-						<li>Some bug that is blocking to use some features</li>
-					</ul>
-					<AlertBlock type="info">
-						We recommend checking the latest version for any breaking changes
-						before updating. Go to{" "}
-						<Link
-							href="https://github.com/Dokploy/dokploy/releases"
-							target="_blank"
-							className="text-foreground"
-						>
-							Dokploy Releases
-						</Link>{" "}
-						to check the latest version.
-					</AlertBlock>
+				{/* Initial state */}
+				{!hasCheckedUpdate && (
+					<div className="mb-8">
+						<p className="text text-muted-foreground">
+							Check for new releases and update Dokploy.
+							<br />
+							<br />
+							We recommend checking for updates regularly to ensure you have the
+							latest features and security improvements.
+						</p>
+					</div>
+				)}
 
-					<div className="w-full flex flex-col gap-4">
-						<ToggleAutoCheckUpdates />
-						{isUpdateAvailable === false && (
-							<div className="flex flex-col items-center gap-3">
-								<RefreshCcw className="size-6 self-center text-muted-foreground" />
-								<span className="text-sm text-muted-foreground">
-									You are using the latest version
+				{/* Update available state */}
+				{isUpdateAvailable && latestVersion && (
+					<div className="mb-8">
+						<div className="inline-flex items-center gap-2 rounded-lg px-3 py-2 border border-emerald-900 bg-emerald-900 dark:bg-emerald-900/40 mb-4 w-full">
+							<div className="flex items-center gap-1.5">
+								<span className="flex h-2 w-2">
+									<span className="animate-ping absolute inline-flex h-2 w-2 rounded-full bg-emerald-400 opacity-75" />
+									<span className="relative inline-flex rounded-full h-2 w-2 bg-emerald-500" />
+								</span>
+								<Download className="h-4 w-4 text-emerald-400" />
+								<span className="text font-medium text-emerald-400 ">
+									New version available:
 								</span>
 							</div>
-						)}
+							<span className="text font-semibold text-emerald-300">
+								{latestVersion}
+							</span>
+						</div>
+
+						<div className="space-y-4 text-muted-foreground">
+							<p className="text">
+								A new version of the server software is available. Consider
+								updating if you:
+							</p>
+							<ul className="space-y-3">
+								<li className="flex items-start gap-2">
+									<Stars className="h-5 w-5 mt-0.5 text-[#5B9DFF]" />
+									<span className="text">
+										Want to access the latest features and improvements
+									</span>
+								</li>
+								<li className="flex items-start gap-2">
+									<Bug className="h-5 w-5 mt-0.5 text-[#5B9DFF]" />
+									<span className="text">
+										Are experiencing issues that may be resolved in the new
+										version
+									</span>
+								</li>
+							</ul>
+						</div>
+					</div>
+				)}
+
+				{/* Up to date state */}
+				{hasCheckedUpdate && !isUpdateAvailable && !isLoading && (
+					<div className="mb-8">
+						<div className="flex flex-col items-center gap-6 mb-6">
+							<div className="rounded-full p-4 bg-emerald-400/40">
+								<Sparkles className="h-8 w-8 text-emerald-400" />
+							</div>
+							<div className="text-center space-y-2">
+								<h3 className="text-lg font-medium">
+									You are using the latest version
+								</h3>
+								<p className="text text-muted-foreground">
+									Your server is up to date with all the latest features and
+									security improvements.
+								</p>
+							</div>
+						</div>
+					</div>
+				)}
+
+				{hasCheckedUpdate && isLoading && (
+					<div className="mb-8">
+						<div className="flex flex-col items-center gap-6 mb-6">
+							<div className="rounded-full p-4 bg-[#5B9DFF]/40 text-foreground">
+								<RefreshCcw className="h-8 w-8 animate-spin" />
+							</div>
+							<div className="text-center space-y-2">
+								<h3 className="text-lg font-medium">Checking for updates...</h3>
+								<p className="text text-muted-foreground">
+									Please wait while we pull the latest version information from
+									Docker Hub.
+								</p>
+							</div>
+						</div>
+					</div>
+				)}
+
+				{isUpdateAvailable && (
+					<div className="rounded-lg bg-[#16254D] p-4 mb-8">
+						<div className="flex gap-2">
+							<Info className="h-5 w-5 flex-shrink-0 text-[#5B9DFF]" />
+							<div className="text-[#5B9DFF]">
+								We recommend reviewing the{" "}
+								<Link
+									href="https://github.com/Dokploy/dokploy/releases"
+									target="_blank"
+									className="text-white underline hover:text-zinc-200"
+								>
+									release notes
+								</Link>{" "}
+								for any breaking changes before updating.
+							</div>
+						</div>
+					</div>
+				)}
+
+				<div className="flex items-center justify-between pt-2">
+					<ToggleAutoCheckUpdates disabled={isLoading} />
+				</div>
+
+				<div className="space-y-4 flex items-center justify-end">
+					<div className="flex items-center gap-2">
+						<Button variant="outline" onClick={() => setIsOpen(false)}>
+							Cancel
+						</Button>
 						{isUpdateAvailable ? (
 							<UpdateWebServer />
 						) : (
 							<Button
-								className="w-full"
+								variant="secondary"
 								onClick={handleCheckUpdates}
-								isLoading={isLoading}
+								disabled={isLoading}
 							>
-								{isLoading ? "Checking for updates..." : "Check for updates"}
+								{isLoading ? (
+									<>
+										<RefreshCcw className="h-4 w-4 animate-spin" />
+										Checking for updates
+									</>
+								) : (
+									<>
+										<RefreshCcw className="h-4 w-4" />
+										Check for updates
+									</>
+								)}
 							</Button>
 						)}
 					</div>
@@ -106,3 +228,5 @@ export const UpdateServer = () => {
 		</Dialog>
 	);
 };
+
+export default UpdateServer;
diff --git a/apps/dokploy/components/dashboard/settings/web-server/update-webserver.tsx b/apps/dokploy/components/dashboard/settings/web-server/update-webserver.tsx
index 9b3c89f6..c1e5de70 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/update-webserver.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/update-webserver.tsx
@@ -11,6 +11,7 @@ import {
 } from "@/components/ui/alert-dialog";
 import { Button } from "@/components/ui/button";
 import { api } from "@/utils/api";
+import { HardDriveDownload } from "lucide-react";
 import { toast } from "sonner";
 
 interface Props {
@@ -21,7 +22,7 @@ export const UpdateWebServer = ({ isNavbar }: Props) => {
 	const { mutateAsync: updateServer, isLoading } =
 		api.settings.updateServer.useMutation();
 
-	const buttonLabel = isNavbar ? "Update available" : "Update server";
+	const buttonLabel = isNavbar ? "Update available" : "Update Server";
 
 	const handleConfirm = async () => {
 		try {
@@ -49,6 +50,7 @@ export const UpdateWebServer = ({ isNavbar }: Props) => {
 					variant={isNavbar ? "outline" : "secondary"}
 					isLoading={isLoading}
 				>
+					{!isLoading && <HardDriveDownload className="h-4 w-4" />}
 					{!isLoading && (
 						<span className="absolute -right-1 -top-2 flex h-3 w-3">
 							<span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-400 opacity-75" />
diff --git a/apps/dokploy/components/layouts/navbar.tsx b/apps/dokploy/components/layouts/navbar.tsx
index a8eb4574..59d8d8c7 100644
--- a/apps/dokploy/components/layouts/navbar.tsx
+++ b/apps/dokploy/components/layouts/navbar.tsx
@@ -12,11 +12,11 @@ import { api } from "@/utils/api";
 import { HeartIcon } from "lucide-react";
 import Link from "next/link";
 import { useRouter } from "next/router";
+import { useEffect, useRef, useState } from "react";
+import { UpdateWebServer } from "../dashboard/settings/web-server/update-webserver";
 import { Logo } from "../shared/logo";
 import { Avatar, AvatarFallback, AvatarImage } from "../ui/avatar";
 import { buttonVariants } from "../ui/button";
-import { useEffect, useRef, useState } from "react";
-import { UpdateWebServer } from "../dashboard/settings/web-server/update-webserver";
 
 const AUTO_CHECK_UPDATES_INTERVAL_MINUTES = 5;
 
diff --git a/apps/dokploy/server/api/routers/settings.ts b/apps/dokploy/server/api/routers/settings.ts
index 63e5483e..1e5b58b5 100644
--- a/apps/dokploy/server/api/routers/settings.ts
+++ b/apps/dokploy/server/api/routers/settings.ts
@@ -12,6 +12,7 @@ import {
 } from "@/server/db/schema";
 import { removeJob, schedule } from "@/server/utils/backup";
 import {
+	DEFAULT_UPDATE_DATA,
 	IS_CLOUD,
 	canAccessToTraefikFiles,
 	cleanStoppedContainers,
@@ -25,6 +26,7 @@ import {
 	findAdminById,
 	findServerById,
 	getDokployImage,
+	getUpdateData,
 	initializeTraefik,
 	logRotationManager,
 	parseRawConfig,
@@ -45,14 +47,12 @@ import {
 	stopService,
 	stopServiceRemote,
 	updateAdmin,
-	getUpdateData,
 	updateLetsEncryptEmail,
 	updateServerById,
 	updateServerTraefik,
 	writeConfig,
 	writeMainConfig,
 	writeTraefikConfigInPath,
-	DEFAULT_UPDATE_DATA,
 } from "@dokploy/server";
 import { checkGPUStatus, setupGPUSupport } from "@dokploy/server";
 import { generateOpenApiDocument } from "@dokploy/trpc-openapi";