diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000..3ded74ce3
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1 @@
+> Always use `next` branch as destination branch for PRs, not `main`
diff --git a/app/Console/Commands/CleanupStuckedResources.php b/app/Console/Commands/CleanupStuckedResources.php
index 32ba67a1e..afc00140c 100644
--- a/app/Console/Commands/CleanupStuckedResources.php
+++ b/app/Console/Commands/CleanupStuckedResources.php
@@ -62,7 +62,7 @@ private function cleanup_stucked_resources()
             $keydbs = StandaloneKeydb::withTrashed()->whereNotNull('deleted_at')->get();
             foreach ($keydbs as $keydb) {
                 echo "Deleting stuck keydb: {$keydb->name}\n";
-                $redis->forceDelete();
+                $keydb->forceDelete();
             }
         } catch (\Throwable $e) {
             echo "Error in cleaning stuck keydb: {$e->getMessage()}\n";
@@ -71,7 +71,7 @@ private function cleanup_stucked_resources()
             $dragonflies = StandaloneDragonfly::withTrashed()->whereNotNull('deleted_at')->get();
             foreach ($dragonflies as $dragonfly) {
                 echo "Deleting stuck dragonfly: {$dragonfly->name}\n";
-                $redis->forceDelete();
+                $dragonfly->forceDelete();
             }
         } catch (\Throwable $e) {
             echo "Error in cleaning stuck dragonfly: {$e->getMessage()}\n";
@@ -80,7 +80,7 @@ private function cleanup_stucked_resources()
             $clickhouses = StandaloneClickhouse::withTrashed()->whereNotNull('deleted_at')->get();
             foreach ($clickhouses as $clickhouse) {
                 echo "Deleting stuck clickhouse: {$clickhouse->name}\n";
-                $redis->forceDelete();
+                $clickhouse->forceDelete();
             }
         } catch (\Throwable $e) {
             echo "Error in cleaning stuck clickhouse: {$e->getMessage()}\n";
diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php
index acdff5b35..06414f715 100644
--- a/app/Console/Commands/Init.php
+++ b/app/Console/Commands/Init.php
@@ -20,6 +20,7 @@ class Init extends Command
     public function handle()
     {
         $this->alive();
+        get_public_ips();
         $full_cleanup = $this->option('full-cleanup');
         $cleanup_deployments = $this->option('cleanup-deployments');
         if ($cleanup_deployments) {
@@ -56,6 +57,7 @@ public function handle()
         $this->cleanup_stucked_helper_containers();
         $this->call('cleanup:stucked-resources');
     }
+
     private function restore_coolify_db_backup()
     {
         try {
diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 52afdd47e..3d04be7d3 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -718,10 +718,11 @@ private function save_environment_variables()
                 if ($env->version === '4.0.0-beta.239') {
                     $real_value = $env->real_value;
                 } else {
-                    $real_value = escapeEnvVariables($env->real_value);
-                }
-                if ($env->is_literal) {
-                    $real_value = '\'' . $real_value . '\'';
+                    if ($env->is_literal) {
+                        $real_value = '\'' . $real_value . '\'';
+                    } else {
+                        $real_value = escapeEnvVariables($env->real_value);
+                    }
                 }
                 $envs->push($env->key . '=' . $real_value);
             }
@@ -750,10 +751,11 @@ private function save_environment_variables()
                 if ($env->version === '4.0.0-beta.239') {
                     $real_value = $env->real_value;
                 } else {
-                    $real_value = escapeEnvVariables($env->real_value);
-                }
-                if ($env->is_literal) {
-                    $real_value = '\'' . $real_value . '\'';
+                    if ($env->is_literal) {
+                        $real_value = '\'' . $real_value . '\'';
+                    } else {
+                        $real_value = escapeEnvVariables($env->real_value);
+                    }
                 }
                 $envs->push($env->key . '=' . $real_value);
             }
@@ -1506,7 +1508,7 @@ private function generate_local_persistent_volumes_only_volume_names()
         return $local_persistent_volumes_names;
     }
 
-    private function generate_environment_variables($ports)
+    /*private function generate_environment_variables($ports)
     {
         $environment_variables = collect();
         if ($this->pull_request_id === 0) {
@@ -1524,8 +1526,10 @@ private function generate_environment_variables($ports)
                 }
                 if ($env->is_literal) {
                     $real_value = escapeDollarSign($real_value);
+                    $environment_variables->push("$env->key='$real_value'");
+                } else {
+                    $environment_variables->push("$env->key=$real_value");
                 }
-                $environment_variables->push("$env->key=$real_value");
             }
             foreach ($this->application->nixpacks_environment_variables as $env) {
                 if ($env->version === '4.0.0-beta.239') {
@@ -1535,8 +1539,10 @@ private function generate_environment_variables($ports)
                 }
                 if ($env->is_literal) {
                     $real_value = escapeDollarSign($real_value);
+                    $environment_variables->push("$env->key='$real_value'");
+                } else {
+                    $environment_variables->push("$env->key=$real_value");
                 }
-                $environment_variables->push("$env->key=$real_value");
             }
         } else {
             foreach ($this->application->runtime_environment_variables_preview as $env) {
@@ -1547,8 +1553,10 @@ private function generate_environment_variables($ports)
                 }
                 if ($env->is_literal) {
                     $real_value = escapeDollarSign($real_value);
+                    $environment_variables->push("$env->key='$real_value'");
+                } else {
+                    $environment_variables->push("$env->key=$real_value");
                 }
-                $environment_variables->push("$env->key=$real_value");
             }
             foreach ($this->application->nixpacks_environment_variables_preview as $env) {
                 if ($env->version === '4.0.0-beta.239') {
@@ -1558,8 +1566,10 @@ private function generate_environment_variables($ports)
                 }
                 if ($env->is_literal) {
                     $real_value = escapeDollarSign($real_value);
+                    $environment_variables->push("$env->key='$real_value'");
+                } else {
+                    $environment_variables->push("$env->key=$real_value");
                 }
-                $environment_variables->push("$env->key=$real_value");
             }
         }
         // Add PORT if not exists, use the first port as default
@@ -1577,8 +1587,9 @@ private function generate_environment_variables($ports)
                 $environment_variables->push("SOURCE_COMMIT=unknown");
             }
         }
+        ray($environment_variables->all());
         return $environment_variables->all();
-    }
+    }*/
 
     private function generate_healthcheck_commands()
     {
diff --git a/app/Livewire/Project/Application/Advanced.php b/app/Livewire/Project/Application/Advanced.php
index 278cab5a1..d35867e8f 100644
--- a/app/Livewire/Project/Application/Advanced.php
+++ b/app/Livewire/Project/Application/Advanced.php
@@ -27,6 +27,8 @@ class Advanced extends Component
         'application.settings.gpu_count' => 'string|required',
         'application.settings.gpu_device_ids' => 'string|required',
         'application.settings.gpu_options' => 'string|required',
+        'application.settings.is_raw_compose_deployment_enabled' => 'boolean|required',
+        'application.settings.connect_to_docker_network' => 'boolean|required',
     ];
     public function mount() {
         $this->is_force_https_enabled = $this->application->isForceHttpsEnabled();
@@ -54,8 +56,14 @@ public function instantSave()
             $this->application->settings->is_stripprefix_enabled = $this->is_stripprefix_enabled;
             $this->dispatch('resetDefaultLabels', false);
         }
+        if ($this->application->settings->is_raw_compose_deployment_enabled) {
+            $this->application->parseRawCompose();
+        } else {
+            $this->application->parseCompose();
+        }
         $this->application->settings->save();
         $this->dispatch('success', 'Settings saved.');
+        $this->dispatch('configurationChanged');
     }
     public function submit() {
         if ($this->application->settings->gpu_count && $this->application->settings->gpu_device_ids) {
diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
index 022a7b710..6926e52cb 100644
--- a/app/Livewire/Project/Application/General.php
+++ b/app/Livewire/Project/Application/General.php
@@ -34,7 +34,8 @@ class General extends Component
     public $parsedServiceDomains = [];
 
     protected $listeners = [
-        'resetDefaultLabels'
+        'resetDefaultLabels',
+        'configurationChanged' => '$refresh'
     ];
     protected $rules = [
         'application.name' => 'required',
@@ -72,7 +73,6 @@ class General extends Component
         'application.post_deployment_command' => 'nullable',
         'application.post_deployment_command_container' => 'nullable',
         'application.settings.is_static' => 'boolean|required',
-        'application.settings.is_raw_compose_deployment_enabled' => 'boolean|required',
         'application.settings.is_build_server_enabled' => 'boolean|required',
         'application.watch_paths' => 'nullable',
     ];
@@ -108,7 +108,6 @@ class General extends Component
         'application.docker_compose_custom_start_command' => 'Docker compose custom start command',
         'application.docker_compose_custom_build_command' => 'Docker compose custom build command',
         'application.settings.is_static' => 'Is static',
-        'application.settings.is_raw_compose_deployment_enabled' => 'Is raw compose deployment enabled',
         'application.settings.is_build_server_enabled' => 'Is build server enabled',
         'application.watch_paths' => 'Watch paths',
     ];
@@ -337,11 +336,6 @@ public function submit($showToaster = true)
                         check_domain_usage(resource: $this->application);
                     }
                 }
-                if ($this->application->settings->is_raw_compose_deployment_enabled) {
-                    $this->application->parseRawCompose();
-                } else {
-                    $this->parsedServices = $this->application->parseCompose();
-                }
             }
             $this->application->custom_labels = base64_encode($this->customLabels);
             $this->application->save();
diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/Show.php b/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
index 9beb7cfab..65e91e60a 100644
--- a/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
+++ b/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
@@ -50,9 +50,9 @@ public function mount()
     public function checkEnvs()
     {
         $this->isDisabled = false;
-        // if (str($this->env->key)->startsWith('SERVICE_FQDN') || str($this->env->key)->startsWith('SERVICE_URL')) {
-        //     $this->isDisabled = true;
-        // }
+        if (str($this->env->key)->startsWith('SERVICE_FQDN') || str($this->env->key)->startsWith('SERVICE_URL')) {
+            $this->isDisabled = true;
+        }
         if ($this->env->is_shown_once) {
             $this->isLocked = true;
         }
diff --git a/app/Livewire/Tags/Deployments.php b/app/Livewire/Tags/Deployments.php
new file mode 100644
index 000000000..5c43edfb1
--- /dev/null
+++ b/app/Livewire/Tags/Deployments.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Livewire\Tags;
+
+use App\Models\ApplicationDeploymentQueue;
+use Livewire\Component;
+
+class Deployments extends Component
+{
+    public $deployments_per_tag_per_server = [];
+    public $resource_ids = [];
+    public function render()
+    {
+        return view('livewire.tags.deployments');
+    }
+    public function get_deployments()
+    {
+        try {
+            $this->deployments_per_tag_per_server = ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->whereIn('application_id', $this->resource_ids)->get([
+                "id",
+                "application_id",
+                "application_name",
+                "deployment_url",
+                "pull_request_id",
+                "server_name",
+                "server_id",
+                "status"
+            ])->sortBy('id')->groupBy('server_name')->toArray();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+}
diff --git a/app/Livewire/Tags/Index.php b/app/Livewire/Tags/Index.php
index 75ed06f7b..d04bb53f9 100644
--- a/app/Livewire/Tags/Index.php
+++ b/app/Livewire/Tags/Index.php
@@ -20,32 +20,22 @@ class Index extends Component
     public $webhook = null;
     public $deployments_per_tag_per_server = [];
 
-    public function updatedTag()
+    public function tag_updated()
     {
+        if ($this->tag == "") {
+            return;
+        }
         $tag = $this->tags->where('name', $this->tag)->first();
+        if (!$tag) {
+            $this->dispatch('error', "Tag ({$this->tag}) not found.");
+            $this->tag = "";
+            return;
+        }
         $this->webhook = generatTagDeployWebhook($tag->name);
         $this->applications = $tag->applications()->get();
         $this->services = $tag->services()->get();
-        $this->get_deployments();
-    }
-    public function get_deployments()
-    {
-        try {
-            $resource_ids = $this->applications->pluck('id');
-            $this->deployments_per_tag_per_server = ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->whereIn('application_id', $resource_ids)->get([
-                "id",
-                "application_id",
-                "application_name",
-                "deployment_url",
-                "pull_request_id",
-                "server_name",
-                "server_id",
-                "status"
-            ])->sortBy('id')->groupBy('server_name')->toArray();
-        } catch (\Exception $e) {
-            return handleError($e, $this);
-        }
     }
+
     public function redeploy_all()
     {
         try {
@@ -67,7 +57,7 @@ public function mount()
     {
         $this->tags = Tag::ownedByCurrentTeam()->get()->unique('name')->sortBy('name');
         if ($this->tag) {
-            $this->updatedTag();
+            $this->tag_updated();
         }
     }
     public function render()
diff --git a/app/Models/Application.php b/app/Models/Application.php
index 66e18565b..971f1e894 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -579,9 +579,9 @@ function generateGitImportCommands(string $deployment_uuid, int $pull_request_id
         ['repository' => $customRepository, 'port' => $customPort] = $this->customRepository();
         $baseDir = $custom_base_dir ?? $this->generateBaseDir($deployment_uuid);
         $commands = collect([]);
-        $git_clone_command = "git clone -b {$this->git_branch}";
+        $git_clone_command = "git clone -b \"{$this->git_branch}\"";
         if ($only_checkout) {
-            $git_clone_command = "git clone --no-checkout -b {$this->git_branch}";
+            $git_clone_command = "git clone --no-checkout -b \"{$this->git_branch}\"";
         }
         if ($pull_request_id !== 0) {
             $pr_branch_name = "pr-{$pull_request_id}-coolify";
diff --git a/app/Models/StandaloneClickhouse.php b/app/Models/StandaloneClickhouse.php
index 2197d51df..3746a32f5 100644
--- a/app/Models/StandaloneClickhouse.php
+++ b/app/Models/StandaloneClickhouse.php
@@ -207,4 +207,7 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
+    public function database_name() {
+        return $this->clickhouse_db;
+    }
 }
diff --git a/app/Models/StandaloneDragonfly.php b/app/Models/StandaloneDragonfly.php
index 7b18666b8..adc1ea6cc 100644
--- a/app/Models/StandaloneDragonfly.php
+++ b/app/Models/StandaloneDragonfly.php
@@ -207,4 +207,7 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
+    public function database_name() {
+        return '0';
+    }
 }
diff --git a/app/Models/StandaloneKeydb.php b/app/Models/StandaloneKeydb.php
index 1dc55228a..ff91322a0 100644
--- a/app/Models/StandaloneKeydb.php
+++ b/app/Models/StandaloneKeydb.php
@@ -208,5 +208,7 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
-
+    public function database_name() {
+        return '0';
+    }
 }
diff --git a/app/Models/StandaloneMariadb.php b/app/Models/StandaloneMariadb.php
index 5e18bbfde..37d39f882 100644
--- a/app/Models/StandaloneMariadb.php
+++ b/app/Models/StandaloneMariadb.php
@@ -208,4 +208,7 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
+    public function database_name() {
+        return $this->mariadb_database;
+    }
 }
diff --git a/app/Models/StandaloneMongodb.php b/app/Models/StandaloneMongodb.php
index 8e4d327a3..5538efe1a 100644
--- a/app/Models/StandaloneMongodb.php
+++ b/app/Models/StandaloneMongodb.php
@@ -223,4 +223,7 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
+    public function database_name() {
+        return $this->mongo_db;
+    }
 }
diff --git a/app/Models/StandaloneMysql.php b/app/Models/StandaloneMysql.php
index eede451d7..53e9b6f22 100644
--- a/app/Models/StandaloneMysql.php
+++ b/app/Models/StandaloneMysql.php
@@ -209,4 +209,7 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
+    public function database_name() {
+        return $this->mysql_database;
+    }
 }
diff --git a/app/Models/StandalonePostgresql.php b/app/Models/StandalonePostgresql.php
index cf449a815..6435c49de 100644
--- a/app/Models/StandalonePostgresql.php
+++ b/app/Models/StandalonePostgresql.php
@@ -208,4 +208,7 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
+    public function database_name() {
+        return $this->postgres_db;
+    }
 }
diff --git a/app/Models/StandaloneRedis.php b/app/Models/StandaloneRedis.php
index da4701df9..de18c8c07 100644
--- a/app/Models/StandaloneRedis.php
+++ b/app/Models/StandaloneRedis.php
@@ -204,4 +204,7 @@ public function scheduledBackups()
     {
         return $this->morphMany(ScheduledDatabaseBackup::class, 'database');
     }
+    public function database_name() {
+        return '0';
+    }
 }
diff --git a/app/Notifications/Database/BackupFailed.php b/app/Notifications/Database/BackupFailed.php
index f149a9d06..3aa63ffd9 100644
--- a/app/Notifications/Database/BackupFailed.php
+++ b/app/Notifications/Database/BackupFailed.php
@@ -17,11 +17,13 @@ class BackupFailed extends Notification implements ShouldQueue
 
     public $tries = 1;
     public string $name;
+    public string $database_name;
     public string $frequency;
 
     public function __construct(ScheduledDatabaseBackup $backup, public $database, public $output)
     {
         $this->name = $database->name;
+        $this->database_name = $database->database_name();
         $this->frequency = $backup->frequency;
     }
 
@@ -36,6 +38,7 @@ public function toMail(): MailMessage
         $mail->subject("Coolify: [ACTION REQUIRED] Backup FAILED for {$this->database->name}");
         $mail->view('emails.backup-failed', [
             'name' => $this->name,
+            'database_name' => $this->database_name,
             'frequency' => $this->frequency,
             'output' => $this->output,
         ]);
