diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index 252b5b6bd7..c692ac22fb 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -632,10 +632,35 @@ services:
       - _APP_LOGGING_PROVIDER
       - _APP_LOGGING_CONFIG
 
-  appwrite-schedule:
+  appwrite-scheduler-functions:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
-    entrypoint: schedule
-    container_name: appwrite-schedule
+    entrypoint: schedule-functions
+    container_name: appwrite-scheduler-functions
+    <<: *x-logging
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - mariadb
+      - redis
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+
+  appwrite-scheduler-messages:
+    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    entrypoint: schedule-messages
+    container_name: appwrite-scheduler-messages
     <<: *x-logging
     restart: unless-stopped
     networks:
diff --git a/docker-compose.yml b/docker-compose.yml
index 892b280798..66d9091157 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -690,10 +690,10 @@ services:
       - _APP_LOGGING_PROVIDER
       - _APP_LOGGING_CONFIG
 
-  appwrite-schedule:
-    entrypoint: schedule
+  appwrite-scheduler-functions:
+    entrypoint: schedule-functions
     <<: *x-logging
-    container_name: appwrite-schedule
+    container_name: appwrite-scheduler-functions
     image: appwrite-dev
     networks:
       - appwrite
@@ -717,10 +717,10 @@ services:
       - _APP_DB_USER
       - _APP_DB_PASS
 
-  appwrite-schedule-message:
-    entrypoint: schedule-message
+  appwrite-scheduler-messages:
+    entrypoint: schedule-messages
     <<: *x-logging
-    container_name: appwrite-schedule-message
+    container_name: appwrite-scheduler-messages
     image: appwrite-dev
     networks:
       - appwrite