diff --git a/app/Actions/Database/StartRedis.php b/app/Actions/Database/StartRedis.php
index 6d1548357..eeddab924 100644
--- a/app/Actions/Database/StartRedis.php
+++ b/app/Actions/Database/StartRedis.php
@@ -20,42 +20,10 @@ class StartRedis
     public function handle(StandaloneRedis $database)
     {
         $this->database = $database;
-        //$this->configuration_dir = database_configuration_dir().'/'.$this->database->uuid;
-
-        //$this->add_custom_redis();
-
-        // $startCommand = "redis-server";
-        // $additionalArgs = [];
-
-        // if (!is_null($this->database->redis_conf) && !empty($this->database->redis_conf)) {
-        //     ray("Using custom Redis configuration");
-        //     $additionalArgs[] = "{$this->configuration_dir}/redis.conf";
-            
-        //     // Check if the custom config contains a requirepass directive
-        //     $configContent = file_get_contents("{$this->configuration_dir}/redis.conf");
-        //     if (strpos($configContent, 'requirepass') === false) {
-        //         $additionalArgs[] = "--requirepass {$this->database->redis_password}";
-        //         ray("No requirepass in custom config, adding it as an argument");
-        //     } else {
-        //         ray("requirepass found in custom config");
-        //     }
-        // } else {
-        //     $additionalArgs[] = "--requirepass {$this->database->redis_password}";
-        //     $additionalArgs[] = "--appendonly yes";
-        //     ray("No custom config, using default arguments");
-        // }
-
-        // if (!empty($additionalArgs)) {
-        //     $startCommand .= " " . implode(" ", $additionalArgs);
-        // }
-
-        // ray("Final start command: " . $startCommand);
 
         $startCommand = "redis-server --requirepass {$this->database->redis_password} --appendonly yes";
 
-        
         $container_name = $this->database->uuid;
-
         $this->configuration_dir = database_configuration_dir().'/'.$container_name;
 
         $this->commands = [
@@ -63,14 +31,12 @@ class StartRedis
             "mkdir -p $this->configuration_dir",
         ];
 
-        
         $persistent_storages = $this->generate_local_persistent_volumes();
         $persistent_file_volumes = $this->database->fileStorages()->get();
         $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
         $environment_variables = $this->generate_environment_variables();
         $this->add_custom_redis();
 
-
         $docker_compose = [
             'services' => [
                 $container_name => [
@@ -116,14 +82,7 @@ class StartRedis
             data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
         }
         if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
-            $docker_compose['services'][$container_name]['logging'] = [
-                'driver' => 'fluentd',
-                'options' => [
-                    'fluentd-address' => 'tcp://127.0.0.1:24224',
-                    'fluentd-async' => 'true',
-                    'fluentd-sub-second-precision' => 'true',
-                ],
-            ];
+            $docker_compose['services'][$container_name]['logging'] = generate_fluentd_configuration();
         }
         if (count($this->database->ports_mappings_array) > 0) {
             $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
@@ -147,8 +106,12 @@ class StartRedis
                 'read_only' => true,
             ];
             $docker_compose['services'][$container_name]['command'] = "redis-server /usr/local/etc/redis/redis.conf --requirepass {$this->database->redis_password} --appendonly yes";
-
         }
+
+        // Add custom docker run options
+        $docker_run_options = convert_docker_run_to_compose($this->database->custom_docker_run_options);
+        $docker_compose = generate_custom_docker_run_options_for_databases($docker_run_options, $docker_compose, $container_name, $this->database->destination->network);
+
         $docker_compose = Yaml::dump($docker_compose, 10);
         $docker_compose_base64 = base64_encode($docker_compose);
         $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d | tee $this->configuration_dir/docker-compose.yml > /dev/null";
@@ -201,30 +164,11 @@ class StartRedis
             $environment_variables->push("$env->key=$env->real_value");
         }
 
-        $redis_version = $this->get_redis_version();
-
-        if (version_compare($redis_version, '6.0', '>=')) {
-            if ($environment_variables->filter(fn ($env) => str($env)->contains('REDIS_USERNAME'))->isEmpty()) {
-                $environment_variables->push("REDIS_USERNAME={$this->database->redis_username}");
-            }
-        }
-
         if ($environment_variables->filter(fn ($env) => str($env)->contains('REDIS_PASSWORD'))->isEmpty()) {
             $environment_variables->push("REDIS_PASSWORD={$this->database->redis_password}");
         }
 
-        ray('Initial environment variables:', $environment_variables->toArray());
-
-        // Overwrite with UI-set environment variables
-        $ui_variables = $this->database->environment_variables()->get();//this is working
-        ray('UI-set environment variables:', $ui_variables->toArray());
-
-        foreach ($ui_variables as $ui_variable) { //the overwrite is not working it is set wrong
-            $environment_variables = $environment_variables->reject(fn ($env) => str($env)->startsWith("{$ui_variable->key}="));
-            $environment_variables->push("{$ui_variable->key}={$ui_variable->real_value}");
-        }
-
-        ray('Final environment variables:', $environment_variables->toArray());
+        add_coolify_default_environment_variables($this->database, $environment_variables, $environment_variables);
 
         return $environment_variables->all();
     }
@@ -236,8 +180,8 @@ class StartRedis
         }
         $filename = 'redis.conf';
         Storage::disk('local')->put("tmp/redis.conf_{$this->database->uuid}", $this->database->redis_conf);
-        $path = Storage::path("tmp/redis.conf_{$this->database->uuid}");        
+        $path = Storage::path("tmp/redis.conf_{$this->database->uuid}");
         instant_scp($path, "{$this->configuration_dir}/{$filename}", $this->database->destination->server);
         Storage::disk('local')->delete("tmp/redis.conf_{$this->database->uuid}");
     }
-}
\ No newline at end of file
+}