diff --git a/modules/pi_control/bootstrap.php b/modules/pi_control/bootstrap.php
index 5ed8314..1a384e8 100644
--- a/modules/pi_control/bootstrap.php
+++ b/modules/pi_control/bootstrap.php
@@ -35,10 +35,10 @@ $mm->registerFunction($moduleName, 'pdo', function () use ($moduleName): \PDO {
 $mm->registerFunction($moduleName, 'redis', function () use ($moduleName) {
     $settings = modules()->settings($moduleName);
     $redis = (array)($settings['redis'] ?? []);
-    $host = (string)($redis['host'] ?? getenv('PI_CONTROL_REDIS_HOST') ?: 'redis');
-    $port = (int)($redis['port'] ?? (getenv('PI_CONTROL_REDIS_PORT') !== false ? (int)getenv('PI_CONTROL_REDIS_PORT') : 6379));
-    $password = (string)($redis['password'] ?? getenv('PI_CONTROL_REDIS_PASSWORD') ?: '');
-    $db = (int)($redis['db'] ?? (getenv('PI_CONTROL_REDIS_DB') !== false ? (int)getenv('PI_CONTROL_REDIS_DB') : 0));
+    $host = (string)($redis['host'] ?? ($settings['redis.host'] ?? getenv('PI_CONTROL_REDIS_HOST') ?: 'redis'));
+    $port = (int)($redis['port'] ?? ($settings['redis.port'] ?? (getenv('PI_CONTROL_REDIS_PORT') !== false ? (int)getenv('PI_CONTROL_REDIS_PORT') : 6379)));
+    $password = (string)($redis['password'] ?? ($settings['redis.password'] ?? getenv('PI_CONTROL_REDIS_PASSWORD') ?: ''));
+    $db = (int)($redis['db'] ?? ($settings['redis.db'] ?? (getenv('PI_CONTROL_REDIS_DB') !== false ? (int)getenv('PI_CONTROL_REDIS_DB') : 0)));
 
     return new \App\RedisClient($host, $port, $password !== '' ? $password : null, $db);
 });
diff --git a/modules/pi_control/pages/console.php b/modules/pi_control/pages/console.php
index 29b0b4e..8c8054b 100644
--- a/modules/pi_control/pages/console.php
+++ b/modules/pi_control/pages/console.php
@@ -15,7 +15,7 @@ $ttydUrl = trim((string)($settings['ttyd_url'] ?? '/ttyd'));
 $defaultProvider = 'ttyd';
 $defaultTimeout = (int)($settings['exec_default_timeout'] ?? (getenv('PI_CONTROL_EXEC_DEFAULT_TIMEOUT') !== false ? (int)getenv('PI_CONTROL_EXEC_DEFAULT_TIMEOUT') : 300));
 $defaultTimeout = $defaultTimeout > 0 ? $defaultTimeout : 300;
-$queueName = (string)($settings['redis']['queue'] ?? (getenv('PI_CONTROL_REDIS_QUEUE') ?: 'pi_control:queue'));
+$queueName = (string)($settings['redis']['queue'] ?? ($settings['redis.queue'] ?? (getenv('PI_CONTROL_REDIS_QUEUE') ?: 'pi_control:queue')));
 $tokenTtl = (int)($settings['terminal_token_ttl'] ?? 10);
 $tokenTtl = $tokenTtl > 0 ? $tokenTtl : 10;
 
diff --git a/tools/pi_control/worker.php b/tools/pi_control/worker.php
index 0bdf34f..c596aa9 100644
--- a/tools/pi_control/worker.php
+++ b/tools/pi_control/worker.php
@@ -27,7 +27,7 @@ $nowExpr = $driver === 'pgsql' ? 'NOW()' : "DATETIME('now')";
 while (true) {
     if (time() - $lastSettingsAt >= $settingsReloadSec) {
         $settings = modules()->settings($module);
-        $queueName = (string)($settings['redis']['queue'] ?? (getenv('PI_CONTROL_REDIS_QUEUE') ?: 'pi_control:queue'));
+        $queueName = (string)($settings['redis']['queue'] ?? ($settings['redis.queue'] ?? (getenv('PI_CONTROL_REDIS_QUEUE') ?: 'pi_control:queue')));
         $defaultTimeout = (int)($settings['exec_default_timeout'] ?? (getenv('PI_CONTROL_EXEC_DEFAULT_TIMEOUT') !== false ? (int)getenv('PI_CONTROL_EXEC_DEFAULT_TIMEOUT') : 300));
         $defaultTimeout = $defaultTimeout > 0 ? $defaultTimeout : 300;
         $redis = module_fn($module, 'redis');