diff --git a/Dockerfile b/Dockerfile
index 52669ce299..5f9d007ec0 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -194,8 +194,6 @@ ENV _APP_SERVER=swoole \
     _APP_SMTP_USERNAME= \
     _APP_SMTP_PASSWORD= \
     _APP_PHONE_PROVIDER= \
-    _APP_PHONE_USER= \
-    _APP_PHONE_KEY= \
     _APP_PHONE_FROM= \
     _APP_FUNCTIONS_SIZE_LIMIT=30000000 \
     _APP_FUNCTIONS_TIMEOUT=900 \
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index cf9a111391..40be033f88 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -149,6 +149,8 @@ services:
       - _APP_MAINTENANCE_RETENTION_EXECUTION
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_PHONE_PROVIDER
+      - _APP_PHONE_SECRET
 
   appwrite-realtime:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
@@ -497,6 +499,26 @@ services:
       - _APP_LOGGING_PROVIDER
       - _APP_LOGGING_CONFIG
 
+  appwrite-worker-messaging:
+    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    entrypoint: worker-messaging
+    <<: *x-logging
+    container_name: appwrite-worker-messaging
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+    environment:
+      - _APP_ENV
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_PHONE_PROVIDER
+      - _APP_PHONE_FROM
+      - _APP_LOGGING_PROVIDER
+      - _APP_LOGGING_CONFIG
+
   appwrite-maintenance:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
     entrypoint: maintenance
diff --git a/docker-compose.yml b/docker-compose.yml
index 24b6a88e2f..45721df6ce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -176,8 +176,6 @@ services:
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
       - _APP_PHONE_PROVIDER
-      - _APP_PHONE_FROM
-      - _APP_PHONE_USER
       - _APP_PHONE_SECRET
 
   appwrite-realtime:
@@ -548,8 +546,6 @@ services:
       - _APP_REDIS_USER
       - _APP_REDIS_PASS
       - _APP_PHONE_PROVIDER
-      - _APP_PHONE_USER
-      - _APP_PHONE_SECRET
       - _APP_PHONE_FROM
       - _APP_LOGGING_PROVIDER
       - _APP_LOGGING_CONFIG