diff --git a/apps/dokploy/components/dashboard/application/schedules/handle-schedules.tsx b/apps/dokploy/components/dashboard/application/schedules/handle-schedules.tsx
index f99eee86b..c133ae4d9 100644
--- a/apps/dokploy/components/dashboard/application/schedules/handle-schedules.tsx
+++ b/apps/dokploy/components/dashboard/application/schedules/handle-schedules.tsx
@@ -14,8 +14,6 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 import {
-	Clock,
-	Terminal,
 	Info,
 	PlusCircle,
 	PenBoxIcon,
@@ -49,7 +47,8 @@ import type { CacheType } from "../../compose/domains/add-domain";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { CodeEditor } from "@/components/shared/code-editor";
 import { cn } from "@/lib/utils";
-const commonCronExpressions = [
+
+export const commonCronExpressions = [
 	{ label: "Every minute", value: "* * * * *" },
 	{ label: "Every hour", value: "0 * * * *" },
 	{ label: "Every day at midnight", value: "0 0 * * *" },
@@ -361,7 +360,6 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
 							render={({ field }) => (
 								<FormItem>
 									<FormLabel className="flex items-center gap-2">
-										<Clock className="w-4 h-4" />
 										Task Name
 									</FormLabel>
 									<FormControl>
@@ -381,7 +379,6 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
 							render={({ field }) => (
 								<FormItem>
 									<FormLabel className="flex items-center gap-2">
-										<Clock className="w-4 h-4" />
 										Schedule
 										<TooltipProvider>
 											<Tooltip>
@@ -444,7 +441,6 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
 									render={({ field }) => (
 										<FormItem>
 											<FormLabel className="flex items-center gap-2">
-												<Terminal className="w-4 h-4" />
 												Shell Type
 											</FormLabel>
 											<Select
@@ -474,7 +470,6 @@ export const HandleSchedules = ({ id, scheduleId, scheduleType }: Props) => {
 									render={({ field }) => (
 										<FormItem>
 											<FormLabel className="flex items-center gap-2">
-												<Terminal className="w-4 h-4" />
 												Command
 											</FormLabel>
 											<FormControl>
diff --git a/apps/dokploy/components/dashboard/application/schedules/show-schedules.tsx b/apps/dokploy/components/dashboard/application/schedules/show-schedules.tsx
index 8e805a33d..c1345ebe1 100644
--- a/apps/dokploy/components/dashboard/application/schedules/show-schedules.tsx
+++ b/apps/dokploy/components/dashboard/application/schedules/show-schedules.tsx
@@ -75,7 +75,7 @@ export const ShowSchedules = ({ id, scheduleType = "application" }: Props) => {
 			</CardHeader>
 			<CardContent className="px-0">
 				{isLoadingSchedules ? (
-					<div className="flex gap-4   w-full items-center justify-center text-center mx-auto">
+					<div className="flex gap-4   w-full items-center justify-center text-center mx-auto min-h-[45vh]">
 						<Loader2 className="size-4 text-muted-foreground/70 transition-colors animate-spin self-center" />
 						<span className="text-sm text-muted-foreground/70">
 							Loading scheduled tasks...
@@ -146,7 +146,7 @@ export const ShowSchedules = ({ id, scheduleType = "application" }: Props) => {
 									<div className="flex items-center gap-1.5">
 										<ShowSchedulesLogs
 											deployments={deployments || []}
-											serverId={serverId}
+											serverId={serverId || undefined}
 										>
 											<Button variant="ghost" size="icon">
 												<ClipboardList className="size-4  transition-colors " />
diff --git a/apps/dokploy/server/server.ts b/apps/dokploy/server/server.ts
index fd9082451..148edda0d 100644
--- a/apps/dokploy/server/server.ts
+++ b/apps/dokploy/server/server.ts
@@ -6,6 +6,7 @@ import {
 	createDefaultServerTraefikConfig,
 	createDefaultTraefikConfig,
 	initCronJobs,
+	initSchedules,
 	initializeNetwork,
 	sendDokployRestartNotifications,
 	setupDirectories,
@@ -49,6 +50,7 @@ void app.prepare().then(async () => {
 			createDefaultServerTraefikConfig();
 			await migration();
 			await initCronJobs();
+			await initSchedules();
 			await sendDokployRestartNotifications();
 		}
 
diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
index 319c4f9d2..469166381 100644
--- a/packages/server/src/index.ts
+++ b/packages/server/src/index.ts
@@ -128,3 +128,4 @@ export {
 } from "./utils/access-log/handler";
 
 export * from "./utils/schedules/utils";
+export * from "./utils/schedules/index";
diff --git a/packages/server/src/services/schedule.ts b/packages/server/src/services/schedule.ts
index f4bd20a68..186cabd28 100644
--- a/packages/server/src/services/schedule.ts
+++ b/packages/server/src/services/schedule.ts
@@ -8,8 +8,10 @@ import type {
 	updateScheduleSchema,
 } from "../db/schema/schedule";
 import { execAsync, execAsyncRemote } from "../utils/process/execAsync";
-import { paths } from "../constants";
+import { IS_CLOUD, paths } from "../constants";
 import path from "node:path";
+import { encodeBase64 } from "../utils/docker/utils";
+import { scheduleJob, removeScheduleJob } from "../utils/schedules/utils";
 
 export type ScheduleExtended = Awaited<ReturnType<typeof findScheduleById>>;
 
@@ -26,6 +28,11 @@ export const createSchedule = async (
 	) {
 		await handleScript(newSchedule);
 	}
+
+	if (newSchedule?.enabled) {
+		scheduleJob(newSchedule);
+	}
+
 	return newSchedule;
 };
 
@@ -50,12 +57,16 @@ export const findScheduleById = async (scheduleId: string) => {
 
 export const deleteSchedule = async (scheduleId: string) => {
 	const schedule = await findScheduleById(scheduleId);
+	const serverId =
+		schedule?.serverId ||
+		schedule?.application?.serverId ||
+		schedule?.compose?.serverId;
+	const { SCHEDULES_PATH } = paths(!!serverId);
 
-	const { SCHEDULES_PATH } = paths(!!schedule?.serverId);
 	const fullPath = path.join(SCHEDULES_PATH, schedule?.appName || "");
 	const command = `rm -rf ${fullPath}`;
-	if (schedule.serverId) {
-		await execAsyncRemote(schedule.serverId, command);
+	if (serverId) {
+		await execAsyncRemote(serverId, command);
 	} else {
 		await execAsync(command);
 	}
@@ -89,19 +100,32 @@ export const updateSchedule = async (
 	) {
 		await handleScript(updatedSchedule);
 	}
+
+	console.log("updatedSchedule", updatedSchedule);
+
+	if (IS_CLOUD) {
+		// scheduleJob(updatedSchedule);
+	} else {
+		if (updatedSchedule?.enabled) {
+			removeScheduleJob(scheduleId);
+			scheduleJob(updatedSchedule);
+		} else {
+			removeScheduleJob(scheduleId);
+		}
+	}
 	return updatedSchedule;
 };
 
 const handleScript = async (schedule: Schedule) => {
 	const { SCHEDULES_PATH } = paths(!!schedule?.serverId);
 	const fullPath = path.join(SCHEDULES_PATH, schedule?.appName || "");
-
+	const encodedContent = encodeBase64(schedule?.script || "");
 	const script = `
 	 	 mkdir -p ${fullPath}
 	 	 rm -f ${fullPath}/script.sh
 		 touch ${fullPath}/script.sh
 		 chmod +x ${fullPath}/script.sh
-		 echo "${schedule?.script}" > ${fullPath}/script.sh
+		 echo "${encodedContent}" | base64 -d > ${fullPath}/script.sh
 	`;
 
 	if (schedule?.scheduleType === "dokploy-server") {
diff --git a/packages/server/src/utils/schedules/index.ts b/packages/server/src/utils/schedules/index.ts
new file mode 100644
index 000000000..0f9b167e8
--- /dev/null
+++ b/packages/server/src/utils/schedules/index.ts
@@ -0,0 +1,28 @@
+import { db } from "../../db/index";
+import { schedules } from "@dokploy/server/db/schema";
+import { eq } from "drizzle-orm";
+import { scheduleJob } from "./utils";
+
+export const initSchedules = async () => {
+	try {
+		const schedulesResult = await db.query.schedules.findMany({
+			where: eq(schedules.enabled, true),
+			with: {
+				server: true,
+				application: true,
+				compose: true,
+				user: true,
+			},
+		});
+
+		console.log(`Initializing ${schedulesResult.length} schedules`);
+		for (const schedule of schedulesResult) {
+			scheduleJob(schedule);
+			console.log(
+				`Initialized schedule: ${schedule.name} ${schedule.scheduleType} ✅`,
+			);
+		}
+	} catch (error) {
+		console.log(`Error initializing schedules: ${error}`);
+	}
+};
diff --git a/packages/server/src/utils/schedules/utils.ts b/packages/server/src/utils/schedules/utils.ts
index 50f3f0e53..2be3f5f5d 100644
--- a/packages/server/src/utils/schedules/utils.ts
+++ b/packages/server/src/utils/schedules/utils.ts
@@ -1,6 +1,6 @@
 import type { Schedule } from "@dokploy/server/db/schema/schedule";
 import { findScheduleById } from "@dokploy/server/services/schedule";
-import { scheduleJob as scheduleJobNode } from "node-schedule";
+import { scheduledJobs, scheduleJob as scheduleJobNode } from "node-schedule";
 import { getComposeContainer, getServiceContainerIV2 } from "../docker/utils";
 import { execAsyncRemote } from "../process/execAsync";
 import { spawnAsync } from "../process/spawnAsync";
@@ -18,6 +18,11 @@ export const scheduleJob = (schedule: Schedule) => {
 	});
 };
 
+export const removeScheduleJob = (scheduleId: string) => {
+	const currentJob = scheduledJobs[scheduleId];
+	currentJob?.cancel();
+};
+
 export const runCommand = async (scheduleId: string) => {
 	const {
 		application,