@@ -44,11 +47,11 @@ public function toMail(): MailMessage
 
     public function toDiscord(): string
     {
-        return "Coolify: Database backup for {$this->name} with frequency of {$this->frequency} was FAILED.\n\nReason: {$this->output}";
+        return "Coolify: Database backup for {$this->name} (db:{$this->database_name}) with frequency of {$this->frequency} was FAILED.\n\nReason: {$this->output}";
     }
     public function toTelegram(): array
     {
-        $message = "Coolify:  Database backup for {$this->name} with frequency of {$this->frequency} was FAILED.\n\nReason: {$this->output}";
+        $message = "Coolify:  Database backup for {$this->name} (db:{$this->database_name}) with frequency of {$this->frequency} was FAILED.\n\nReason: {$this->output}";
         return [
             "message" => $message,
         ];
diff --git a/app/Notifications/Database/BackupSuccess.php b/app/Notifications/Database/BackupSuccess.php
index bbe0bc6d3..9ca3234e1 100644
--- a/app/Notifications/Database/BackupSuccess.php
+++ b/app/Notifications/Database/BackupSuccess.php
@@ -14,11 +14,13 @@ class BackupSuccess extends Notification implements ShouldQueue
 
     public $tries = 1;
     public string $name;
+    public string $database_name;
     public string $frequency;
 
     public function __construct(ScheduledDatabaseBackup $backup, public $database)
     {
         $this->name = $database->name;
+        $this->database_name = $database->database_name();
         $this->frequency = $backup->frequency;
     }
 
@@ -33,6 +35,7 @@ public function toMail(): MailMessage
         $mail->subject("Coolify: Backup successfully done for {$this->database->name}");
         $mail->view('emails.backup-success', [
             'name' => $this->name,
+            'database_name' => $this->database_name,
             'frequency' => $this->frequency,
         ]);
         return $mail;
@@ -40,11 +43,11 @@ public function toMail(): MailMessage
 
     public function toDiscord(): string
     {
-        return "Coolify:  Database backup for {$this->name} with frequency of {$this->frequency} was successful.";
+        return "Coolify: Database backup for {$this->name} (db:{$this->database_name}) with frequency of {$this->frequency} was successful.";
     }
     public function toTelegram(): array
     {
-        $message = "Coolify: Database backup for {$this->name} with frequency of {$this->frequency} was successful.";
+        $message = "Coolify: Database backup for {$this->name} (db:{$this->database_name}) with frequency of {$this->frequency} was successful.";
         return [
             "message" => $message,
         ];
diff --git a/app/View/Components/Forms/Datalist.php b/app/View/Components/Forms/Datalist.php
new file mode 100644
index 000000000..d4ed44266
--- /dev/null
+++ b/app/View/Components/Forms/Datalist.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\View\Components\Forms;
+
+use Closure;
+use Illuminate\Contracts\View\View;
+use Illuminate\Support\Str;
+use Illuminate\View\Component;
+use Visus\Cuid2\Cuid2;
+
+class Datalist extends Component
+{
+    /**
+     * Create a new component instance.
+     */
+    public function __construct(
+        public ?string $id = null,
+        public ?string $name = null,
+        public ?string $label = null,
+        public ?string $helper = null,
+        public bool    $required = false,
+        public string  $defaultClass = "input"
+    ) {
+        //
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     */
+    public function render(): View|Closure|string
+    {
+        if (is_null($this->id)) $this->id = new Cuid2(7);
+        if (is_null($this->name)) $this->name = $this->id;
+
+        $this->label = Str::title($this->label);
+        return view('components.forms.datalist');
+    }
+}
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 966b1db59..b2c34900e 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -29,11 +29,13 @@
 use Illuminate\Database\UniqueConstraintViolationException;
 use Illuminate\Mail\Message;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Process\Pool;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Process;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
@@ -1266,6 +1268,11 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                     $serviceLabels->push("$removedLabelName=$removedLabel");
                 }
             }
+            if ($serviceLabels->count() > 0) {
+                $serviceLabels = $serviceLabels->map(function ($value, $key) {
+                    return escapeDollarSign($value);
+                });
+            }
             $baseName = generateApplicationContainerName($resource, $pull_request_id);
             $containerName = "$serviceName-$baseName";
             if (count($serviceVolumes) > 0) {
@@ -1424,6 +1431,14 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
             foreach ($definedNetwork as $key => $network) {
                 $networks->put($network, null);
             }
+            if (data_get($resource, 'settings.connect_to_docker_network')) {
+                $network = $resource->destination->network;
+                $networks->put($network, null);
+                $topLevelNetworks->put($network,  [
+                    'name' => $network,
+                    'external' => true
+                ]);
+            }
             data_set($service, 'networks', $networks->toArray());
             // Get variables from the service
             foreach ($serviceVariables as $variableName => $variable) {
@@ -1585,7 +1600,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                     $fqdns = data_get($domains, "$serviceName.domain");
                     if ($fqdns) {
                         $fqdns = str($fqdns)->explode(',');
-                        $uuid = new Cuid2(7);
                         if ($pull_request_id !== 0) {
                             $fqdns = $fqdns->map(function ($fqdn) use ($pull_request_id, $resource) {
                                 $preview = ApplicationPreview::findPreviewByApplicationAndPullId($resource->id, $pull_request_id);
@@ -1604,13 +1618,13 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             });
                         }
                         $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(
-                            uuid: $uuid,
+                            uuid: $resource->uuid,
                             domains: $fqdns,
                             serviceLabels: $serviceLabels
                         ));
                         $serviceLabels = $serviceLabels->merge(fqdnLabelsForCaddy(
                             network: $resource->destination->network,
-                            uuid: $uuid,
+                            uuid: $resource->uuid,
                             domains: $fqdns,
                             serviceLabels: $serviceLabels
                         ));
@@ -2004,3 +2018,37 @@ function parseLineForSudo(string $command, Server $server): string
 
     return $command;
 }
+
+function get_public_ips()
+{
+    try {
+        echo "Refreshing public ips!\n";
+        $settings = InstanceSettings::get();
+        [$first, $second] = Process::concurrently(function (Pool $pool) {
+            $pool->path(__DIR__)->command('curl -4s https://ifconfig.io');
+            $pool->path(__DIR__)->command('curl -6s https://ifconfig.io');
+        });
+        $ipv4 = $first->output();
+        if ($ipv4) {
+            $ipv4 = trim($ipv4);
+            $validate_ipv4 = filter_var($ipv4, FILTER_VALIDATE_IP);
+            if ($validate_ipv4 == false) {
+                echo "Invalid ipv4: $ipv4\n";
+                return;
+            }
+            $settings->update(['public_ipv4' => $ipv4]);
+        }
+        $ipv6 = $second->output();
+        if ($ipv6) {
+            $ipv6 = trim($ipv6);
+            $validate_ipv6 = filter_var($ipv6, FILTER_VALIDATE_IP);
+            if ($validate_ipv6 == false) {
+                echo "Invalid ipv6: $ipv6\n";
+                return;
+            }
+            $settings->update(['public_ipv6' => $ipv6]);
+        }
+    } catch (\Throwable $e) {
+        echo "Error: {$e->getMessage()}\n";
+    }
+}
diff --git a/config/sentry.php b/config/sentry.php
index 7ae7ccfda..416daa809 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.266',
+    'release' => '4.0.0-beta.267',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index 7001afde8..66b6ee419 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.266';
+return '4.0.0-beta.267';
diff --git a/database/migrations/2024_04_25_073615_add_docker_network_to_application_settings.php b/database/migrations/2024_04_25_073615_add_docker_network_to_application_settings.php
new file mode 100644
index 000000000..aeae6f77d
--- /dev/null
+++ b/database/migrations/2024_04_25_073615_add_docker_network_to_application_settings.php
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('application_settings', function (Blueprint $table) {
+            $table->boolean('connect_to_docker_network')->default(false);
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('application_settings', function (Blueprint $table) {
+            $table->dropColumn('connect_to_docker_network');
+        });
+    }
+};
diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php
index 206e92f76..16dc3583e 100644
--- a/database/seeders/ProductionSeeder.php
+++ b/database/seeders/ProductionSeeder.php
@@ -177,27 +177,7 @@ public function run(): void
             }
         }
 
-        try {
-            $settings = InstanceSettings::get();
-            if (is_null($settings->public_ipv4)) {
-                $ipv4 = Process::run('curl -4s https://ifconfig.io')->output();
-                if ($ipv4) {
-                    $ipv4 = trim($ipv4);
-                    $ipv4 = filter_var($ipv4, FILTER_VALIDATE_IP);
-                    $settings->update(['public_ipv4' => $ipv4]);
-                }
-            }
-            if (is_null($settings->public_ipv6)) {
-                $ipv6 = Process::run('curl -6s https://ifconfig.io')->output();
-                if ($ipv6) {
-                    $ipv6 = trim($ipv6);
-                    $ipv6 = filter_var($ipv6, FILTER_VALIDATE_IP);
-                    $settings->update(['public_ipv6' => $ipv6]);
-                }
-            }
-        } catch (\Throwable $e) {
-            echo "Error: {$e->getMessage()}\n";
-        }
+        get_public_ips();
 
         $oauth_settings_seeder = new OauthSettingSeeder();
         $oauth_settings_seeder->run();
diff --git a/resources/css/app.css b/resources/css/app.css
index a10103ce8..1f218490d 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -133,6 +133,11 @@ .badge {
     @apply inline-block w-3 h-3 text-xs font-bold leading-none border rounded-full border-neutral-200 dark:border-black;
 }
 
+.badge-absolute {
+    @apply absolute top-0 right-0 w-2 h-2 border-none rounded-t-none rounded-r-none;
+
+}
+
 .badge-success {
     @apply bg-success;
 }
