diff --git a/app/Console/Commands/Horizon.php b/app/Console/Commands/Horizon.php
deleted file mode 100644
index d3e35ca5a..000000000
--- a/app/Console/Commands/Horizon.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-
-class Horizon extends Command
-{
-    protected $signature = 'start:horizon';
-
-    protected $description = 'Start Horizon';
-
-    public function handle()
-    {
-        if (config('constants.horizon.is_horizon_enabled')) {
-            $this->info('Horizon is enabled on this server.');
-            $this->call('horizon');
-            exit(0);
-        } else {
-            exit(0);
-        }
-    }
-}
diff --git a/app/Console/Commands/Nightwatch.php b/app/Console/Commands/Nightwatch.php
deleted file mode 100644
index 40fd86a81..000000000
--- a/app/Console/Commands/Nightwatch.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-
-class Nightwatch extends Command
-{
-    protected $signature = 'start:nightwatch';
-
-    protected $description = 'Start Nightwatch';
-
-    public function handle(): void
-    {
-        if (config('constants.nightwatch.is_nightwatch_enabled')) {
-            $this->info('Nightwatch is enabled on this server.');
-            $this->call('nightwatch:agent');
-        }
-
-        exit(0);
-    }
-}
diff --git a/app/Console/Commands/Scheduler.php b/app/Console/Commands/Scheduler.php
deleted file mode 100644
index ee64368c3..000000000
--- a/app/Console/Commands/Scheduler.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-
-class Scheduler extends Command
-{
-    protected $signature = 'start:scheduler';
-
-    protected $description = 'Start Scheduler';
-
-    public function handle()
-    {
-        if (config('constants.horizon.is_scheduler_enabled')) {
-            $this->info('Scheduler is enabled on this server.');
-            $this->call('schedule:work');
-            exit(0);
-        } else {
-            exit(0);
-        }
-    }
-}
diff --git a/docker/development/etc/s6-overlay/s6-rc.d/horizon/run b/docker/development/etc/s6-overlay/s6-rc.d/horizon/run
index ada19b3a3..e6a17f858 100644
--- a/docker/development/etc/s6-overlay/s6-rc.d/horizon/run
+++ b/docker/development/etc/s6-overlay/s6-rc.d/horizon/run
@@ -1,12 +1,11 @@
-#!/command/execlineb -P
+#!/bin/sh
 
-# Use with-contenv to ensure environment variables are available
-with-contenv
 cd /var/www/html
 
-foreground {
-    php
-    artisan
-    start:horizon
-}
+if grep -qE '^HORIZON_ENABLED=false' .env 2>/dev/null; then
+    echo "horizon: disabled, sleeping."
+    exec sleep infinity
+fi
 
+echo "horizon: enabled, starting..."
+exec php artisan horizon
diff --git a/docker/development/etc/s6-overlay/s6-rc.d/nightwatch-agent/run b/docker/development/etc/s6-overlay/s6-rc.d/nightwatch-agent/run
index 1166ccd08..80b421c92 100644
--- a/docker/development/etc/s6-overlay/s6-rc.d/nightwatch-agent/run
+++ b/docker/development/etc/s6-overlay/s6-rc.d/nightwatch-agent/run
@@ -1,12 +1,11 @@
-#!/command/execlineb -P
+#!/bin/sh
 
-# Use with-contenv to ensure environment variables are available
-with-contenv
 cd /var/www/html
 
-foreground {
-    php
-    artisan
-    start:nightwatch
-}
+if grep -qE '^NIGHTWATCH_ENABLED=true' .env 2>/dev/null; then
+    echo "nightwatch-agent: enabled, starting..."
+    exec php artisan nightwatch:agent
+fi
 
+echo "nightwatch-agent: disabled, sleeping."
+exec sleep infinity
diff --git a/docker/development/etc/s6-overlay/s6-rc.d/scheduler-worker/run b/docker/development/etc/s6-overlay/s6-rc.d/scheduler-worker/run
index b81a44833..6c4d2be9f 100644
--- a/docker/development/etc/s6-overlay/s6-rc.d/scheduler-worker/run
+++ b/docker/development/etc/s6-overlay/s6-rc.d/scheduler-worker/run
@@ -1,13 +1,11 @@
-#!/command/execlineb -P
+#!/bin/sh
 
-# Use with-contenv to ensure environment variables are available
-with-contenv
 cd /var/www/html
 
-foreground {
-    php
-    artisan
-    start:scheduler
-}
-
+if grep -qE '^SCHEDULER_ENABLED=false' .env 2>/dev/null; then
+    echo "scheduler-worker: disabled, sleeping."
+    exec sleep infinity
+fi
 
+echo "scheduler-worker: enabled, starting..."
+exec php artisan schedule:work
diff --git a/docker/production/etc/s6-overlay/s6-rc.d/horizon/run b/docker/production/etc/s6-overlay/s6-rc.d/horizon/run
index be6647607..e6a17f858 100644
--- a/docker/production/etc/s6-overlay/s6-rc.d/horizon/run
+++ b/docker/production/etc/s6-overlay/s6-rc.d/horizon/run
@@ -1,11 +1,11 @@
-#!/command/execlineb -P
+#!/bin/sh
 
-# Use with-contenv to ensure environment variables are available
-with-contenv
 cd /var/www/html
-foreground {
-    php
-    artisan
-    start:horizon
-}
 
+if grep -qE '^HORIZON_ENABLED=false' .env 2>/dev/null; then
+    echo "horizon: disabled, sleeping."
+    exec sleep infinity
+fi
+
+echo "horizon: enabled, starting..."
+exec php artisan horizon
diff --git a/docker/production/etc/s6-overlay/s6-rc.d/nightwatch-agent/run b/docker/production/etc/s6-overlay/s6-rc.d/nightwatch-agent/run
index 80d73eadb..80b421c92 100644
--- a/docker/production/etc/s6-overlay/s6-rc.d/nightwatch-agent/run
+++ b/docker/production/etc/s6-overlay/s6-rc.d/nightwatch-agent/run
@@ -1,11 +1,11 @@
-#!/command/execlineb -P
+#!/bin/sh
 
-# Use with-contenv to ensure environment variables are available
-with-contenv
 cd /var/www/html
-foreground {
-    php
-    artisan
-    start:nightwatch
-}
 
+if grep -qE '^NIGHTWATCH_ENABLED=true' .env 2>/dev/null; then
+    echo "nightwatch-agent: enabled, starting..."
+    exec php artisan nightwatch:agent
+fi
+
+echo "nightwatch-agent: disabled, sleeping."
+exec sleep infinity
diff --git a/docker/production/etc/s6-overlay/s6-rc.d/scheduler-worker/run b/docker/production/etc/s6-overlay/s6-rc.d/scheduler-worker/run
index a2ecb0a73..6c4d2be9f 100644
--- a/docker/production/etc/s6-overlay/s6-rc.d/scheduler-worker/run
+++ b/docker/production/etc/s6-overlay/s6-rc.d/scheduler-worker/run
@@ -1,10 +1,11 @@
-#!/command/execlineb -P
+#!/bin/sh
 
-# Use with-contenv to ensure environment variables are available
-with-contenv
 cd /var/www/html
-foreground {
-    php
-    artisan
-    start:scheduler
-}
+
+if grep -qE '^SCHEDULER_ENABLED=false' .env 2>/dev/null; then
+    echo "scheduler-worker: disabled, sleeping."
+    exec sleep infinity
+fi
+
+echo "scheduler-worker: enabled, starting..."
+exec php artisan schedule:work