@@ -195,7 +200,7 @@ .kbd-custom {
 }
 
 .box {
-    @apply flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 bg-white border text-black dark:text-white hover:text-black border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:no-underline;
+    @apply relative flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 bg-white border text-black dark:text-white hover:text-black border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:no-underline;
 }
 .box-boarding {
     @apply flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 dark:text-white bg-neutral-50 border border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:text-black hover:no-underline text-black  ;
diff --git a/resources/views/components/forms/datalist.blade.php b/resources/views/components/forms/datalist.blade.php
new file mode 100644
index 000000000..c9710b728
--- /dev/null
+++ b/resources/views/components/forms/datalist.blade.php
@@ -0,0 +1,44 @@
+<div class="w-full">
+    <label>
+        @if ($label)
+            {{ $label }}
+            @if ($required)
+                <x-highlighted text="*" />
+            @endif
+            @if ($helper)
+                <x-helper :helper="$helper" />
+            @endif
+        @endif
+        <input list={{ $id }} {{ $attributes->merge(['class' => $defaultClass]) }} @required($required)
+            wire:dirty.class.remove='dark:text-white' wire:dirty.class="text-black bg-warning" wire:loading.attr="disabled"
+            name={{ $id }}
+            @if ($attributes->whereStartsWith('wire:model')->first()) {{ $attributes->whereStartsWith('wire:model')->first() }} @else wire:model={{ $id }} @endif
+            @if ($attributes->whereStartsWith('onUpdate')->first()) wire:change={{ $attributes->whereStartsWith('onUpdate')->first() }} wire:keydown.enter={{ $attributes->whereStartsWith('onUpdate')->first() }} wire:blur={{ $attributes->whereStartsWith('onUpdate')->first() }} @else wire:change={{ $id }} wire:blur={{ $id }} wire:keydown.enter={{ $id }} @endif>
+        <datalist id={{ $id }}>
+            {{ $slot }}
+        </datalist>
+    </label>
+    @error($id)
+        <label class="label">
+            <span class="text-red-500 label-text-alt">{{ $message }}</span>
+        </label>
+    @enderror
+    {{-- <script>
+        const input = document.querySelector(`input[list={{ $id }}]`);
+        input.addEventListener('focus', function(e) {
+            const input = e.target.value;
+            const datalist = document.getElementById('{{ $id }}');
+            if (datalist.options) {
+                for (let option of datalist.options) {
+                    // change background color to red on all options
+                    option.style.display = "none";
+                    if (option.value.includes(input)) {
+                        option.style.display = "block";
+                    }
+
+
+                }
+            }
+        });
+    </script> --}}
+</div>
diff --git a/resources/views/emails/backup-failed.blade.php b/resources/views/emails/backup-failed.blade.php
index de6a7c981..f50ff0c33 100644
--- a/resources/views/emails/backup-failed.blade.php
+++ b/resources/views/emails/backup-failed.blade.php
@@ -1,5 +1,5 @@
 <x-emails.layout>
-Database backup for {{ $name }} with frequency of {{ $frequency }} was FAILED.
+Database backup for {{ $name }} (db:{{$database_name}}) with frequency of {{ $frequency }} was FAILED.
 
 ### Reason
 
diff --git a/resources/views/emails/backup-success.blade.php b/resources/views/emails/backup-success.blade.php
index 0d54a254c..e48df9e6a 100644
--- a/resources/views/emails/backup-success.blade.php
+++ b/resources/views/emails/backup-success.blade.php
@@ -1,3 +1,3 @@
 <x-emails.layout>
-Database backup for {{ $name }} with frequency of {{ $frequency }} was successful.
+Database backup for {{ $name }} (db:{{ $database_name }}) with frequency of {{ $frequency }} was successful.
 </x-emails.layout>
diff --git a/resources/views/livewire/boarding/index.blade.php b/resources/views/livewire/boarding/index.blade.php
index 0f0dd8210..29bddbbaf 100644
--- a/resources/views/livewire/boarding/index.blade.php
+++ b/resources/views/livewire/boarding/index.blade.php
@@ -1,11 +1,13 @@
 @php use App\Enums\ProxyTypes; @endphp
 <section class="flex flex-col h-full lg:items-center lg:justify-center">
-    <div class="flex flex-col items-center justify-center p-10 mx-2 mt-10 bg-white border rounded-lg shadow lg:p-20 dark:bg-transparent dark:border-none max-w-7xl ">
+    <div
+        class="flex flex-col items-center justify-center p-10 mx-2 mt-10 bg-white border rounded-lg shadow lg:p-20 dark:bg-transparent dark:border-none max-w-7xl ">
         @if ($currentState === 'welcome')
             <h1 class="text-3xl font-bold lg:text-5xl">Welcome to Coolify</h1>
             <div class="py-6 text-center lg:text-xl">Let me help you set up the basics.</div>
             <div class="flex justify-center ">
-                <x-forms.button class="justify-center w-64 box-boarding" wire:click="$set('currentState','explanation')">Get
+                <x-forms.button class="justify-center w-64 box-boarding"
+                    wire:click="$set('currentState','explanation')">Get
                     Started
                 </x-forms.button>
             </div>
@@ -60,7 +62,8 @@
                         server.
                         <br />
                         Check this <a target="_blank" class="underline"
-                            href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.
+                            href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further
+                        help.
                         <x-forms.input readonly id="serverPublicKey"></x-forms.input>
                         <x-forms.button class="lg:w-64 box-boarding" wire:target="setServerType('localhost')"
                             wire:click="setServerType('localhost')">Check again
@@ -120,7 +123,8 @@
                 <x-slot:actions>
                     <div class="flex flex-col gap-4">
                         <div>
-                            <x-forms.button class="justify-center w-64 box-boarding" wire:click="createNewServer">No (create
+                            <x-forms.button class="justify-center w-64 box-boarding" wire:click="createNewServer">No
+                                (create
                                 one
                                 for
                                 me)
@@ -146,7 +150,8 @@
                         'root' or skip the boarding process and add a new private key manually to Coolify and to the
                         server.
                         <x-forms.input readonly id="serverPublicKey"></x-forms.input>
-                        <x-forms.button class="w-64 box-boarding" wire:target="validateServer" wire:click="validateServer">Check
+                        <x-forms.button class="w-64 box-boarding" wire:target="validateServer"
+                            wire:click="validateServer">Check
                             again
                         </x-forms.button>
                     @endif
@@ -207,9 +212,14 @@
                             <x-forms.input required placeholder="127.0.0.1" label="IP Address" id="remoteServerHost" />
                             <x-forms.input required placeholder="Port number of your server. Default is 22."
                                 label="Port" id="remoteServerPort" />
-                            <x-forms.input required readonly
-                                placeholder="Username to connect to your server. Default is root." label="Username"
-                                id="remoteServerUser" />
+                            <div class="w-full">
+                                <x-forms.input required placeholder="User to connect to your server. Default is root."
+                                    label="User" id="remoteServerUser" />
+                                <div class="text-xs dark:text-warning text-coollabs ">Non-root user is experimental: <a
+                                        class="font-bold underline" target="_blank"
+                                        href="https://coolify.io/docs/knowledge-base/server/non-root-user">docs</a>.
+                                </div>
+                            </div>
                         </div>
                         <div class="lg:w-64">
                             <x-forms.checkbox
diff --git a/resources/views/livewire/destination/new/docker.blade.php b/resources/views/livewire/destination/new/docker.blade.php
index d05218def..a6da63c6c 100644
--- a/resources/views/livewire/destination/new/docker.blade.php
+++ b/resources/views/livewire/destination/new/docker.blade.php
@@ -5,14 +5,12 @@
             <x-forms.input id="name" label="Name" required />
             <x-forms.input id="network" label="Network" required />
         </div>
-        @if ($server_id)
-            <x-forms.select id="server_id" label="Select a server" required wire:change="generate_name">
-                <option disabled>Select a server</option>
-                @foreach ($servers as $server)
-                    <option value="{{ $server->id }}">{{ $server->name }}</option>
-                @endforeach
-            </x-forms.select>
-        @endif
+        <x-forms.select id="server_id" label="Select a server" required wire:change="generate_name">
+            <option disabled>Select a server</option>
+            @foreach ($servers as $server)
+                <option value="{{ $server->id }}">{{ $server->name }}</option>
+            @endforeach
+        </x-forms.select>
         <x-forms.button type="submit">
             Continue
         </x-forms.button>
diff --git a/resources/views/livewire/project/application/advanced.blade.php b/resources/views/livewire/project/application/advanced.blade.php
index 75a55c5b9..5d2922a7e 100644
--- a/resources/views/livewire/project/application/advanced.blade.php
+++ b/resources/views/livewire/project/application/advanced.blade.php
@@ -25,8 +25,21 @@
                 instantSave id="is_gzip_enabled" />
             <x-forms.checkbox helper="Strip Prefix is used to remove prefixes from paths. Like /api/ to /api."
                 instantSave id="is_stripprefix_enabled" label="Strip Prefixes" />
-            <h3>Logs</h3>
+            @if ($application->build_pack === 'dockercompose')
+                <x-forms.checkbox instantSave id="application.settings.is_raw_compose_deployment_enabled"
+                    label="Raw Compose Deployment"
+                    helper="WARNING: Advanced use cases only. Your docker compose file will be deployed as-is. Nothing is modified by Coolify. You need to configure the proxy parts. More info in the <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/compose#raw-docker-compose-deployment'>documentation.</a>" />
+            @endif
+            @if ($application->build_pack === 'dockercompose')
+                <h3>Network</h3>
+                <div class="w-96">
+                    <x-forms.checkbox instantSave id="application.settings.connect_to_docker_network"
+                        label="Connect To Predefined Network"
+                        helper="By default, you do not reach the Coolify defined networks.<br>Starting a docker compose based resource will have an internal network. <br>If you connect to a Coolify defined network, you maybe need to use different internal DNS names to connect to a resource.<br><br>For more information, check <a class='underline dark:text-white' target='_blank' href='https://coolify.io/docs/knowledge-base/docker/compose#connect-to-predefined-networks'>this</a>." />
+                </div>
+            @endif
             @if (!$application->settings->is_raw_compose_deployment_enabled)
+                <h3>Logs</h3>
                 <x-forms.checkbox helper="Drain logs to your configured log drain endpoint in your Server settings."
                     instantSave id="application.settings.is_log_drain_enabled" label="Drain Logs" />
             @endif
diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php
index 558db9c3c..de83b03ee 100644
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@@ -4,7 +4,7 @@
             <h2>General</h2>
             <x-forms.button type="submit">
                 Save
-        </x-forms.button>
+            </x-forms.button>
         </div>
         <div>General configuration for your application.</div>
         <div class="flex flex-col gap-2 py-4">
@@ -38,13 +38,8 @@
                         </div>
                     @endif
                     @if ($application->build_pack === 'dockercompose')
-                        <div class="w-96">
-                            <x-forms.checkbox instantSave id="application.settings.is_raw_compose_deployment_enabled"
-                                label="Raw Compose Deployment"
-                                helper="WARNING: Advanced use cases only. Your docker compose file will be deployed as-is. Nothing is modified by Coolify. You need to configure the proxy parts. More info in the <a href='https://coolify.io/docs/knowledge-base/docker/compose#raw-docker-compose-deployment'>documentation.</a>" />
-                        </div>
                         @if (count($parsedServices) > 0 && !$application->settings->is_raw_compose_deployment_enabled)
-                            <h3>Domains</h3>
+                            <h3 class="pt-6">Domains</h3>
                             @foreach (data_get($parsedServices, 'services') as $serviceName => $service)
                                 @if (!isDatabaseImage(data_get($service, 'image')))
                                     <div class="flex items-end gap-2">
diff --git a/resources/views/livewire/project/application/source.blade.php b/resources/views/livewire/project/application/source.blade.php
index 84aec3e81..88347d2d8 100644
--- a/resources/views/livewire/project/application/source.blade.php
+++ b/resources/views/livewire/project/application/source.blade.php
@@ -27,7 +27,7 @@
 
         <div class="flex flex-col gap-2">
             <div class="flex gap-2">
-                <x-forms.input placeholder="coollabsio/coolify-example" id="application.git_repository"
+                <x-forms.input placeholder="coollabsio/coolify-example" id="application.git_repository" readonly
                     label="Repository" />
                 <x-forms.input placeholder="main" id="application.git_branch" label="Branch" />
             </div>
@@ -36,10 +36,10 @@
                     label="Commit SHA" />
             </div>
         </div>
-        @isset($application->private_key_id)
+        @if(data_get($application, 'private_key_id'))
             <h3 class="pt-4">Deploy Key</h3>
             <div class="py-2 pt-4">Currently attached Private Key: <span
-                    class="dark:text-warning">{{ $application->private_key->name }}</span>
+                    class="dark:text-warning">{{ data_get($application, 'private_key.name') }}</span>
             </div>
 
             <h4 class="py-2 ">Select another Private Key</h4>
@@ -49,6 +49,6 @@ class="dark:text-warning">{{ $application->private_key->name }}</span>
                     </x-forms.button>
                 @endforeach
             </div>
-        @endisset
+        @endif
     </form>
 </div>
diff --git a/resources/views/livewire/project/database/create-scheduled-backup.blade.php b/resources/views/livewire/project/database/create-scheduled-backup.blade.php
index da7871b0b..3b7c9e74d 100644
--- a/resources/views/livewire/project/database/create-scheduled-backup.blade.php
+++ b/resources/views/livewire/project/database/create-scheduled-backup.blade.php
@@ -10,7 +10,7 @@
             @endforeach
         @endif
     </x-forms.select>
-    <x-forms.button type="submit" @click="slideOverOpen=false">
+    <x-forms.button type="submit" @click="modalOpen=false">
         Save
     </x-forms.button>
 </form>
diff --git a/resources/views/livewire/project/database/import.blade.php b/resources/views/livewire/project/database/import.blade.php
index 01480fcdc..425383704 100644
--- a/resources/views/livewire/project/database/import.blade.php
+++ b/resources/views/livewire/project/database/import.blade.php
@@ -1,7 +1,7 @@
 <div x-data="{ error: $wire.entangle('error'), filesize: $wire.entangle('filesize'), filename: $wire.entangle('filename'), isUploading: $wire.entangle('isUploading'), progress: $wire.entangle('progress') }">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/dropzone/5.9.3/dropzone.min.js"
         integrity="sha512-U2WE1ktpMTuRBPoCFDzomoIorbOyUv0sP8B+INA3EzNAhehbzED1rOJg6bCqPf/Tuposxb5ja/MAUnC8THSbLQ=="
-        crossorigin="anonymous" referrerpolicy="no-referrer" defer async></script>
+        crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     @script
         <script>
             Dropzone.options.myDropzone = {
diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php
index 33984ac93..fde6348ed 100644
--- a/resources/views/livewire/project/new/select.blade.php
+++ b/resources/views/livewire/project/new/select.blade.php
@@ -576,9 +576,9 @@ class="w-[4.5rem]
                     @empty
                         <div class="w-96">No service found. Please try to reload the list!</div>
                     @endforelse
+                </div>
             @endif
     </div>
-
     @endif
     @if ($current_step === 'servers')
         <h2>Select a server</h2>
@@ -645,4 +645,3 @@ class="w-[4.5rem]
         </form>
     @endif
 </div>
-</div>
diff --git a/resources/views/livewire/project/resource/index.blade.php b/resources/views/livewire/project/resource/index.blade.php
index 61ee13ceb..28c2de0f4 100644
--- a/resources/views/livewire/project/resource/index.blade.php
+++ b/resources/views/livewire/project/resource/index.blade.php
@@ -50,321 +50,311 @@ class="items-center justify-center box">+ Add New Resource</a>
                 <template x-for="item in filteredApplications" :key="item.id">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="flex flex-col w-full px-4 mx-2">
-                                <div class="flex gap-2">
-                                    <div class="pb-2 box-title" x-text="item.name"></div>
+                            <div class="flex flex-col w-full">
+                                <div class="flex gap-2 px-4">
+                                    <div class="pb-2 truncate box-title" x-text="item.name"></div>
+                                    <div class="flex-1"></div>
                                     <template x-if="item.status.startsWith('running')">
-                                        <div title="running" class="mt-1 bg-success badge "></div>
+                                        <div title="running" class="bg-success badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('exited')">
-                                        <div title="exited" class="mt-1 bg-error badge "></div>
+                                        <div title="exited" class="bg-error badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('restarting')">
-                                        <div title="restarting" class="mt-1 bg-warningbadge "></div>
+                                        <div title="restarting" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('degraded')">
-                                        <div title="degraded" class="mt-1 bg-warning badge "></div>
+                                        <div title="degraded" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                 </div>
-                                <div class="max-w-full truncate box-description" x-text="item.description"></div>
-                                <div class="max-w-full truncate box-description" x-text="item.fqdn"></div>
+                                <div class="max-w-full px-4 truncate box-description" x-text="item.description"></div>
+                                <div class="max-w-full px-4 truncate box-description" x-text="item.fqdn"></div>
                             </div>
                         </a>
-                        <div class="flex gap-1 pt-1 group-hover:dark:text-white group-hover:text-black group min-h-6">
+                        <div class="flex flex-wrap gap-1 pt-1 group-hover:dark:text-white group-hover:text-black group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="tag"
-                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                                <div class="tag" @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="add-tag"
-                                @click.prevent="goto(item)">Add tag</div>
+                            <div class="add-tag" @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
                 </template>
                 <template x-for="item in filteredPostgresqls" :key="item.id">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="flex flex-col px-4 mx-2">
-                                <div class="flex gap-2">
-                                    <div class="pb-2 font-bold box-title" x-text="item.name"></div>
+                            <div class="flex flex-col w-full">
+                                <div class="flex gap-2 px-4">
+                                    <div class="pb-2 truncate box-title" x-text="item.name"></div>
+                                    <div class="flex-1"></div>
                                     <template x-if="item.status.startsWith('running')">
-                                        <div title="running" class="mt-1 bg-success badge "></div>
+                                        <div title="running" class="bg-success badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('exited')">
-                                        <div title="exited" class="mt-1 bg-error badge "></div>
+                                        <div title="exited" class="bg-error badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('restarting')">
-                                        <div title="restarting" class="mt-1 bg-warningbadge "></div>
+                                        <div title="restarting" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('degraded')">
-                                        <div title="degraded" class="mt-1 bg-warning badge "></div>
+                                        <div title="degraded" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                 </div>
-                                <div class="max-w-full truncate box-description" x-text="item.description"></div>
+                                <div class="max-w-full px-4 truncate box-description" x-text="item.description"></div>
                             </div>
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group-hover:text-black group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="tag"
-                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                                <div class="tag" @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="add-tag"
-                                @click.prevent="goto(item)">Add tag</div>
+                            <div class="add-tag" @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
                 </template>
                 <template x-for="item in filteredRedis" :key="item.id">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="flex flex-col px-4 mx-2">
-                                <div class="flex gap-2">
-                                    <div class="pb-2 font-bold dark:text-white" x-text="item.name"></div>
+                            <div class="flex flex-col w-full">
+                                <div class="flex gap-2 px-4">
+                                    <div class="pb-2 truncate box-title" x-text="item.name"></div>
+                                    <div class="flex-1"></div>
                                     <template x-if="item.status.startsWith('running')">
-                                        <div title="running" class="mt-1 bg-success badge "></div>
+                                        <div title="running" class="bg-success badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('exited')">
-                                        <div title="exited" class="mt-1 bg-error badge "></div>
+                                        <div title="exited" class="bg-error badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('restarting')">
-                                        <div title="restarting" class="mt-1 bg-warningbadge "></div>
+                                        <div title="restarting" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('degraded')">
-                                        <div title="degraded" class="mt-1 bg-warning badge "></div>
+                                        <div title="degraded" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                 </div>
-                                <div class="max-w-full truncate description" x-text="item.description"></div>
+                                <div class="max-w-full px-4 truncate description" x-text="item.description"></div>
                             </div>
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="tag"
-                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                                <div class="tag" @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="add-tag"
-                                @click.prevent="goto(item)">Add tag</div>
+                            <div class="add-tag" @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
                 </template>
                 <template x-for="item in filteredMongodbs" :key="item.id">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="flex flex-col px-4 mx-2">
-                                <div class="flex gap-2">
-                                    <div class="pb-2 font-bold dark:text-white" x-text="item.name"></div>
+                            <div class="flex flex-col w-full">
+                                <div class="flex gap-2 px-4">
+                                    <div class="pb-2 truncate box-title" x-text="item.name"></div>
+                                    <div class="flex-1"></div>
                                     <template x-if="item.status.startsWith('running')">
-                                        <div title="running" class="mt-1 bg-success badge "></div>
+                                        <div title="running" class="bg-success badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('exited')">
-                                        <div title="exited" class="mt-1 bg-error badge "></div>
+                                        <div title="exited" class="bg-error badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('restarting')">
-                                        <div title="restarting" class="mt-1 bg-warningbadge "></div>
+                                        <div title="restarting" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('degraded')">
-                                        <div title="degraded" class="mt-1 bg-warning badge "></div>
+                                        <div title="degraded" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                 </div>
-                                <div class="max-w-full truncate description" x-text="item.description"></div>
+                                <div class="max-w-full px-4 truncate description" x-text="item.description"></div>
                             </div>
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="tag"
-                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                                <div class="tag" @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="add-tag"
-                                @click.prevent="goto(item)">Add tag</div>
+                            <div class="add-tag" @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
                 </template>
                 <template x-for="item in filteredMysqls" :key="item.id">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="flex flex-col px-4 mx-2">
-                                <div class="flex gap-2">
-                                    <div class="pb-2 font-bold dark:text-white" x-text="item.name"></div>
+                            <div class="flex flex-col w-full">
+                                <div class="flex gap-2 px-4">
+                                    <div class="pb-2 truncate box-title" x-text="item.name"></div>
+                                    <div class="flex-1"></div>
                                     <template x-if="item.status.startsWith('running')">
-                                        <div title="running" class="mt-1 bg-success badge "></div>
+                                        <div title="running" class="bg-success badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('exited')">
-                                        <div title="exited" class="mt-1 bg-error badge "></div>
+                                        <div title="exited" class="bg-error badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('restarting')">
-                                        <div title="restarting" class="mt-1 bg-warningbadge "></div>
+                                        <div title="restarting" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('degraded')">
-                                        <div title="degraded" class="mt-1 bg-warning badge "></div>
+                                        <div title="degraded" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                 </div>
-                                <div class="max-w-full truncate description" x-text="item.description"></div>
+                                <div class="max-w-full px-4 truncate description" x-text="item.description"></div>
                             </div>
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="tag"
-                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                                <div class="tag" @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="add-tag"
-                                @click.prevent="goto(item)">Add tag</div>
+                            <div class="add-tag" @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
                 </template>
                 <template x-for="item in filteredMariadbs" :key="item.id">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="flex flex-col px-4 mx-2">
-                                <div class="flex gap-2">
-                                    <div class="pb-2 font-bold dark:text-white" x-text="item.name"></div>
+                            <div class="flex flex-col w-full">
+                                <div class="flex gap-2 px-4">
+                                    <div class="pb-2 truncate box-title" x-text="item.name"></div>
+                                    <div class="flex-1"></div>
                                     <template x-if="item.status.startsWith('running')">
-                                        <div title="running" class="mt-1 bg-success badge "></div>
+                                        <div title="running" class="bg-success badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('exited')">
-                                        <div title="exited" class="mt-1 bg-error badge "></div>
+                                        <div title="exited" class="bg-error badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('restarting')">
-                                        <div title="restarting" class="mt-1 bg-warningbadge "></div>
+                                        <div title="restarting" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('degraded')">
-                                        <div title="degraded" class="mt-1 bg-warning badge "></div>
+                                        <div title="degraded" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                 </div>
-                                <div class="max-w-full truncate description" x-text="item.description"></div>
+                                <div class="max-w-full px-4 truncate description" x-text="item.description"></div>
                             </div>
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="tag"
-                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                                <div class="tag" @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="add-tag"
-                                @click.prevent="goto(item)">Add tag</div>
+                            <div class="add-tag" @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
                 </template>
                 <template x-for="item in filteredKeydbs" :key="item.id">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="flex flex-col px-4 mx-2">
-                                <div class="flex gap-2">
-                                    <div class="pb-2 font-bold dark:text-white" x-text="item.name"></div>
+                            <div class="flex flex-col w-full">
+                                <div class="flex gap-2 px-4">
+                                    <div class="pb-2 truncate box-title" x-text="item.name"></div>
+                                    <div class="flex-1"></div>
                                     <template x-if="item.status.startsWith('running')">
-                                        <div title="running" class="mt-1 bg-success badge "></div>
+                                        <div title="running" class="bg-success badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('exited')">
-                                        <div title="exited" class="mt-1 bg-error badge "></div>
+                                        <div title="exited" class="bg-error badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('restarting')">
-                                        <div title="restarting" class="mt-1 bg-warningbadge "></div>
+                                        <div title="restarting" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('degraded')">
-                                        <div title="degraded" class="mt-1 bg-warning badge "></div>
+                                        <div title="degraded" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                 </div>
-                                <div class="max-w-full truncate description" x-text="item.description"></div>
+                                <div class="max-w-full px-4 truncate description" x-text="item.description"></div>
                             </div>
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="tag"
-                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                                <div class="tag" @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="add-tag"
-                                @click.prevent="goto(item)">Add tag</div>
+                            <div class="add-tag" @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
                 </template>
                 <template x-for="item in filteredDragonflies" :key="item.id">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="flex flex-col px-4 mx-2">
-                                <div class="flex gap-2">
-                                    <div class="pb-2 font-bold dark:text-white" x-text="item.name"></div>
+                            <div class="flex flex-col w-full">
+                                <div class="flex gap-2 px-4">
+                                    <div class="pb-2 truncate box-title" x-text="item.name"></div>
+                                    <div class="flex-1"></div>
                                     <template x-if="item.status.startsWith('running')">
-                                        <div title="running" class="mt-1 bg-success badge "></div>
+                                        <div title="running" class="bg-success badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('exited')">
-                                        <div title="exited" class="mt-1 bg-error badge "></div>
+                                        <div title="exited" class="bg-error badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('restarting')">
-                                        <div title="restarting" class="mt-1 bg-warningbadge "></div>
+                                        <div title="restarting" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('degraded')">
-                                        <div title="degraded" class="mt-1 bg-warning badge "></div>
+                                        <div title="degraded" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                 </div>
-                                <div class="max-w-full truncate description" x-text="item.description"></div>
+                                <div class="max-w-full px-4 truncate description" x-text="item.description"></div>
                             </div>
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="tag"
-                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                                <div class="tag" @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="add-tag"
-                                @click.prevent="goto(item)">Add tag</div>
+                            <div class="add-tag" @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
                 </template>
                 <template x-for="item in filteredClickhouses" :key="item.id">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="flex flex-col px-4 mx-2">
-                                <div class="flex gap-2">
-                                    <div class="pb-2 font-bold dark:text-white" x-text="item.name"></div>
+                            <div class="flex flex-col w-full">
+                                <div class="flex gap-2 px-4">
+                                    <div class="pb-2 truncate box-title" x-text="item.name"></div>
+                                    <div class="flex-1"></div>
                                     <template x-if="item.status.startsWith('running')">
-                                        <div title="running" class="mt-1 bg-success badge "></div>
+                                        <div title="running" class="bg-success badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('exited')">
-                                        <div title="exited" class="mt-1 bg-error badge "></div>
+                                        <div title="exited" class="bg-error badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('restarting')">
-                                        <div title="restarting" class="mt-1 bg-warningbadge "></div>
+                                        <div title="restarting" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('degraded')">
-                                        <div title="degraded" class="mt-1 bg-warning badge "></div>
+                                        <div title="degraded" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                 </div>
-                                <div class="max-w-full truncate description" x-text="item.description"></div>
+                                <div class="max-w-full px-4 truncate description" x-text="item.description"></div>
                             </div>
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="tag"
-                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                                <div class="tag" @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="add-tag"
-                                @click.prevent="goto(item)">Add tag</div>
+                            <div class="add-tag" @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
                 </template>
                 <template x-for="item in filteredServices" :key="item.id">
                     <span>
                         <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="flex flex-col px-4 mx-2">
-                                <div class="flex gap-2">
-                                    <div class="pb-2 font-bold dark:text-white" x-text="item.name"></div>
+                            <div class="flex flex-col w-full">
+                                <div class="flex gap-2 px-4">
+                                    <div class="pb-2 truncate box-title" x-text="item.name"></div>
+                                    <div class="flex-1"></div>
                                     <template x-if="item.status.startsWith('running')">
-                                        <div title="running" class="mt-1 bg-success badge "></div>
+                                        <div title="running" class="bg-success badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('exited')">
-                                        <div title="exited" class="mt-1 bg-error badge "></div>
+                                        <div title="exited" class="bg-error badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('restarting')">
-                                        <div title="restarting" class="mt-1 bg-warningbadge "></div>
+                                        <div title="restarting" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                     <template x-if="item.status.startsWith('degraded')">
-                                        <div title="degraded" class="mt-1 bg-warning badge "></div>
+                                        <div title="degraded" class="bg-warning badge badge-absolute"></div>
                                     </template>
                                 </div>
-                                <div class="max-w-full truncate description" x-text="item.description"></div>
+                                <div class="max-w-full px-4 truncate description" x-text="item.description"></div>
                             </div>
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="tag"
-                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                                <div class="tag" @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="add-tag"
-                                @click.prevent="goto(item)">Add tag</div>
+                            <div class="add-tag" @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
                 </template>
diff --git a/resources/views/livewire/project/shared/storages/show.blade.php b/resources/views/livewire/project/shared/storages/show.blade.php
index a50a78877..3a5733701 100644
--- a/resources/views/livewire/project/shared/storages/show.blade.php
+++ b/resources/views/livewire/project/shared/storages/show.blade.php
@@ -2,11 +2,13 @@
     <form wire:submit='submit' class="flex flex-col gap-2 xl:items-end xl:flex-row">
         @if ($isReadOnly)
             @if ($isFirst)
-                <x-forms.input id="storage.name" label="Volume Name" required readonly />
-                <x-forms.input id="storage.host_path" label="Source Path (on host)" readonly />
+                <x-forms.input id="storage.name" label="Volume Name" required
+                    helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
+                <x-forms.input id="storage.host_path" label="Source Path (on host)" helper="Warning: Changing the source path after the initial start could cause problems. Only use it when you know what are you doing." />
                 <x-forms.input id="storage.mount_path" label="Destination Path (in container)" required readonly />
             @else
-                <x-forms.input id="storage.name" required readonly />
+                <x-forms.input id="storage.name" required readonly
+                    helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
                 <x-forms.input id="storage.host_path" readonly />
                 <x-forms.input id="storage.mount_path" required readonly />
             @endif
@@ -25,7 +27,8 @@
                     Update
                 </x-forms.button>
                 <x-modal-confirmation isErrorButton buttonTitle="Delete">
-                    This storage will be deleted <span class="font-bold dark:text-warning">{{ $storage->name }}</span>. It
+                    This storage will be deleted <span class="font-bold dark:text-warning">{{ $storage->name }}</span>.
+                    It
                     is
                     not
                     reversible. <br>Please think again.
diff --git a/resources/views/livewire/project/shared/tags.blade.php b/resources/views/livewire/project/shared/tags.blade.php
index 866e60cdd..2d4240dfa 100644
--- a/resources/views/livewire/project/shared/tags.blade.php
+++ b/resources/views/livewire/project/shared/tags.blade.php
@@ -1,6 +1,6 @@
 <div>
     <h2>Tags</h2>
-    <div class="flex gap-2 pt-4">
+    <div class="flex flex-wrap gap-2 pt-4">
         @if (data_get($this->resource, 'tags'))
             @forelse (data_get($this->resource,'tags') as $tagId => $tag)
                 <div
@@ -29,7 +29,7 @@ class="inline-block w-3 h-3 rounded cursor-pointer stroke-current hover:bg-red-5
     @if (count($tags) > 0)
         <h3 class="pt-4">Exisiting Tags</h3>
         <div>Click to add quickly</div>
-        <div class="flex gap-2 pt-4">
+        <div class="flex flex-wrap gap-2 pt-4">
             @foreach ($tags as $tag)
                 <x-forms.button wire:click="addTag('{{ $tag->id }}','{{ $tag->name }}')">
                     {{ $tag->name }}</x-forms.button>
diff --git a/resources/views/livewire/source/github/change.blade.php b/resources/views/livewire/source/github/change.blade.php
index b1f0cf709..932e352f3 100644
--- a/resources/views/livewire/source/github/change.blade.php
+++ b/resources/views/livewire/source/github/change.blade.php
@@ -13,9 +13,15 @@
                             </x-forms.button>
                         </a>
                     @endif
-                    <x-modal-confirmation isErrorButton buttonTitle="Delete">
-                        This source will be deleted. It is not reversible. <br>Please think again.
-                    </x-modal-confirmation>
+                    @if ($applications->count() > 0)
+                        <x-modal-confirmation disabled isErrorButton buttonTitle="Delete">
+                            This source will be deleted. It is not reversible. <br>Please think again.
+                        </x-modal-confirmation>
+                    @else
+                        <x-modal-confirmation isErrorButton buttonTitle="Delete">
+                            This source will be deleted. It is not reversible. <br>Please think again.
+                        </x-modal-confirmation>
+                    @endif
                 </div>
             </div>
             <div class="subtitle">Your Private GitHub App for private repositories.</div>
diff --git a/resources/views/livewire/tags/deployments.blade.php b/resources/views/livewire/tags/deployments.blade.php
new file mode 100644
index 000000000..4d8581f79
--- /dev/null
+++ b/resources/views/livewire/tags/deployments.blade.php
@@ -0,0 +1,28 @@
+ <div wire:poll.1000ms="get_deployments" class="grid grid-cols-1">
+     @forelse ($deployments_per_tag_per_server as $server_name => $deployments)
+         <h4 class="py-4">{{ $server_name }}</h4>
+         <div class="grid grid-cols-1 gap-2 lg:grid-cols-3">
+             @foreach ($deployments as $deployment)
+                 <div @class([
+                     'box-without-bg dark:bg-coolgray-100 bg-white gap-2 cursor-pointer group border-l-2 border-dotted',
+                     'dark:border-coolgray-300' => data_get($deployment, 'status') === 'queued',
+                     'border-yellow-500' => data_get($deployment, 'status') === 'in_progress',
+                 ])>
+                     <a href="{{ data_get($deployment, 'deployment_url') }}">
+                         <div class="flex flex-col mx-6">
+                             <div class="box-title">
+                                 {{ data_get($deployment, 'application_name') }}
+                             </div>
+                             <div class="box-description">
+                                 {{ str(data_get($deployment, 'status'))->headline() }}
+                             </div>
+                         </div>
+                         <div class="flex-1"></div>
+                     </a>
+                 </div>
+             @endforeach
+         </div>
+     @empty
+         <div>No deployments running.</div>
+     @endforelse
+ </div>
diff --git a/resources/views/livewire/tags/index.blade.php b/resources/views/livewire/tags/index.blade.php
index 11442c1f2..1fd62cefe 100644
--- a/resources/views/livewire/tags/index.blade.php
+++ b/resources/views/livewire/tags/index.blade.php
@@ -6,12 +6,11 @@
             @if ($tags->count() === 0)
                 <div>No tags yet defined yet. Go to a resource and add a tag there.</div>
             @else
-                <x-forms.select wire:model.live="tag">
-                    <option value="null" disabled selected>Select a tag</option>
+                <x-forms.datalist wire:model="tag" onUpdate='tag_updated'>
                     @foreach ($tags as $oneTag)
                         <option value="{{ $oneTag->name }}">{{ $oneTag->name }}</option>
                     @endforeach
-                </x-forms.select>
+                </x-forms.datalist>
                 @if ($tag)
                     <div class="pt-5">
                         <div class="flex items-end gap-2 ">
@@ -51,34 +50,7 @@
                                 <x-loading />
                             @endif
                         </div>
-                        <div wire:poll.1000ms="get_deployments" class="grid grid-cols-1">
-                            @forelse ($deployments_per_tag_per_server as $server_name => $deployments)
-                                <h4 class="py-4">{{ $server_name }}</h4>
-                                <div class="grid grid-cols-1 gap-2 lg:grid-cols-3">
-                                    @foreach ($deployments as $deployment)
-                                        <div @class([
-                                            'box-without-bg dark:bg-coolgray-100 bg-white gap-2 cursor-pointer group border-l-2 border-dotted',
-                                            'dark:border-coolgray-300' => data_get($deployment, 'status') === 'queued',
-                                            'border-yellow-500' => data_get($deployment, 'status') === 'in_progress',
-                                        ])>
-                                            <a href="{{ data_get($deployment, 'deployment_url') }}">
-                                                <div class="flex flex-col mx-6">
-                                                    <div class="box-title">
-                                                        {{ data_get($deployment, 'application_name') }}
-                                                    </div>
-                                                    <div class="box-description">
-                                                        {{ str(data_get($deployment, 'status'))->headline() }}
-                                                    </div>
-                                                </div>
-                                                <div class="flex-1"></div>
-                                            </a>
-                                        </div>
-                                    @endforeach
-                                </div>
-                            @empty
-                                <div>No deployments running.</div>
-                            @endforelse
-                        </div>
+                        <livewire:tags.deployments :deployments_per_tag_per_server="$deployments_per_tag_per_server" :resource_ids="$applications->pluck('id')" />
                     </div>
                 @endif
             @endif
diff --git a/resources/views/livewire/tags/show.blade.php b/resources/views/livewire/tags/show.blade.php
index bd1c4901f..1a778f024 100644
--- a/resources/views/livewire/tags/show.blade.php
+++ b/resources/views/livewire/tags/show.blade.php
@@ -8,8 +8,7 @@
         <div>Available tags</div>
         <div class="flex flex-wrap gap-2 ">
             @forelse ($tags as $oneTag)
-                <a :class="{{ $tag->id == $oneTag->id }} && 'bg-coollabs hover:bg-coollabs-100'"
-                    class="w-64 box"
+                <a :class="{{ $tag->id == $oneTag->id }} && 'bg-coollabs hover:bg-coollabs-100'" class="w-64 box"
                     href="{{ route('tags.show', ['tag_name' => $oneTag->name]) }}">{{ $oneTag->name }}</a>
             @empty
                 <div>No tags yet defined yet. Go to a resource and add a tag there.</div>
@@ -28,19 +27,23 @@ class="w-64 box"
         </div>
         <div class="grid grid-cols-1 gap-2 pt-4 lg:grid-cols-2 xl:grid-cols-3">
             @foreach ($applications as $application)
-                <a href="{{ $application->link() }}" class="flex flex-col box group">
-                    <span
-                        class="font-bold dark:text-white">{{ $application->project()->name }}/{{ $application->environment->name }}</span>
-                    <span class="dark:text-white ">{{ $application->name }}</span>
-                    <span class="description">{{ $application->description }}</span>
+                <a href="{{ $application->link() }}" class="box group">
+                    <div class="flex flex-col">
+                        <div class="box-title">{{ $application->project()->name }}/{{ $application->environment->name }}
+                        </div>
+                        <div class="box-description">{{ $application->name }}</div>
+                        <div class="box-description">{{ $application->description }}</div>
+                    </div>
                 </a>
             @endforeach
             @foreach ($services as $service)
                 <a href="{{ $service->link() }}" class="flex flex-col box group">
-                    <span
-                        class="font-bold dark:text-white">{{ $service->project()->name }}/{{ $service->environment->name }}</span>
-                    <span class="dark:text-white ">{{ $service->name }}</span>
-                    <span class="description">{{ $service->description }}</span>
+                    <div class="flex flex-col">
+                        <div class="box-title">{{ $service->project()->name }}/{{ $service->environment->name }}
+                        </div>
+                        <div class="box-description">{{ $service->name }}</div>
+                        <div class="box-description">{{ $service->description }}</div>
+                    </div>
                 </a>
             @endforeach
         </div>
diff --git a/templates/compose/n8n-with-postgresql.yaml b/templates/compose/n8n-with-postgresql.yaml
index d68aa845b..bda0bff97 100644
--- a/templates/compose/n8n-with-postgresql.yaml
+++ b/templates/compose/n8n-with-postgresql.yaml
@@ -12,8 +12,8 @@ services:
       - N8N_EDITOR_BASE_URL=${SERVICE_FQDN_N8N}
       - WEBHOOK_URL=${SERVICE_FQDN_N8N}
       - N8N_HOST=${SERVICE_URL_N8N}
-      - GENERIC_TIMEZONE="Europe/Berlin"
-      - TZ="Europe/Berlin"
+      - GENERIC_TIMEZONE=Europe/Berlin
+      - TZ=Europe/Berlin
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_DATABASE=${POSTGRES_DB:-n8n}
       - DB_POSTGRESDB_HOST=postgresql
diff --git a/templates/compose/n8n.yaml b/templates/compose/n8n.yaml
index b166d4bf0..62c219a87 100644
--- a/templates/compose/n8n.yaml
+++ b/templates/compose/n8n.yaml
@@ -12,8 +12,8 @@ services:
       - N8N_EDITOR_BASE_URL=${SERVICE_FQDN_N8N}
       - WEBHOOK_URL=${SERVICE_FQDN_N8N}
       - N8N_HOST=${SERVICE_URL_N8N}
-      - GENERIC_TIMEZONE="Europe/Berlin"
-      - TZ="Europe/Berlin"
+      - GENERIC_TIMEZONE=Europe/Berlin
+      - TZ=Europe/Berlin
     volumes:
       - n8n-data:/home/node/.n8n
     healthcheck:
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 32bad0761..29d0989d4 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -601,7 +601,7 @@
     "n8n-with-postgresql": {
         "documentation": "https:\/\/n8n.io",
         "slogan": "n8n is an extendable workflow automation tool.",
-        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6IGRvY2tlci5uOG4uaW8vbjhuaW8vbjhuCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTjhOXzU2NzgKICAgICAgLSAnTjhOX0VESVRPUl9CQVNFX1VSTD0ke1NFUlZJQ0VfRlFETl9OOE59JwogICAgICAtICdXRUJIT09LX1VSTD0ke1NFUlZJQ0VfRlFETl9OOE59JwogICAgICAtICdOOE5fSE9TVD0ke1NFUlZJQ0VfVVJMX044Tn0nCiAgICAgIC0gJ0dFTkVSSUNfVElNRVpPTkU9IkV1cm9wZS9CZXJsaW4iJwogICAgICAtICdUWj0iRXVyb3BlL0JlcmxpbiInCiAgICAgIC0gREJfVFlQRT1wb3N0Z3Jlc2RiCiAgICAgIC0gJ0RCX1BPU1RHUkVTREJfREFUQUJBU0U9JHtQT1NUR1JFU19EQjotbjhufScKICAgICAgLSBEQl9QT1NUR1JFU0RCX0hPU1Q9cG9zdGdyZXNxbAogICAgICAtIERCX1BPU1RHUkVTREJfUE9SVD01NDMyCiAgICAgIC0gREJfUE9TVEdSRVNEQl9VU0VSPSRTRVJWSUNFX1VTRVJfUE9TVEdSRVMKICAgICAgLSBEQl9QT1NUR1JFU0RCX1NDSEVNQT1wdWJsaWMKICAgICAgLSBEQl9QT1NUR1JFU0RCX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICB2b2x1bWVzOgogICAgICAtICduOG4tZGF0YTovaG9tZS9ub2RlLy5uOG4nCiAgICBkZXBlbmRzX29uOgogICAgICBwb3N0Z3Jlc3FsOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3dnZXQgLXFPLSBodHRwOi8vbG9jYWxob3N0OjU2NzgvJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCiAgcG9zdGdyZXNxbDoKICAgIGltYWdlOiAncG9zdGdyZXM6MTYtYWxwaW5lJwogICAgdm9sdW1lczoKICAgICAgLSAncG9zdGdyZXNxbC1kYXRhOi92YXIvbGliL3Bvc3RncmVzcWwvZGF0YScKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LW44bn0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJCR7UE9TVEdSRVNfVVNFUn0gLWQgJCR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
+        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6IGRvY2tlci5uOG4uaW8vbjhuaW8vbjhuCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTjhOXzU2NzgKICAgICAgLSAnTjhOX0VESVRPUl9CQVNFX1VSTD0ke1NFUlZJQ0VfRlFETl9OOE59JwogICAgICAtICdXRUJIT09LX1VSTD0ke1NFUlZJQ0VfRlFETl9OOE59JwogICAgICAtICdOOE5fSE9TVD0ke1NFUlZJQ0VfVVJMX044Tn0nCiAgICAgIC0gR0VORVJJQ19USU1FWk9ORT1FdXJvcGUvQmVybGluCiAgICAgIC0gVFo9RXVyb3BlL0JlcmxpbgogICAgICAtIERCX1RZUEU9cG9zdGdyZXNkYgogICAgICAtICdEQl9QT1NUR1JFU0RCX0RBVEFCQVNFPSR7UE9TVEdSRVNfREI6LW44bn0nCiAgICAgIC0gREJfUE9TVEdSRVNEQl9IT1NUPXBvc3RncmVzcWwKICAgICAgLSBEQl9QT1NUR1JFU0RCX1BPUlQ9NTQzMgogICAgICAtIERCX1BPU1RHUkVTREJfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gREJfUE9TVEdSRVNEQl9TQ0hFTUE9cHVibGljCiAgICAgIC0gREJfUE9TVEdSRVNEQl9QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgdm9sdW1lczoKICAgICAgLSAnbjhuLWRhdGE6L2hvbWUvbm9kZS8ubjhuJwogICAgZGVwZW5kc19vbjoKICAgICAgcG9zdGdyZXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICd3Z2V0IC1xTy0gaHR0cDovL2xvY2FsaG9zdDo1Njc4LycKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAogIHBvc3RncmVzcWw6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjE2LWFscGluZScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3Bvc3RncmVzcWwtZGF0YTovdmFyL2xpYi9wb3N0Z3Jlc3FsL2RhdGEnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBQT1NUR1JFU19VU0VSPSRTRVJWSUNFX1VTRVJfUE9TVEdSRVMKICAgICAgLSBQT1NUR1JFU19QQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgICAtICdQT1NUR1JFU19EQj0ke1BPU1RHUkVTX0RCOi1uOG59JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kICQke1BPU1RHUkVTX0RCfScKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
         "tags": [
             "n8n",
             "workflow",
@@ -618,7 +618,7 @@
     "n8n": {
         "documentation": "https:\/\/n8n.io",
         "slogan": "n8n is an extendable workflow automation tool.",
-        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6IGRvY2tlci5uOG4uaW8vbjhuaW8vbjhuCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTjhOXzU2NzgKICAgICAgLSAnTjhOX0VESVRPUl9CQVNFX1VSTD0ke1NFUlZJQ0VfRlFETl9OOE59JwogICAgICAtICdXRUJIT09LX1VSTD0ke1NFUlZJQ0VfRlFETl9OOE59JwogICAgICAtICdOOE5fSE9TVD0ke1NFUlZJQ0VfVVJMX044Tn0nCiAgICAgIC0gJ0dFTkVSSUNfVElNRVpPTkU9IkV1cm9wZS9CZXJsaW4iJwogICAgICAtICdUWj0iRXVyb3BlL0JlcmxpbiInCiAgICB2b2x1bWVzOgogICAgICAtICduOG4tZGF0YTovaG9tZS9ub2RlLy5uOG4nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3dnZXQgLXFPLSBodHRwOi8vbG9jYWxob3N0OjU2NzgvJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
+        "compose": "c2VydmljZXM6CiAgbjhuOgogICAgaW1hZ2U6IGRvY2tlci5uOG4uaW8vbjhuaW8vbjhuCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fTjhOXzU2NzgKICAgICAgLSAnTjhOX0VESVRPUl9CQVNFX1VSTD0ke1NFUlZJQ0VfRlFETl9OOE59JwogICAgICAtICdXRUJIT09LX1VSTD0ke1NFUlZJQ0VfRlFETl9OOE59JwogICAgICAtICdOOE5fSE9TVD0ke1NFUlZJQ0VfVVJMX044Tn0nCiAgICAgIC0gR0VORVJJQ19USU1FWk9ORT1FdXJvcGUvQmVybGluCiAgICAgIC0gVFo9RXVyb3BlL0JlcmxpbgogICAgdm9sdW1lczoKICAgICAgLSAnbjhuLWRhdGE6L2hvbWUvbm9kZS8ubjhuJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICd3Z2V0IC1xTy0gaHR0cDovL2xvY2FsaG9zdDo1Njc4LycKICAgICAgaW50ZXJ2YWw6IDVzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAxMAo=",
         "tags": [
             "n8n",
             "workflow",
diff --git a/versions.json b/versions.json
index 4f0da9a27..ff438882c 100644
--- a/versions.json
+++ b/versions.json
@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.266"
+            "version": "4.0.0-beta.267"
         }
     }
 }