From 2dcfdcab3bc071fe26d97a17647b718188e801ab Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 18 Oct 2024 16:09:21 +0200
Subject: [PATCH 01/60] fix init scripts for postgres

---
 .../Project/Database/Postgresql/General.php   | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/Livewire/Project/Database/Postgresql/General.php b/app/Livewire/Project/Database/Postgresql/General.php
index c12fa49f3..642aa793d 100644
--- a/app/Livewire/Project/Database/Postgresql/General.php
+++ b/app/Livewire/Project/Database/Postgresql/General.php
@@ -9,8 +9,6 @@ use App\Models\StandalonePostgresql;
 use Exception;
 use Livewire\Component;
 
-use function Aws\filter;
-
 class General extends Component
 {
     public StandalonePostgresql $database;
@@ -126,8 +124,31 @@ class General extends Component
 
     public function save_init_script($script)
     {
-        $this->database->init_scripts = filter($this->database->init_scripts, fn ($s) => $s['filename'] !== $script['filename']);
-        $this->database->init_scripts = array_merge($this->database->init_scripts, [$script]);
+        $initScripts = collect($this->database->init_scripts ?? []);
+
+        $existingScript = $initScripts->firstWhere('filename', $script['filename']);
+        if ($existingScript && $existingScript['index'] !== $script['index']) {
+            $this->dispatch('error', 'A script with this filename already exists.');
+
+            return;
+        }
+
+        $index = $initScripts->search(function ($item) use ($script) {
+            return $item['index'] === $script['index'];
+        });
+
+        if ($index !== false) {
+            $initScripts[$index] = $script;
+        } else {
+            $initScripts->push($script);
+        }
+
+        $this->database->init_scripts = $initScripts->values()->map(function ($item, $index) {
+            $item['index'] = $index;
+
+            return $item;
+        })->all();
+
         $this->database->save();
         $this->dispatch('success', 'Init script saved.');
     }

From 66b458d807bc0ff9cc8acae47f57aef17359d15c Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 18 Oct 2024 16:14:13 +0200
Subject: [PATCH 02/60] aws filter still used


From 907c6cc4e54f6b82e0d0f1d35c2c1d56eaf84ace Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 18 Oct 2024 16:16:06 +0200
Subject: [PATCH 03/60] format

---
 app/Livewire/Project/Database/Postgresql/General.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Livewire/Project/Database/Postgresql/General.php b/app/Livewire/Project/Database/Postgresql/General.php
index 642aa793d..3abdcc22e 100644
--- a/app/Livewire/Project/Database/Postgresql/General.php
+++ b/app/Livewire/Project/Database/Postgresql/General.php
@@ -127,6 +127,7 @@ class General extends Component
         $initScripts = collect($this->database->init_scripts ?? []);
 
         $existingScript = $initScripts->firstWhere('filename', $script['filename']);
+
         if ($existingScript && $existingScript['index'] !== $script['index']) {
             $this->dispatch('error', 'A script with this filename already exists.');
 

From 7f393eb2c26c470cdf1a86820ed40a8cf33bea01 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:51:51 +0200
Subject: [PATCH 04/60] fix indexing after deletion and make sure init script
 is removed form the server

---
 .../Project/Database/Postgresql/General.php   | 38 +++++++++++++++----
 .../project/database/init-script.blade.php    |  2 +-
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/app/Livewire/Project/Database/Postgresql/General.php b/app/Livewire/Project/Database/Postgresql/General.php
index 3abdcc22e..018027912 100644
--- a/app/Livewire/Project/Database/Postgresql/General.php
+++ b/app/Livewire/Project/Database/Postgresql/General.php
@@ -144,11 +144,13 @@ class General extends Component
             $initScripts->push($script);
         }
 
-        $this->database->init_scripts = $initScripts->values()->map(function ($item, $index) {
-            $item['index'] = $index;
+        $this->database->init_scripts = $initScripts->values()
+            ->map(function ($item, $index) {
+                $item['index'] = $index;
 
-            return $item;
-        })->all();
+                return $item;
+            })
+            ->all();
 
         $this->database->save();
         $this->dispatch('success', 'Init script saved.');
@@ -159,12 +161,32 @@ class General extends Component
         $collection = collect($this->database->init_scripts);
         $found = $collection->firstWhere('filename', $script['filename']);
         if ($found) {
-            $this->database->init_scripts = $collection->filter(fn ($s) => $s['filename'] !== $script['filename'])->toArray();
+            $container_name = $this->database->uuid;
+            $configuration_dir = database_configuration_dir().'/'.$container_name;
+            $file_path = "$configuration_dir/docker-entrypoint-initdb.d/{$script['filename']}";
+
+            $command = "rm -f $file_path";
+            try {
+                instant_remote_process([$command], $this->server);
+            } catch (\Exception $e) {
+                $this->dispatch('error', 'Failed to remove init script from server: '.$e->getMessage());
+
+                return;
+            }
+
+            $updatedScripts = $collection->filter(fn ($s) => $s['filename'] !== $script['filename'])
+                ->values()
+                ->map(function ($item, $index) {
+                    $item['index'] = $index;
+
+                    return $item;
+                })
+                ->all();
+
+            $this->database->init_scripts = $updatedScripts;
             $this->database->save();
             $this->refresh();
-            $this->dispatch('success', 'Init script deleted.');
-
-            return;
+            $this->dispatch('success', 'Init script deleted from the database and the server.');
         }
     }
 
diff --git a/resources/views/livewire/project/database/init-script.blade.php b/resources/views/livewire/project/database/init-script.blade.php
index 8ba0db23c..1580e41cc 100644
--- a/resources/views/livewire/project/database/init-script.blade.php
+++ b/resources/views/livewire/project/database/init-script.blade.php
@@ -4,7 +4,7 @@
         <x-forms.button type="submit">Save</x-forms.button>
         <x-modal-confirmation title="Confirm init-script deletion?" buttonTitle="Delete" isErrorButton
             submitAction="delete" :actions="[
-                'The init-script of this database will be permanently deleted.',
+                'The init-script of this database will be permanently deleted form the database and the server.',
                 'If you are actively using this init-script, it could cause errors on redeployment.',
             ]" confirmationText="{{ $filename }}"
             confirmationLabel="Please confirm the execution of the actions by entering the init-script name below"

From 1ec3caf9e3dee86ef568de528368f3173f8916a1 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 18 Oct 2024 21:07:23 +0200
Subject: [PATCH 05/60] fix: if an init script is renamed the old version is
 still on the server

---
 app/Actions/Database/StartPostgresql.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Actions/Database/StartPostgresql.php b/app/Actions/Database/StartPostgresql.php
index 2a8e5476c..3a2f9ce10 100644
--- a/app/Actions/Database/StartPostgresql.php
+++ b/app/Actions/Database/StartPostgresql.php
@@ -197,9 +197,12 @@ class StartPostgresql
 
     private function generate_init_scripts()
     {
+        $this->commands[] = "rm -rf $this->configuration_dir/docker-entrypoint-initdb.d/*";
+
         if (is_null($this->database->init_scripts) || count($this->database->init_scripts) === 0) {
             return;
         }
+
         foreach ($this->database->init_scripts as $init_script) {
             $filename = data_get($init_script, 'filename');
             $content = data_get($init_script, 'content');

From 159c4aa7ac02fdae6849d8c6db7a7a837dd8f01a Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 18 Oct 2024 21:08:45 +0200
Subject: [PATCH 06/60] remove old init script on server if it is renamed

---
 .../Project/Database/Postgresql/General.php    | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/Livewire/Project/Database/Postgresql/General.php b/app/Livewire/Project/Database/Postgresql/General.php
index 018027912..88dd5c1a8 100644
--- a/app/Livewire/Project/Database/Postgresql/General.php
+++ b/app/Livewire/Project/Database/Postgresql/General.php
@@ -127,6 +127,7 @@ class General extends Component
         $initScripts = collect($this->database->init_scripts ?? []);
 
         $existingScript = $initScripts->firstWhere('filename', $script['filename']);
+        $oldScript = $initScripts->firstWhere('index', $script['index']);
 
         if ($existingScript && $existingScript['index'] !== $script['index']) {
             $this->dispatch('error', 'A script with this filename already exists.');
@@ -134,6 +135,21 @@ class General extends Component
             return;
         }
 
+        $container_name = $this->database->uuid;
+        $configuration_dir = database_configuration_dir().'/'.$container_name;
+
+        if ($oldScript && $oldScript['filename'] !== $script['filename']) {
+            $old_file_path = "$configuration_dir/docker-entrypoint-initdb.d/{$oldScript['filename']}";
+            $delete_command = "rm -f $old_file_path";
+            try {
+                instant_remote_process([$delete_command], $this->server);
+            } catch (\Exception $e) {
+                $this->dispatch('error', 'Failed to remove old init script from server: '.$e->getMessage());
+
+                return;
+            }
+        }
+
         $index = $initScripts->search(function ($item) use ($script) {
             return $item['index'] === $script['index'];
         });
@@ -153,7 +169,7 @@ class General extends Component
             ->all();
 
         $this->database->save();
-        $this->dispatch('success', 'Init script saved.');
+        $this->dispatch('success', 'Init script saved and updated.');
     }
 
     public function delete_init_script($script)

From 18201ece00132da40d51bf0ec4ee4bcba8ae4633 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 18 Oct 2024 21:17:57 +0200
Subject: [PATCH 07/60] fix remove postgres config if it is null or not set

---
 app/Actions/Database/StartPostgresql.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/Actions/Database/StartPostgresql.php b/app/Actions/Database/StartPostgresql.php
index 3a2f9ce10..17cd6171f 100644
--- a/app/Actions/Database/StartPostgresql.php
+++ b/app/Actions/Database/StartPostgresql.php
@@ -214,10 +214,15 @@ class StartPostgresql
 
     private function add_custom_conf()
     {
+        $filename = 'custom-postgres.conf';
+        $config_file_path = "$this->configuration_dir/$filename";
+
         if (is_null($this->database->postgres_conf) || empty($this->database->postgres_conf)) {
+            $this->commands[] = "rm -f $config_file_path";
+
             return;
         }
-        $filename = 'custom-postgres.conf';
+
         $content = $this->database->postgres_conf;
         if (! str($content)->contains('listen_addresses')) {
             $content .= "\nlisten_addresses = '*'";
@@ -225,6 +230,6 @@ class StartPostgresql
             $this->database->save();
         }
         $content_base64 = base64_encode($content);
-        $this->commands[] = "echo '{$content_base64}' | base64 -d | tee $this->configuration_dir/{$filename} > /dev/null";
+        $this->commands[] = "echo '{$content_base64}' | base64 -d | tee $config_file_path > /dev/null";
     }
 }

From 3e2e24dcca0e7222feb86fa3960189a6a7195828 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 15:04:08 +0100
Subject: [PATCH 08/60] feat add uuid to environments

---
 ..._124742_add_uuid_to_environments_table.php | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 database/migrations/2024_11_22_124742_add_uuid_to_environments_table.php

diff --git a/database/migrations/2024_11_22_124742_add_uuid_to_environments_table.php b/database/migrations/2024_11_22_124742_add_uuid_to_environments_table.php
new file mode 100644
index 000000000..b106427af
--- /dev/null
+++ b/database/migrations/2024_11_22_124742_add_uuid_to_environments_table.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Visus\Cuid2\Cuid2;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('environments', function (Blueprint $table) {
+            $table->string('uuid')->after('id')->nullable()->unique();
+        });
+
+        DB::table('environments')
+            ->whereNull('uuid')
+            ->chunkById(100, function ($environments) {
+                foreach ($environments as $environment) {
+                    DB::table('environments')
+                        ->where('id', $environment->id)
+                        ->update(['uuid' => (string) new Cuid2]);
+                }
+            });
+
+        Schema::table('environments', function (Blueprint $table) {
+            $table->string('uuid')->nullable(false)->change();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('environments', function (Blueprint $table) {
+            $table->dropColumn('uuid');
+        });
+    }
+};

From e776302a25a4edeedbc882ff64286be279b6fc6e Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 15:28:06 +0100
Subject: [PATCH 09/60] use new route for dash and project

---
 app/Livewire/Dashboard.php                    |  6 +++
 app/Livewire/Project/Index.php                |  6 +++
 resources/views/livewire/dashboard.blade.php  | 26 +++++------
 .../views/livewire/project/index.blade.php    | 45 ++++++-------------
 4 files changed, 36 insertions(+), 47 deletions(-)

diff --git a/app/Livewire/Dashboard.php b/app/Livewire/Dashboard.php
index 69ba19e40..0dc69087b 100644
--- a/app/Livewire/Dashboard.php
+++ b/app/Livewire/Dashboard.php
@@ -8,6 +8,7 @@ use App\Models\Project;
 use App\Models\Server;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Redirect;
 use Livewire\Component;
 
 class Dashboard extends Component
@@ -49,6 +50,11 @@ class Dashboard extends Component
         ])->sortBy('id')->groupBy('server_name')->toArray();
     }
 
+    public function navigateToProject($projectUuid)
+    {
+        return Redirect::route('project.show', ['project_uuid' => $projectUuid]);
+    }
+
     public function render()
     {
         return view('livewire.dashboard');
diff --git a/app/Livewire/Project/Index.php b/app/Livewire/Project/Index.php
index f8eb838be..8808037b7 100644
--- a/app/Livewire/Project/Index.php
+++ b/app/Livewire/Project/Index.php
@@ -5,6 +5,7 @@ namespace App\Livewire\Project;
 use App\Models\PrivateKey;
 use App\Models\Project;
 use App\Models\Server;
+use Illuminate\Support\Facades\Redirect;
 use Livewire\Component;
 
 class Index extends Component
@@ -30,4 +31,9 @@ class Index extends Component
     {
         return view('livewire.project.index');
     }
+
+    public function navigateToProject($projectUuid)
+    {
+        return Redirect::route('project.show', ['project_uuid' => $projectUuid]);
+    }
 }
diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index decd75c46..50a5e020f 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -25,7 +25,7 @@
             <div class="grid grid-cols-1 gap-2 xl:grid-cols-2">
                 @foreach ($projects as $project)
                     <div class="gap-2 border border-transparent cursor-pointer box group"
-                        onclick="gotoProject('{{ $project->uuid }}','{{ $project->default_environment }}')">
+                        wire:click="navigateToProject('{{ $project->uuid }}')">
                         <div class="flex flex-1 mx-6">
                             <div class="flex flex-col justify-center flex-1">
                                 <div class="box-title">{{ $project->name }}</div>
@@ -34,10 +34,15 @@
                                 </div>
                             </div>
                             <div class="flex items-center justify-center gap-2 text-xs font-bold">
-                                <a class="hover:underline"
-                                    href="{{ route('project.resource.create', ['project_uuid' => $project->uuid, 'environment_name' => data_get($project, 'default_environment', 'production')]) }}">
-                                    <span class="p-2 font-bold">+ Add Resource</span>
-                                </a>
+                                @if($project->environments->first())
+                                    <a class="hover:underline"
+                                        href="{{ route('project.resource.create', [
+                                            'project_uuid' => $project->uuid,
+                                            'environment_uuid' => $project->environments->first()->uuid
+                                        ]) }}">
+                                        <span class="p-2 font-bold">+ Add Resource</span>
+                                    </a>
+                                @endif
                                 <a class="hover:underline"
                                     href="{{ route('project.edit', ['project_uuid' => $project->uuid]) }}">
                                     Settings
@@ -167,15 +172,4 @@
             </div>
         </section>
     @endif
-
-
-    <script>
-        function gotoProject(uuid, environment) {
-            if (environment) {
-                window.location.href = '/project/' + uuid + '/' + environment;
-            } else {
-                window.location.href = '/project/' + uuid;
-            }
-        }
-    </script>
 </div>
diff --git a/resources/views/livewire/project/index.blade.php b/resources/views/livewire/project/index.blade.php
index cb8e1bbed..3e2849e5e 100644
--- a/resources/views/livewire/project/index.blade.php
+++ b/resources/views/livewire/project/index.blade.php
@@ -12,21 +12,21 @@
     <div x-data="searchComponent()">
         <x-forms.input placeholder="Search for name, description..." x-model="search" id="null" />
         <div class="grid grid-cols-2 gap-4 pt-4">
-            <template x-if="allFilteredItems.length === 0">
+            <template x-if="filteredProjects.length === 0">
                 <div>No project found with the search term "<span x-text="search"></span>".</div>
             </template>
 
-            <template x-for="item in allFilteredItems" :key="item.uuid">
-                <div class="box group" @click="gotoProject(item)">
+            <template x-for="project in filteredProjects" :key="project.uuid">
+                <div class="box group cursor-pointer" @click="$wire.navigateToProject(project.uuid)">
                     <div class="flex flex-col justify-center flex-1 mx-6">
-                        <div class="box-title" x-text="item.name"></div>
-                        <div class="box-description ">
-                            <div x-text="item.description"></div>
+                        <div class="box-title" x-text="project.name"></div>
+                        <div class="box-description">
+                            <div x-text="project.description"></div>
                         </div>
                     </div>
                     <div class="flex items-center justify-center gap-2 pt-4 pb-2 mr-4 text-xs lg:py-0 lg:justify-normal">
                         <a class="mx-4 font-bold hover:underline"
-                           :href="item.settingsRoute">
+                           :href="project.settingsRoute">
                             Settings
                         </a>
                     </div>
@@ -36,38 +36,21 @@
     </div>
 
     <script>
-        function sortFn(a, b) {
-            return a.name.localeCompare(b.name)
-        }
-
         function searchComponent() {
             return {
                 search: '',
-                projects: @js($projects),
-                filterAndSort(items) {
+                get filteredProjects() {
+                    const projects = @js($projects);
                     if (this.search === '') {
-                        return Object.values(items).sort(sortFn);
+                        return projects;
                     }
                     const searchLower = this.search.toLowerCase();
-                    return Object.values(items).filter(item => {
-                        return (item.name?.toLowerCase().includes(searchLower) ||
-                            item.description?.toLowerCase().includes(searchLower))
-                    }).sort(sortFn);
-                },
-                get allFilteredItems() {
-                    return [
-                        this.projects,
-                    ].flatMap((items) => this.filterAndSort(items));
+                    return projects.filter(project => {
+                        return (project.name?.toLowerCase().includes(searchLower) ||
+                            project.description?.toLowerCase().includes(searchLower))
+                    });
                 }
             }
         }
-
-        function gotoProject(item) {
-            if (item.default_environment) {
-                window.location.href = '/project/' + item.uuid + '/' + item.default_environment;
-            } else {
-                window.location.href = '/project/' + item.uuid;
-            }
-        }
     </script>
 </div>

From b1dc8dec88ee66b986d2efc1f24574c41d053763 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 15:30:17 +0100
Subject: [PATCH 10/60] fix preselect environment if there is only one

---
 app/Livewire/Dashboard.php     | 9 +++++++++
 app/Livewire/Project/Index.php | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/app/Livewire/Dashboard.php b/app/Livewire/Dashboard.php
index 0dc69087b..c3cb797bf 100644
--- a/app/Livewire/Dashboard.php
+++ b/app/Livewire/Dashboard.php
@@ -52,6 +52,15 @@ class Dashboard extends Component
 
     public function navigateToProject($projectUuid)
     {
+        $project = Project::where('uuid', $projectUuid)->first();
+
+        if ($project && $project->environments->count() === 1) {
+            return Redirect::route('project.resource.index', [
+                'project_uuid' => $projectUuid,
+                'environment_uuid' => $project->environments->first()->uuid,
+            ]);
+        }
+
         return Redirect::route('project.show', ['project_uuid' => $projectUuid]);
     }
 
diff --git a/app/Livewire/Project/Index.php b/app/Livewire/Project/Index.php
index 8808037b7..06bf88219 100644
--- a/app/Livewire/Project/Index.php
+++ b/app/Livewire/Project/Index.php
@@ -34,6 +34,15 @@ class Index extends Component
 
     public function navigateToProject($projectUuid)
     {
+        $project = Project::where('uuid', $projectUuid)->first();
+
+        if ($project && $project->environments->count() === 1) {
+            return Redirect::route('project.resource.index', [
+                'project_uuid' => $projectUuid,
+                'environment_uuid' => $project->environments->first()->uuid,
+            ]);
+        }
+
         return Redirect::route('project.show', ['project_uuid' => $projectUuid]);
     }
 }

From 5737a6d37f178ba6088f9b8f9e1478d4bc8570b0 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 15:30:46 +0100
Subject: [PATCH 11/60] new routes for environment with uuid

---
 routes/web.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index e90bbfac7..60db5f2e0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -144,7 +144,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
         Route::get('/projects', ProjectSharedVariablesIndex::class)->name('shared-variables.project.index');
         Route::get('/project/{project_uuid}', ProjectSharedVariablesShow::class)->name('shared-variables.project.show');
         Route::get('/environments', EnvironmentSharedVariablesIndex::class)->name('shared-variables.environment.index');
-        Route::get('/environment/{project_uuid}/{environment_name}', EnvironmentSharedVariablesShow::class)->name('shared-variables.environment.show');
+        Route::get('/environments/project/{project_uuid}/environment/{environment_uuid}', EnvironmentSharedVariablesShow::class)->name('shared-variables.environment.show');
     });
 
     Route::prefix('team')->group(function () {
@@ -172,13 +172,13 @@ Route::middleware(['auth', 'verified'])->group(function () {
         Route::get('/', ProjectShow::class)->name('project.show');
         Route::get('/edit', ProjectEdit::class)->name('project.edit');
     });
-    Route::prefix('project/{project_uuid}/{environment_name}')->group(function () {
+    Route::prefix('project/{project_uuid}/environment/{environment_uuid}')->group(function () {
         Route::get('/', ResourceIndex::class)->name('project.resource.index');
         Route::get('/clone', ProjectCloneMe::class)->name('project.clone-me');
         Route::get('/new', ResourceCreate::class)->name('project.resource.create');
         Route::get('/edit', EnvironmentEdit::class)->name('project.environment.edit');
     });
-    Route::prefix('project/{project_uuid}/{environment_name}/application/{application_uuid}')->group(function () {
+    Route::prefix('project/{project_uuid}/environment/{environment_uuid}/application/{application_uuid}')->group(function () {
         Route::get('/', ApplicationConfiguration::class)->name('project.application.configuration');
         Route::get('/deployment', DeploymentIndex::class)->name('project.application.deployment.index');
         Route::get('/deployment/{deployment_uuid}', DeploymentShow::class)->name('project.application.deployment.show');
@@ -186,14 +186,14 @@ Route::middleware(['auth', 'verified'])->group(function () {
         Route::get('/terminal', ExecuteContainerCommand::class)->name('project.application.command');
         Route::get('/tasks/{task_uuid}', ScheduledTaskShow::class)->name('project.application.scheduled-tasks');
     });
-    Route::prefix('project/{project_uuid}/{environment_name}/database/{database_uuid}')->group(function () {
+    Route::prefix('project/{project_uuid}/environment/{environment_uuid}/database/{database_uuid}')->group(function () {
         Route::get('/', DatabaseConfiguration::class)->name('project.database.configuration');
         Route::get('/logs', Logs::class)->name('project.database.logs');
         Route::get('/terminal', ExecuteContainerCommand::class)->name('project.database.command');
         Route::get('/backups', DatabaseBackupIndex::class)->name('project.database.backup.index');
         Route::get('/backups/{backup_uuid}', DatabaseBackupExecution::class)->name('project.database.backup.execution');
     });
-    Route::prefix('project/{project_uuid}/{environment_name}/service/{service_uuid}')->group(function () {
+    Route::prefix('project/{project_uuid}/environment/{environment_uuid}/service/{service_uuid}')->group(function () {
         Route::get('/', ServiceConfiguration::class)->name('project.service.configuration');
         Route::get('/terminal', ExecuteContainerCommand::class)->name('project.service.command');
         Route::get('/{stack_service_uuid}', ServiceIndex::class)->name('project.service.index');

From 976899a10a1826441cfd83680ab401004e698e52 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 15:30:51 +0100
Subject: [PATCH 12/60] Update api.php

---
 routes/api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/api.php b/routes/api.php
index e8425aeb1..1c36428b6 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -41,7 +41,7 @@ Route::group([
 
     Route::get('/projects', [ProjectController::class, 'projects']);
     Route::get('/projects/{uuid}', [ProjectController::class, 'project_by_uuid']);
-    Route::get('/projects/{uuid}/{environment_name}', [ProjectController::class, 'environment_details']);
+    Route::get('/projects/{uuid}/environments/{environment_uuid}', [ProjectController::class, 'environment_details']);
 
     Route::post('/projects', [ProjectController::class, 'create_project']);
     Route::patch('/projects/{uuid}', [ProjectController::class, 'update_project']);

From 1361863cfe26c8dd5b0e81bd7dd1ce50ea50e83a Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 15:31:16 +0100
Subject: [PATCH 13/60] use uuid instead of name shared vars

---
 .../livewire/shared-variables/environment/index.blade.php    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/views/livewire/shared-variables/environment/index.blade.php b/resources/views/livewire/shared-variables/environment/index.blade.php
index db2da7c8e..8197984ac 100644
--- a/resources/views/livewire/shared-variables/environment/index.blade.php
+++ b/resources/views/livewire/shared-variables/environment/index.blade.php
@@ -12,7 +12,10 @@
             <div class="pt-0 pb-3">{{ data_get($project, 'description') }}</div>
             @forelse ($project->environments as $environment)
                 <a class="box group"
-                    href="{{ route('shared-variables.environment.show', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name]) }}">
+                    href="{{ route('shared-variables.environment.show', [
+                        'project_uuid' => $project->uuid, 
+                        'environment_uuid' => $environment->uuid
+                    ]) }}">
                     <div class="flex flex-col justify-center flex-1 mx-6 ">
                         <div class="box-title"> {{ $environment->name }}</div>
                         <div class="box-description">

From 4c21807b7a1d6c4158603642c1a29323da01cf75 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 15:38:54 +0100
Subject: [PATCH 14/60] navigate to environment via uuid

---
 app/Livewire/Project/Show.php                   | 12 +++++++++++-
 resources/views/livewire/project/show.blade.php | 13 ++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/Livewire/Project/Show.php b/app/Livewire/Project/Show.php
index 2335519c7..886a20218 100644
--- a/app/Livewire/Project/Show.php
+++ b/app/Livewire/Project/Show.php
@@ -6,6 +6,7 @@ use App\Models\Environment;
 use App\Models\Project;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
+use Visus\Cuid2\Cuid2;
 
 class Show extends Component
 {
@@ -33,17 +34,26 @@ class Show extends Component
             $environment = Environment::create([
                 'name' => $this->name,
                 'project_id' => $this->project->id,
+                'uuid' => (string) new Cuid2,
             ]);
 
             return redirect()->route('project.resource.index', [
                 'project_uuid' => $this->project->uuid,
-                'environment_name' => $environment->name,
+                'environment_uuid' => $environment->uuid,
             ]);
         } catch (\Throwable $e) {
             handleError($e, $this);
         }
     }
 
+    public function navigateToEnvironment($projectUuid, $environmentUuid)
+    {
+        return redirect()->route('project.resource.index', [
+            'project_uuid' => $projectUuid,
+            'environment_uuid' => $environmentUuid,
+        ]);
+    }
+
     public function render()
     {
         return view('livewire.project.show');
diff --git a/resources/views/livewire/project/show.blade.php b/resources/views/livewire/project/show.blade.php
index 861537733..6528f3ee8 100644
--- a/resources/views/livewire/project/show.blade.php
+++ b/resources/views/livewire/project/show.blade.php
@@ -17,18 +17,18 @@
     <div class="text-xs truncate subtitle lg:text-sm">{{ $project->name }}.</div>
     <div class="grid gap-2 lg:grid-cols-2">
         @forelse ($project->environments->sortBy('created_at') as $environment)
-            <div class="gap-2 border border-transparent cursor-pointer box group" x-data
-                x-on:click="goto('{{ $project->uuid }}','{{ $environment->name }}')">
+            <div class="gap-2 border border-transparent cursor-pointer box group"
+                wire:click="navigateToEnvironment('{{ $project->uuid }}', '{{ $environment->uuid }}')">
                 <div class="flex flex-1 mx-6">
                     <a class="flex flex-col justify-center flex-1"
-                        href="{{ route('project.resource.index', [$project->uuid, $environment->name]) }}">
+                        href="{{ route('project.resource.index', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid]) }}">
                         <div class="font-bold dark:text-white"> {{ $environment->name }}</div>
                         <div class="description">
                             {{ $environment->description }}</div>
                     </a>
                     <div class="flex items-center justify-center gap-2 text-xs">
                         <a class="font-bold hover:underline"
-                            href="{{ route('project.environment.edit', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => $environment->name]) }}">
+                            href="{{ route('project.environment.edit', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid]) }}">
                             Settings
                         </a>
                     </div>
@@ -37,10 +37,5 @@
         @empty
             <p>No environments found.</p>
         @endforelse
-        <script>
-            function goto(projectUuid, environmentName) {
-                window.location.href = '/project/' + projectUuid + '/' + environmentName;
-            }
-        </script>
     </div>
 </div>

From 5f1adc98d8802130489717e52923281149a2bcd6 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 15:45:46 +0100
Subject: [PATCH 15/60] fix environment select

---
 app/Livewire/Project/Resource/EnvironmentSelect.php        | 4 ++--
 .../livewire/project/resource/environment-select.blade.php | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/Livewire/Project/Resource/EnvironmentSelect.php b/app/Livewire/Project/Resource/EnvironmentSelect.php
index efb1b6ca2..a38d750da 100644
--- a/app/Livewire/Project/Resource/EnvironmentSelect.php
+++ b/app/Livewire/Project/Resource/EnvironmentSelect.php
@@ -15,7 +15,7 @@ class EnvironmentSelect extends Component
 
     public function mount()
     {
-        $this->selectedEnvironment = request()->route('environment_name');
+        $this->selectedEnvironment = request()->route('environment_uuid');
         $this->project_uuid = request()->route('project_uuid');
     }
 
@@ -28,7 +28,7 @@ class EnvironmentSelect extends Component
         } else {
             return redirect()->route('project.resource.index', [
                 'project_uuid' => $this->project_uuid,
-                'environment_name' => $value,
+                'environment_uuid' => $value,
             ]);
         }
     }
diff --git a/resources/views/livewire/project/resource/environment-select.blade.php b/resources/views/livewire/project/resource/environment-select.blade.php
index c03466d28..725b282a8 100644
--- a/resources/views/livewire/project/resource/environment-select.blade.php
+++ b/resources/views/livewire/project/resource/environment-select.blade.php
@@ -1,8 +1,7 @@
     <x-forms.select wire:model.live="selectedEnvironment">
-        <option value="edit">Create / Edit</option>
-        <option disabled>-----</option>
         @foreach ($environments as $environment)
-            <option value="{{ $environment->name }}">{{ $environment->name }}
-            </option>
+            <option value="{{ $environment->uuid }}">{{ $environment->name }}</option>
         @endforeach
+        <option disabled>-----</option>
+        <option value="edit">Create / Edit</option>
     </x-forms.select>

From d183d33025d0a39d5220804034e4a0999a94e3e9 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 15:51:25 +0100
Subject: [PATCH 16/60] boarding new uuid

---
 app/Livewire/Boarding/Index.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Livewire/Boarding/Index.php b/app/Livewire/Boarding/Index.php
index b6c799c4e..897737907 100644
--- a/app/Livewire/Boarding/Index.php
+++ b/app/Livewire/Boarding/Index.php
@@ -9,6 +9,7 @@ use App\Models\Server;
 use App\Models\Team;
 use Illuminate\Support\Collection;
 use Livewire\Component;
+use Visus\Cuid2\Cuid2;
 
 class Index extends Component
 {
@@ -340,6 +341,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         $this->createdProject = Project::create([
             'name' => 'My first project',
             'team_id' => currentTeam()->id,
+            'uuid' => (string) new Cuid2,
         ]);
         $this->currentState = 'create-resource';
     }
@@ -352,7 +354,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             'project.resource.create',
             [
                 'project_uuid' => $this->createdProject->uuid,
-                'environment_name' => 'production',
+                'environment_uuid' => $this->createdProject->environments->first()->uuid,
                 'server' => $this->createdServer->id,
             ]
         );

From 9630efce67a78e2418afdf065c517a6ade43fd2f Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 15:52:36 +0100
Subject: [PATCH 17/60] uuid deplyment

---
 app/Livewire/Project/Application/Deployment/Show.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Livewire/Project/Application/Deployment/Show.php b/app/Livewire/Project/Application/Deployment/Show.php
index 04170fa28..dba0d8ae5 100644
--- a/app/Livewire/Project/Application/Deployment/Show.php
+++ b/app/Livewire/Project/Application/Deployment/Show.php
@@ -26,7 +26,7 @@ class Show extends Component
         if (! $project) {
             return redirect()->route('dashboard');
         }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        $environment = $project->load(['environments'])->environments->where('uuid', request()->route('environment_uuid'))->first()->load(['applications']);
         if (! $environment) {
             return redirect()->route('dashboard');
         }
@@ -46,7 +46,7 @@ class Show extends Component
         if (! $application_deployment_queue) {
             return redirect()->route('project.application.deployment.index', [
                 'project_uuid' => $project->uuid,
-                'environment_name' => $environment->name,
+                'environment_uuid' => $environment->uuid,
                 'application_uuid' => $application->uuid,
             ]);
         }

From 5a8bff5e96404e650454789e320e563916ac0451 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 15:53:11 +0100
Subject: [PATCH 18/60] Update Heading.php

---
 app/Livewire/Project/Application/Heading.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php
index 3edb21974..b0c150299 100644
--- a/app/Livewire/Project/Application/Heading.php
+++ b/app/Livewire/Project/Application/Heading.php
@@ -90,7 +90,7 @@ class Heading extends Component
             'project_uuid' => $this->parameters['project_uuid'],
             'application_uuid' => $this->parameters['application_uuid'],
             'deployment_uuid' => $this->deploymentUuid,
-            'environment_name' => $this->parameters['environment_name'],
+            'environment_uuid' => $this->parameters['environment_uuid'],
         ]);
     }
 
@@ -132,7 +132,7 @@ class Heading extends Component
             'project_uuid' => $this->parameters['project_uuid'],
             'application_uuid' => $this->parameters['application_uuid'],
             'deployment_uuid' => $this->deploymentUuid,
-            'environment_name' => $this->parameters['environment_name'],
+            'environment_uuid' => $this->parameters['environment_uuid'],
         ]);
     }
 

From 277fd78769cf109487ad61f2df913b034015eeb5 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 16:03:20 +0100
Subject: [PATCH 19/60] new uuid routes

---
 app/Livewire/Project/AddEmpty.php             |  2 ++
 .../Project/Application/Configuration.php     |  2 +-
 .../Project/Application/Deployment/Index.php  |  2 +-
 app/Livewire/Project/Application/Previews.php |  2 +-
 app/Livewire/Project/Application/Rollback.php |  2 +-
 app/Livewire/Project/CloneMe.php              |  8 ++++---
 .../Project/Database/Backup/Execution.php     |  2 +-
 .../Project/Database/Backup/Index.php         |  4 ++--
 .../Project/Database/Configuration.php        |  2 +-
 app/Livewire/Project/EnvironmentEdit.php      |  9 +++++---
 app/Livewire/Project/New/DockerCompose.php    |  4 ++--
 app/Livewire/Project/New/DockerImage.php      |  4 ++--
 app/Livewire/Project/New/EmptyProject.php     |  4 +++-
 .../Project/New/GithubPrivateRepository.php   |  4 ++--
 .../New/GithubPrivateRepositoryDeployKey.php  |  4 ++--
 .../Project/New/PublicGitRepository.php       |  8 +++----
 app/Livewire/Project/New/Select.php           | 18 ++++-----------
 app/Livewire/Project/New/SimpleDockerfile.php |  4 ++--
 app/Livewire/Project/Resource/Create.php      |  6 ++---
 app/Livewire/Project/Resource/Index.php       | 22 +++++++++----------
 app/Livewire/Project/Shared/Danger.php        |  6 ++---
 app/Livewire/Project/Shared/Destination.php   |  2 +-
 .../Project/Shared/ResourceOperations.php     | 16 +++++++-------
 .../SharedVariables/Environment/Show.php      |  4 ++--
 app/Livewire/Source/Github/Change.php         |  4 ++--
 app/Models/Application.php                    |  4 ++--
 app/Models/Project.php                        | 18 ++-------------
 app/Models/Service.php                        |  4 ++--
 app/Models/StandaloneClickhouse.php           |  2 +-
 app/Models/StandaloneDragonfly.php            |  2 +-
 app/Models/StandaloneKeydb.php                |  2 +-
 app/Models/StandaloneMariadb.php              |  2 +-
 app/Models/StandaloneMongodb.php              |  2 +-
 app/Models/StandaloneMysql.php                |  2 +-
 app/Models/StandalonePostgresql.php           |  2 +-
 app/Models/StandaloneRedis.php                |  2 +-
 .../resources/breadcrumbs.blade.php           |  4 +++-
 .../project/environment-edit.blade.php        |  2 +-
 .../livewire/project/resource/index.blade.php |  8 +++----
 39 files changed, 94 insertions(+), 107 deletions(-)

diff --git a/app/Livewire/Project/AddEmpty.php b/app/Livewire/Project/AddEmpty.php
index fd976548a..07873c059 100644
--- a/app/Livewire/Project/AddEmpty.php
+++ b/app/Livewire/Project/AddEmpty.php
@@ -5,6 +5,7 @@ namespace App\Livewire\Project;
 use App\Models\Project;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
+use Visus\Cuid2\Cuid2;
 
 class AddEmpty extends Component
 {
@@ -22,6 +23,7 @@ class AddEmpty extends Component
                 'name' => $this->name,
                 'description' => $this->description,
                 'team_id' => currentTeam()->id,
+                'uuid' => (string) new Cuid2,
             ]);
 
             return redirect()->route('project.show', $project->uuid);
diff --git a/app/Livewire/Project/Application/Configuration.php b/app/Livewire/Project/Application/Configuration.php
index d4ec8f581..2b781a8c7 100644
--- a/app/Livewire/Project/Application/Configuration.php
+++ b/app/Livewire/Project/Application/Configuration.php
@@ -20,7 +20,7 @@ class Configuration extends Component
         if (! $project) {
             return redirect()->route('dashboard');
         }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        $environment = $project->load(['environments'])->environments->where('uuid', request()->route('environment_uuid'))->first()->load(['applications']);
         if (! $environment) {
             return redirect()->route('dashboard');
         }
diff --git a/app/Livewire/Project/Application/Deployment/Index.php b/app/Livewire/Project/Application/Deployment/Index.php
index 4f761c2cf..b847c40ef 100644
--- a/app/Livewire/Project/Application/Deployment/Index.php
+++ b/app/Livewire/Project/Application/Deployment/Index.php
@@ -34,7 +34,7 @@ class Index extends Component
         if (! $project) {
             return redirect()->route('dashboard');
         }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        $environment = $project->load(['environments'])->environments->where('uuid', request()->route('environment_uuid'))->first()->load(['applications']);
         if (! $environment) {
             return redirect()->route('dashboard');
         }
diff --git a/app/Livewire/Project/Application/Previews.php b/app/Livewire/Project/Application/Previews.php
index d42bf03d7..bdf62706c 100644
--- a/app/Livewire/Project/Application/Previews.php
+++ b/app/Livewire/Project/Application/Previews.php
@@ -171,7 +171,7 @@ class Previews extends Component
                 'project_uuid' => $this->parameters['project_uuid'],
                 'application_uuid' => $this->parameters['application_uuid'],
                 'deployment_uuid' => $this->deployment_uuid,
-                'environment_name' => $this->parameters['environment_name'],
+                'environment_uuid' => $this->parameters['environment_uuid'],
             ]);
         } catch (\Throwable $e) {
             return handleError($e, $this);
diff --git a/app/Livewire/Project/Application/Rollback.php b/app/Livewire/Project/Application/Rollback.php
index 1e58a1458..ff5db1e08 100644
--- a/app/Livewire/Project/Application/Rollback.php
+++ b/app/Livewire/Project/Application/Rollback.php
@@ -37,7 +37,7 @@ class Rollback extends Component
             'project_uuid' => $this->parameters['project_uuid'],
             'application_uuid' => $this->parameters['application_uuid'],
             'deployment_uuid' => $deployment_uuid,
-            'environment_name' => $this->parameters['environment_name'],
+            'environment_uuid' => $this->parameters['environment_uuid'],
         ]);
     }
 
diff --git a/app/Livewire/Project/CloneMe.php b/app/Livewire/Project/CloneMe.php
index 4d2bc6589..e2013a50d 100644
--- a/app/Livewire/Project/CloneMe.php
+++ b/app/Livewire/Project/CloneMe.php
@@ -12,7 +12,7 @@ class CloneMe extends Component
 {
     public string $project_uuid;
 
-    public string $environment_name;
+    public string $environment_uuid;
 
     public int $project_id;
 
@@ -44,7 +44,7 @@ class CloneMe extends Component
     {
         $this->project_uuid = $project_uuid;
         $this->project = Project::where('uuid', $project_uuid)->firstOrFail();
-        $this->environment = $this->project->environments->where('name', $this->environment_name)->first();
+        $this->environment = $this->project->environments->where('uuid', $this->environment_uuid)->first();
         $this->project_id = $this->project->id;
         $this->servers = currentTeam()->servers;
         $this->newName = str($this->project->name.'-clone-'.(string) new Cuid2)->slug();
@@ -89,6 +89,7 @@ class CloneMe extends Component
                 if ($this->environment->name !== 'production') {
                     $project->environments()->create([
                         'name' => $this->environment->name,
+                        'uuid' => (string) new Cuid2,
                     ]);
                 }
                 $environment = $project->environments->where('name', $this->environment->name)->first();
@@ -100,6 +101,7 @@ class CloneMe extends Component
                 $project = $this->project;
                 $environment = $this->project->environments()->create([
                     'name' => $this->newName,
+                    'uuid' => (string) new Cuid2,
                 ]);
             }
             $applications = $this->environment->applications;
@@ -183,7 +185,7 @@ class CloneMe extends Component
 
             return redirect()->route('project.resource.index', [
                 'project_uuid' => $project->uuid,
-                'environment_name' => $environment->name,
+                'environment_uuid' => $environment->uuid,
             ]);
         } catch (\Exception $e) {
             return handleError($e, $this);
diff --git a/app/Livewire/Project/Database/Backup/Execution.php b/app/Livewire/Project/Database/Backup/Execution.php
index 564091659..4ac3b2e2c 100644
--- a/app/Livewire/Project/Database/Backup/Execution.php
+++ b/app/Livewire/Project/Database/Backup/Execution.php
@@ -22,7 +22,7 @@ class Execution extends Component
         if (! $project) {
             return redirect()->route('dashboard');
         }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        $environment = $project->load(['environments'])->environments->where('uuid', request()->route('environment_uuid'))->first()->load(['applications']);
         if (! $environment) {
             return redirect()->route('dashboard');
         }
diff --git a/app/Livewire/Project/Database/Backup/Index.php b/app/Livewire/Project/Database/Backup/Index.php
index 9ff2f48d5..2df32ec7b 100644
--- a/app/Livewire/Project/Database/Backup/Index.php
+++ b/app/Livewire/Project/Database/Backup/Index.php
@@ -14,7 +14,7 @@ class Index extends Component
         if (! $project) {
             return redirect()->route('dashboard');
         }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        $environment = $project->load(['environments'])->environments->where('uuid', request()->route('environment_uuid'))->first()->load(['applications']);
         if (! $environment) {
             return redirect()->route('dashboard');
         }
@@ -31,7 +31,7 @@ class Index extends Component
         ) {
             return redirect()->route('project.database.configuration', [
                 'project_uuid' => $project->uuid,
-                'environment_name' => $environment->name,
+                'environment_uuid' => $environment->uuid,
                 'database_uuid' => $database->uuid,
             ]);
         }
diff --git a/app/Livewire/Project/Database/Configuration.php b/app/Livewire/Project/Database/Configuration.php
index e14b27cf6..bbe8e81f6 100644
--- a/app/Livewire/Project/Database/Configuration.php
+++ b/app/Livewire/Project/Database/Configuration.php
@@ -14,7 +14,7 @@ class Configuration extends Component
         if (! $project) {
             return redirect()->route('dashboard');
         }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        $environment = $project->load(['environments'])->environments->where('uuid', request()->route('environment_uuid'))->first()->load(['applications']);
         if (! $environment) {
             return redirect()->route('dashboard');
         }
diff --git a/app/Livewire/Project/EnvironmentEdit.php b/app/Livewire/Project/EnvironmentEdit.php
index f48220b3d..e98b088ec 100644
--- a/app/Livewire/Project/EnvironmentEdit.php
+++ b/app/Livewire/Project/EnvironmentEdit.php
@@ -23,11 +23,11 @@ class EnvironmentEdit extends Component
     #[Validate(['nullable', 'string', 'max:255'])]
     public ?string $description = null;
 
-    public function mount(string $project_uuid, string $environment_name)
+    public function mount(string $project_uuid, string $environment_uuid)
     {
         try {
             $this->project = Project::ownedByCurrentTeam()->where('uuid', $project_uuid)->firstOrFail();
-            $this->environment = $this->project->environments()->where('name', $environment_name)->firstOrFail();
+            $this->environment = $this->project->environments()->where('uuid', $environment_uuid)->firstOrFail();
             $this->syncData();
         } catch (\Throwable $e) {
             return handleError($e, $this);
@@ -52,7 +52,10 @@ class EnvironmentEdit extends Component
     {
         try {
             $this->syncData(true);
-            $this->redirectRoute('project.environment.edit', ['environment_name' => $this->environment->name, 'project_uuid' => $this->project->uuid]);
+            $this->redirectRoute('project.environment.edit', [
+                'environment_uuid' => $this->environment->uuid,
+                'project_uuid' => $this->project->uuid,
+            ]);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
diff --git a/app/Livewire/Project/New/DockerCompose.php b/app/Livewire/Project/New/DockerCompose.php
index 199a20cf6..c1361c7ac 100644
--- a/app/Livewire/Project/New/DockerCompose.php
+++ b/app/Livewire/Project/New/DockerCompose.php
@@ -59,7 +59,7 @@ class DockerCompose extends Component
             }
 
             $project = Project::where('uuid', $this->parameters['project_uuid'])->first();
-            $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
+            $environment = $project->load(['environments'])->environments->where('uuid', $this->parameters['environment_uuid'])->first();
 
             $destination_uuid = $this->query['destination'];
             $destination = StandaloneDocker::where('uuid', $destination_uuid)->first();
@@ -96,7 +96,7 @@ class DockerCompose extends Component
 
             return redirect()->route('project.service.configuration', [
                 'service_uuid' => $service->uuid,
-                'environment_name' => $environment->name,
+                'environment_uuid' => $environment->uuid,
                 'project_uuid' => $project->uuid,
             ]);
         } catch (\Throwable $e) {
diff --git a/app/Livewire/Project/New/DockerImage.php b/app/Livewire/Project/New/DockerImage.php
index 417fb2ea0..942924437 100644
--- a/app/Livewire/Project/New/DockerImage.php
+++ b/app/Livewire/Project/New/DockerImage.php
@@ -45,7 +45,7 @@ class DockerImage extends Component
         $destination_class = $destination->getMorphClass();
 
         $project = Project::where('uuid', $this->parameters['project_uuid'])->first();
-        $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
+        $environment = $project->load(['environments'])->environments->where('uuid', $this->parameters['environment_uuid'])->first();
         $application = Application::create([
             'name' => 'docker-image-'.new Cuid2,
             'repository_project_id' => 0,
@@ -69,7 +69,7 @@ class DockerImage extends Component
 
         return redirect()->route('project.application.configuration', [
             'application_uuid' => $application->uuid,
-            'environment_name' => $environment->name,
+            'environment_uuid' => $environment->uuid,
             'project_uuid' => $project->uuid,
         ]);
     }
diff --git a/app/Livewire/Project/New/EmptyProject.php b/app/Livewire/Project/New/EmptyProject.php
index 28249b442..54cfc4b4d 100644
--- a/app/Livewire/Project/New/EmptyProject.php
+++ b/app/Livewire/Project/New/EmptyProject.php
@@ -4,6 +4,7 @@ namespace App\Livewire\Project\New;
 
 use App\Models\Project;
 use Livewire\Component;
+use Visus\Cuid2\Cuid2;
 
 class EmptyProject extends Component
 {
@@ -12,8 +13,9 @@ class EmptyProject extends Component
         $project = Project::create([
             'name' => generate_random_name(),
             'team_id' => currentTeam()->id,
+            'uuid' => (string) new Cuid2,
         ]);
 
-        return redirect()->route('project.show', ['project_uuid' => $project->uuid, 'environment_name' => 'production']);
+        return redirect()->route('project.show', ['project_uuid' => $project->uuid, 'environment_uuid' => $project->environments->first()->uuid]);
     }
 }
diff --git a/app/Livewire/Project/New/GithubPrivateRepository.php b/app/Livewire/Project/New/GithubPrivateRepository.php
index 2f4f5a25c..370d00555 100644
--- a/app/Livewire/Project/New/GithubPrivateRepository.php
+++ b/app/Livewire/Project/New/GithubPrivateRepository.php
@@ -177,7 +177,7 @@ class GithubPrivateRepository extends Component
             $destination_class = $destination->getMorphClass();
 
             $project = Project::where('uuid', $this->parameters['project_uuid'])->first();
-            $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
+            $environment = $project->load(['environments'])->environments->where('uuid', $this->parameters['environment_uuid'])->first();
 
             $application = Application::create([
                 'name' => generate_application_name($this->selected_repository_owner.'/'.$this->selected_repository_repo, $this->selected_branch_name),
@@ -211,7 +211,7 @@ class GithubPrivateRepository extends Component
 
             return redirect()->route('project.application.configuration', [
                 'application_uuid' => $application->uuid,
-                'environment_name' => $environment->name,
+                'environment_uuid' => $environment->uuid,
                 'project_uuid' => $project->uuid,
             ]);
         } catch (\Throwable $e) {
diff --git a/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php b/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
index b46c4a794..01b0c9ae8 100644
--- a/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
+++ b/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
@@ -136,7 +136,7 @@ class GithubPrivateRepositoryDeployKey extends Component
             $this->get_git_source();
 
             $project = Project::where('uuid', $this->parameters['project_uuid'])->first();
-            $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
+            $environment = $project->load(['environments'])->environments->where('uuid', $this->parameters['environment_uuid'])->first();
             if ($this->git_source === 'other') {
                 $application_init = [
                     'name' => generate_random_name(),
@@ -184,7 +184,7 @@ class GithubPrivateRepositoryDeployKey extends Component
 
             return redirect()->route('project.application.configuration', [
                 'application_uuid' => $application->uuid,
-                'environment_name' => $environment->name,
+                'environment_uuid' => $environment->uuid,
                 'project_uuid' => $project->uuid,
             ]);
         } catch (\Throwable $e) {
diff --git a/app/Livewire/Project/New/PublicGitRepository.php b/app/Livewire/Project/New/PublicGitRepository.php
index bd35dccef..2f2331fc0 100644
--- a/app/Livewire/Project/New/PublicGitRepository.php
+++ b/app/Livewire/Project/New/PublicGitRepository.php
@@ -225,7 +225,7 @@ class PublicGitRepository extends Component
             $this->validate();
             $destination_uuid = $this->query['destination'];
             $project_uuid = $this->parameters['project_uuid'];
-            $environment_name = $this->parameters['environment_name'];
+            $environment_uuid = $this->parameters['environment_uuid'];
 
             $destination = StandaloneDocker::where('uuid', $destination_uuid)->first();
             if (! $destination) {
@@ -237,7 +237,7 @@ class PublicGitRepository extends Component
             $destination_class = $destination->getMorphClass();
 
             $project = Project::where('uuid', $project_uuid)->first();
-            $environment = $project->load(['environments'])->environments->where('name', $environment_name)->first();
+            $environment = $project->load(['environments'])->environments->where('uuid', $environment_uuid)->first();
 
             if ($this->build_pack === 'dockercompose' && isDev() && $this->new_compose_services) {
                 $server = $destination->server;
@@ -260,7 +260,7 @@ class PublicGitRepository extends Component
 
                 return redirect()->route('project.service.configuration', [
                     'service_uuid' => $service->uuid,
-                    'environment_name' => $environment->name,
+                    'environment_uuid' => $environment->uuid,
                     'project_uuid' => $project->uuid,
                 ]);
 
@@ -319,7 +319,7 @@ class PublicGitRepository extends Component
 
             return redirect()->route('project.application.configuration', [
                 'application_uuid' => $application->uuid,
-                'environment_name' => $environment->name,
+                'environment_uuid' => $environment->uuid,
                 'project_uuid' => $project->uuid,
             ]);
         } catch (\Throwable $e) {
diff --git a/app/Livewire/Project/New/Select.php b/app/Livewire/Project/New/Select.php
index 3dedc11af..7ef688718 100644
--- a/app/Livewire/Project/New/Select.php
+++ b/app/Livewire/Project/New/Select.php
@@ -61,7 +61,7 @@ class Select extends Component
         }
         $projectUuid = data_get($this->parameters, 'project_uuid');
         $this->environments = Project::whereUuid($projectUuid)->first()->environments;
-        $this->selectedEnvironment = data_get($this->parameters, 'environment_name');
+        $this->selectedEnvironment = data_get($this->parameters, 'environment_uuid');
     }
 
     public function render()
@@ -73,20 +73,10 @@ class Select extends Component
     {
         return redirect()->route('project.resource.create', [
             'project_uuid' => $this->parameters['project_uuid'],
-            'environment_name' => $this->selectedEnvironment,
+            'environment_uuid' => $this->selectedEnvironment,
         ]);
     }
 
-    // public function addExistingPostgresql()
-    // {
-    //     try {
-    //         instantCommand("psql {$this->existingPostgresqlUrl} -c 'SELECT 1'");
-    //         $this->dispatch('success', 'Successfully connected to the database.');
-    //     } catch (\Throwable $e) {
-    //         return handleError($e, $this);
-    //     }
-    // }
-
     public function loadServices()
     {
         $services = get_service_templates(true);
@@ -304,7 +294,7 @@ class Select extends Component
 
         return redirect()->route('project.resource.create', [
             'project_uuid' => $this->parameters['project_uuid'],
-            'environment_name' => $this->parameters['environment_name'],
+            'environment_uuid' => $this->parameters['environment_uuid'],
             'type' => $this->type,
             'destination' => $this->destination_uuid,
             'server_id' => $this->server_id,
@@ -319,7 +309,7 @@ class Select extends Component
         } else {
             return redirect()->route('project.resource.create', [
                 'project_uuid' => $this->parameters['project_uuid'],
-                'environment_name' => $this->parameters['environment_name'],
+                'environment_uuid' => $this->parameters['environment_uuid'],
                 'type' => $this->type,
                 'destination' => $this->destination_uuid,
                 'server_id' => $this->server_id,
diff --git a/app/Livewire/Project/New/SimpleDockerfile.php b/app/Livewire/Project/New/SimpleDockerfile.php
index 3c7f42329..c3ed6039a 100644
--- a/app/Livewire/Project/New/SimpleDockerfile.php
+++ b/app/Livewire/Project/New/SimpleDockerfile.php
@@ -46,7 +46,7 @@ CMD ["nginx", "-g", "daemon off;"]
         $destination_class = $destination->getMorphClass();
 
         $project = Project::where('uuid', $this->parameters['project_uuid'])->first();
-        $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
+        $environment = $project->load(['environments'])->environments->where('uuid', $this->parameters['environment_uuid'])->first();
 
         $port = get_port_from_dockerfile($this->dockerfile);
         if (! $port) {
@@ -78,7 +78,7 @@ CMD ["nginx", "-g", "daemon off;"]
 
         return redirect()->route('project.application.configuration', [
             'application_uuid' => $application->uuid,
-            'environment_name' => $environment->name,
+            'environment_uuid' => $environment->uuid,
             'project_uuid' => $project->uuid,
         ]);
     }
diff --git a/app/Livewire/Project/Resource/Create.php b/app/Livewire/Project/Resource/Create.php
index 9266a57fc..48c396dc0 100644
--- a/app/Livewire/Project/Resource/Create.php
+++ b/app/Livewire/Project/Resource/Create.php
@@ -25,7 +25,7 @@ class Create extends Component
             return redirect()->route('dashboard');
         }
         $this->project = $project;
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first();
+        $environment = $project->load(['environments'])->environments->where('uuid', request()->route('environment_uuid'))->first();
         if (! $environment) {
             return redirect()->route('dashboard');
         }
@@ -57,7 +57,7 @@ class Create extends Component
 
                 return redirect()->route('project.database.configuration', [
                     'project_uuid' => $project->uuid,
-                    'environment_name' => $environment->name,
+                    'environment_uuid' => $environment->uuid,
                     'database_uuid' => $database->uuid,
                 ]);
             }
@@ -106,7 +106,7 @@ class Create extends Component
 
                     return redirect()->route('project.service.configuration', [
                         'service_uuid' => $service->uuid,
-                        'environment_name' => $environment->name,
+                        'environment_uuid' => $environment->uuid,
                         'project_uuid' => $project->uuid,
                     ]);
                 }
diff --git a/app/Livewire/Project/Resource/Index.php b/app/Livewire/Project/Resource/Index.php
index 283496887..fc394e88f 100644
--- a/app/Livewire/Project/Resource/Index.php
+++ b/app/Livewire/Project/Resource/Index.php
@@ -41,7 +41,7 @@ class Index extends Component
         if (! $project) {
             return redirect()->route('dashboard');
         }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first();
+        $environment = $project->load(['environments'])->environments->where('uuid', request()->route('environment_uuid'))->first();
         if (! $environment) {
             return redirect()->route('dashboard');
         }
@@ -52,7 +52,7 @@ class Index extends Component
             if (data_get($application, 'environment.project.uuid')) {
                 $application->hrefLink = route('project.application.configuration', [
                     'project_uuid' => data_get($application, 'environment.project.uuid'),
-                    'environment_name' => data_get($application, 'environment.name'),
+                    'environment_uuid' => data_get($application, 'environment.uuid'),
                     'application_uuid' => data_get($application, 'uuid'),
                 ]);
             }
@@ -64,7 +64,7 @@ class Index extends Component
             if (data_get($postgresql, 'environment.project.uuid')) {
                 $postgresql->hrefLink = route('project.database.configuration', [
                     'project_uuid' => data_get($postgresql, 'environment.project.uuid'),
-                    'environment_name' => data_get($postgresql, 'environment.name'),
+                    'environment_uuid' => data_get($postgresql, 'environment.uuid'),
                     'database_uuid' => data_get($postgresql, 'uuid'),
                 ]);
             }
@@ -76,7 +76,7 @@ class Index extends Component
             if (data_get($redis, 'environment.project.uuid')) {
                 $redis->hrefLink = route('project.database.configuration', [
                     'project_uuid' => data_get($redis, 'environment.project.uuid'),
-                    'environment_name' => data_get($redis, 'environment.name'),
+                    'environment_uuid' => data_get($redis, 'environment.uuid'),
                     'database_uuid' => data_get($redis, 'uuid'),
                 ]);
             }
@@ -88,7 +88,7 @@ class Index extends Component
             if (data_get($mongodb, 'environment.project.uuid')) {
                 $mongodb->hrefLink = route('project.database.configuration', [
                     'project_uuid' => data_get($mongodb, 'environment.project.uuid'),
-                    'environment_name' => data_get($mongodb, 'environment.name'),
+                    'environment_uuid' => data_get($mongodb, 'environment.uuid'),
                     'database_uuid' => data_get($mongodb, 'uuid'),
                 ]);
             }
@@ -100,7 +100,7 @@ class Index extends Component
             if (data_get($mysql, 'environment.project.uuid')) {
                 $mysql->hrefLink = route('project.database.configuration', [
                     'project_uuid' => data_get($mysql, 'environment.project.uuid'),
-                    'environment_name' => data_get($mysql, 'environment.name'),
+                    'environment_uuid' => data_get($mysql, 'environment.uuid'),
                     'database_uuid' => data_get($mysql, 'uuid'),
                 ]);
             }
@@ -112,7 +112,7 @@ class Index extends Component
             if (data_get($mariadb, 'environment.project.uuid')) {
                 $mariadb->hrefLink = route('project.database.configuration', [
                     'project_uuid' => data_get($mariadb, 'environment.project.uuid'),
-                    'environment_name' => data_get($mariadb, 'environment.name'),
+                    'environment_uuid' => data_get($mariadb, 'environment.uuid'),
                     'database_uuid' => data_get($mariadb, 'uuid'),
                 ]);
             }
@@ -124,7 +124,7 @@ class Index extends Component
             if (data_get($keydb, 'environment.project.uuid')) {
                 $keydb->hrefLink = route('project.database.configuration', [
                     'project_uuid' => data_get($keydb, 'environment.project.uuid'),
-                    'environment_name' => data_get($keydb, 'environment.name'),
+                    'environment_uuid' => data_get($keydb, 'environment.uuid'),
                     'database_uuid' => data_get($keydb, 'uuid'),
                 ]);
             }
@@ -136,7 +136,7 @@ class Index extends Component
             if (data_get($dragonfly, 'environment.project.uuid')) {
                 $dragonfly->hrefLink = route('project.database.configuration', [
                     'project_uuid' => data_get($dragonfly, 'environment.project.uuid'),
-                    'environment_name' => data_get($dragonfly, 'environment.name'),
+                    'environment_uuid' => data_get($dragonfly, 'environment.uuid'),
                     'database_uuid' => data_get($dragonfly, 'uuid'),
                 ]);
             }
@@ -148,7 +148,7 @@ class Index extends Component
             if (data_get($clickhouse, 'environment.project.uuid')) {
                 $clickhouse->hrefLink = route('project.database.configuration', [
                     'project_uuid' => data_get($clickhouse, 'environment.project.uuid'),
-                    'environment_name' => data_get($clickhouse, 'environment.name'),
+                    'environment_uuid' => data_get($clickhouse, 'environment.uuid'),
                     'database_uuid' => data_get($clickhouse, 'uuid'),
                 ]);
             }
@@ -160,7 +160,7 @@ class Index extends Component
             if (data_get($service, 'environment.project.uuid')) {
                 $service->hrefLink = route('project.service.configuration', [
                     'project_uuid' => data_get($service, 'environment.project.uuid'),
-                    'environment_name' => data_get($service, 'environment.name'),
+                    'environment_uuid' => data_get($service, 'environment.uuid'),
                     'service_uuid' => data_get($service, 'uuid'),
                 ]);
                 $service->status = $service->status();
diff --git a/app/Livewire/Project/Shared/Danger.php b/app/Livewire/Project/Shared/Danger.php
index a0b4ac2c4..7da48f9fb 100644
--- a/app/Livewire/Project/Shared/Danger.php
+++ b/app/Livewire/Project/Shared/Danger.php
@@ -20,7 +20,7 @@ class Danger extends Component
 
     public $projectUuid;
 
-    public $environmentName;
+    public $environmentUuid;
 
     public bool $delete_configurations = true;
 
@@ -39,7 +39,7 @@ class Danger extends Component
         $parameters = get_route_parameters();
         $this->modalId = new Cuid2;
         $this->projectUuid = data_get($parameters, 'project_uuid');
-        $this->environmentName = data_get($parameters, 'environment_name');
+        $this->environmentUuid = data_get($parameters, 'environment_uuid');
 
         if ($this->resource === null) {
             if (isset($parameters['service_uuid'])) {
@@ -107,7 +107,7 @@ class Danger extends Component
 
             return redirect()->route('project.resource.index', [
                 'project_uuid' => $this->projectUuid,
-                'environment_name' => $this->environmentName,
+                'environment_uuid' => $this->environmentUuid,
             ]);
         } catch (\Throwable $e) {
             return handleError($e, $this);
diff --git a/app/Livewire/Project/Shared/Destination.php b/app/Livewire/Project/Shared/Destination.php
index c305e817c..e28ff1d5b 100644
--- a/app/Livewire/Project/Shared/Destination.php
+++ b/app/Livewire/Project/Shared/Destination.php
@@ -85,7 +85,7 @@ class Destination extends Component
             'project_uuid' => data_get($this->resource, 'environment.project.uuid'),
             'application_uuid' => data_get($this->resource, 'uuid'),
             'deployment_uuid' => $deployment_uuid,
-            'environment_name' => data_get($this->resource, 'environment.name'),
+            'environment_uuid' => data_get($this->resource, 'environment.uuid'),
         ]);
     }
 
diff --git a/app/Livewire/Project/Shared/ResourceOperations.php b/app/Livewire/Project/Shared/ResourceOperations.php
index e67df6aa9..81313c133 100644
--- a/app/Livewire/Project/Shared/ResourceOperations.php
+++ b/app/Livewire/Project/Shared/ResourceOperations.php
@@ -15,7 +15,7 @@ class ResourceOperations extends Component
 
     public $projectUuid;
 
-    public $environmentName;
+    public $environmentUuid;
 
     public $projects;
 
@@ -25,7 +25,7 @@ class ResourceOperations extends Component
     {
         $parameters = get_route_parameters();
         $this->projectUuid = data_get($parameters, 'project_uuid');
-        $this->environmentName = data_get($parameters, 'environment_name');
+        $this->environmentUuid = data_get($parameters, 'environment_uuid');
         $this->projects = Project::ownedByCurrentTeam()->get();
         $this->servers = currentTeam()->servers;
     }
@@ -72,7 +72,7 @@ class ResourceOperations extends Component
             }
             $route = route('project.application.configuration', [
                 'project_uuid' => $this->projectUuid,
-                'environment_name' => $this->environmentName,
+                'environment_uuid' => $this->environmentUuid,
                 'application_uuid' => $new_resource->uuid,
             ]).'#resource-operations';
 
@@ -115,7 +115,7 @@ class ResourceOperations extends Component
             }
             $route = route('project.database.configuration', [
                 'project_uuid' => $this->projectUuid,
-                'environment_name' => $this->environmentName,
+                'environment_uuid' => $this->environmentUuid,
                 'database_uuid' => $new_resource->uuid,
             ]).'#resource-operations';
 
@@ -141,7 +141,7 @@ class ResourceOperations extends Component
             $new_resource->parse();
             $route = route('project.service.configuration', [
                 'project_uuid' => $this->projectUuid,
-                'environment_name' => $this->environmentName,
+                'environment_uuid' => $this->environmentUuid,
                 'service_uuid' => $new_resource->uuid,
             ]).'#resource-operations';
 
@@ -159,7 +159,7 @@ class ResourceOperations extends Component
             if ($this->resource->type() === 'application') {
                 $route = route('project.application.configuration', [
                     'project_uuid' => $new_environment->project->uuid,
-                    'environment_name' => $new_environment->name,
+                    'environment_uuid' => $new_environment->uuid,
                     'application_uuid' => $this->resource->uuid,
                 ]).'#resource-operations';
 
@@ -167,7 +167,7 @@ class ResourceOperations extends Component
             } elseif (str($this->resource->type())->startsWith('standalone-')) {
                 $route = route('project.database.configuration', [
                     'project_uuid' => $new_environment->project->uuid,
-                    'environment_name' => $new_environment->name,
+                    'environment_uuid' => $new_environment->uuid,
                     'database_uuid' => $this->resource->uuid,
                 ]).'#resource-operations';
 
@@ -175,7 +175,7 @@ class ResourceOperations extends Component
             } elseif ($this->resource->type() === 'service') {
                 $route = route('project.service.configuration', [
                     'project_uuid' => $new_environment->project->uuid,
-                    'environment_name' => $new_environment->name,
+                    'environment_uuid' => $new_environment->uuid,
                     'service_uuid' => $this->resource->uuid,
                 ]).'#resource-operations';
 
diff --git a/app/Livewire/SharedVariables/Environment/Show.php b/app/Livewire/SharedVariables/Environment/Show.php
index daf1df212..68aa4f01b 100644
--- a/app/Livewire/SharedVariables/Environment/Show.php
+++ b/app/Livewire/SharedVariables/Environment/Show.php
@@ -42,8 +42,8 @@ class Show extends Component
     public function mount()
     {
         $this->parameters = get_route_parameters();
-        $this->project = Project::ownedByCurrentTeam()->where('uuid', request()->route('project_uuid'))->first();
-        $this->environment = $this->project->environments()->where('name', request()->route('environment_name'))->first();
+        $this->project = Project::ownedByCurrentTeam()->where('uuid', request()->route('project_uuid'))->firstOrFail();
+        $this->environment = $this->project->environments()->where('uuid', request()->route('environment_uuid'))->firstOrFail();
     }
 
     public function render()
diff --git a/app/Livewire/Source/Github/Change.php b/app/Livewire/Source/Github/Change.php
index 07cef54f9..0e84756f8 100644
--- a/app/Livewire/Source/Github/Change.php
+++ b/app/Livewire/Source/Github/Change.php
@@ -116,14 +116,14 @@ class Change extends Component
                 } else {
                     $parameters = data_get(session('from'), 'parameters');
                     $back = data_get(session('from'), 'back');
-                    $environment_name = data_get($parameters, 'environment_name');
+                    $environment_uuid = data_get($parameters, 'environment_uuid');
                     $project_uuid = data_get($parameters, 'project_uuid');
                     $type = data_get($parameters, 'type');
                     $destination = data_get($parameters, 'destination');
                     session()->forget('from');
 
                     return redirect()->route($back, [
-                        'environment_name' => $environment_name,
+                        'environment_uuid' => $environment_uuid,
                         'project_uuid' => $project_uuid,
                         'type' => $type,
                         'destination' => $destination,
diff --git a/app/Models/Application.php b/app/Models/Application.php
index c284528f1..0e611931b 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -318,7 +318,7 @@ class Application extends BaseModel
         if (data_get($this, 'environment.project.uuid')) {
             return route('project.application.configuration', [
                 'project_uuid' => data_get($this, 'environment.project.uuid'),
-                'environment_name' => data_get($this, 'environment.name'),
+                'environment_uuid' => data_get($this, 'environment.uuid'),
                 'application_uuid' => data_get($this, 'uuid'),
             ]);
         }
@@ -331,7 +331,7 @@ class Application extends BaseModel
         if (data_get($this, 'environment.project.uuid')) {
             $route = route('project.application.scheduled-tasks', [
                 'project_uuid' => data_get($this, 'environment.project.uuid'),
-                'environment_name' => data_get($this, 'environment.name'),
+                'environment_uuid' => data_get($this, 'environment.uuid'),
                 'application_uuid' => data_get($this, 'uuid'),
                 'task_uuid' => $task_uuid,
             ]);
diff --git a/app/Models/Project.php b/app/Models/Project.php
index f27e6c208..3b50b9b33 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use OpenApi\Attributes as OA;
+use Visus\Cuid2\Cuid2;
 
 #[OA\Schema(
     description: 'Project model',
@@ -24,8 +25,6 @@ class Project extends BaseModel
 {
     protected $guarded = [];
 
-    protected $appends = ['default_environment'];
-
     public static function ownedByCurrentTeam()
     {
         return Project::whereTeamId(currentTeam()->id)->orderByRaw('LOWER(name)');
@@ -40,6 +39,7 @@ class Project extends BaseModel
             Environment::create([
                 'name' => 'production',
                 'project_id' => $project->id,
+                'uuid' => (string) new Cuid2,
             ]);
         });
         static::deleting(function ($project) {
@@ -140,18 +140,4 @@ class Project extends BaseModel
     {
         return $this->postgresqls()->get()->merge($this->redis()->get())->merge($this->mongodbs()->get())->merge($this->mysqls()->get())->merge($this->mariadbs()->get())->merge($this->keydbs()->get())->merge($this->dragonflies()->get())->merge($this->clickhouses()->get());
     }
-
-    public function getDefaultEnvironmentAttribute()
-    {
-        $default = $this->environments()->where('name', 'production')->first();
-        if ($default) {
-            return $default->name;
-        }
-        $default = $this->environments()->get();
-        if ($default->count() > 0) {
-            return $default->sortBy('created_at')->first()->name;
-        }
-
-        return null;
-    }
 }
diff --git a/app/Models/Service.php b/app/Models/Service.php
index 6d3d2024b..1ba86a95f 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -1132,7 +1132,7 @@ class Service extends BaseModel
         if (data_get($this, 'environment.project.uuid')) {
             return route('project.service.configuration', [
                 'project_uuid' => data_get($this, 'environment.project.uuid'),
-                'environment_name' => data_get($this, 'environment.name'),
+                'environment_uuid' => data_get($this, 'environment.uuid'),
                 'service_uuid' => data_get($this, 'uuid'),
             ]);
         }
@@ -1145,7 +1145,7 @@ class Service extends BaseModel
         if (data_get($this, 'environment.project.uuid')) {
             $route = route('project.service.scheduled-tasks', [
                 'project_uuid' => data_get($this, 'environment.project.uuid'),
-                'environment_name' => data_get($this, 'environment.name'),
+                'environment_uuid' => data_get($this, 'environment.uuid'),
                 'service_uuid' => data_get($this, 'uuid'),
                 'task_uuid' => $task_uuid,
             ]);
diff --git a/app/Models/StandaloneClickhouse.php b/app/Models/StandaloneClickhouse.php
index 6d66c6854..4776be4a8 100644
--- a/app/Models/StandaloneClickhouse.php
+++ b/app/Models/StandaloneClickhouse.php
@@ -169,7 +169,7 @@ class StandaloneClickhouse extends BaseModel
         if (data_get($this, 'environment.project.uuid')) {
             return route('project.database.configuration', [
                 'project_uuid' => data_get($this, 'environment.project.uuid'),
-                'environment_name' => data_get($this, 'environment.name'),
+                'environment_uuid' => data_get($this, 'environment.uuid'),
                 'database_uuid' => data_get($this, 'uuid'),
             ]);
         }
diff --git a/app/Models/StandaloneDragonfly.php b/app/Models/StandaloneDragonfly.php
index f7d83f0a3..6eaf81a14 100644
--- a/app/Models/StandaloneDragonfly.php
+++ b/app/Models/StandaloneDragonfly.php
@@ -174,7 +174,7 @@ class StandaloneDragonfly extends BaseModel
         if (data_get($this, 'environment.project.uuid')) {
             return route('project.database.configuration', [
                 'project_uuid' => data_get($this, 'environment.project.uuid'),
-                'environment_name' => data_get($this, 'environment.name'),
+                'environment_uuid' => data_get($this, 'environment.uuid'),
                 'database_uuid' => data_get($this, 'uuid'),
             ]);
         }
diff --git a/app/Models/StandaloneKeydb.php b/app/Models/StandaloneKeydb.php
index 083c743d9..b096d4bde 100644
--- a/app/Models/StandaloneKeydb.php
+++ b/app/Models/StandaloneKeydb.php
@@ -174,7 +174,7 @@ class StandaloneKeydb extends BaseModel
         if (data_get($this, 'environment.project.uuid')) {
             return route('project.database.configuration', [
                 'project_uuid' => data_get($this, 'environment.project.uuid'),
-                'environment_name' => data_get($this, 'environment.name'),
+                'environment_uuid' => data_get($this, 'environment.uuid'),
                 'database_uuid' => data_get($this, 'uuid'),
             ]);
         }
diff --git a/app/Models/StandaloneMariadb.php b/app/Models/StandaloneMariadb.php
index 833dad6c4..0b19d13c7 100644
--- a/app/Models/StandaloneMariadb.php
+++ b/app/Models/StandaloneMariadb.php
@@ -174,7 +174,7 @@ class StandaloneMariadb extends BaseModel
         if (data_get($this, 'environment.project.uuid')) {
             return route('project.database.configuration', [
                 'project_uuid' => data_get($this, 'environment.project.uuid'),
-                'environment_name' => data_get($this, 'environment.name'),
+                'environment_uuid' => data_get($this, 'environment.uuid'),
                 'database_uuid' => data_get($this, 'uuid'),
             ]);
         }
diff --git a/app/Models/StandaloneMongodb.php b/app/Models/StandaloneMongodb.php
index dd8893180..e4f400952 100644
--- a/app/Models/StandaloneMongodb.php
+++ b/app/Models/StandaloneMongodb.php
@@ -183,7 +183,7 @@ class StandaloneMongodb extends BaseModel
         if (data_get($this, 'environment.project.uuid')) {
             return route('project.database.configuration', [
                 'project_uuid' => data_get($this, 'environment.project.uuid'),
-                'environment_name' => data_get($this, 'environment.name'),
+                'environment_uuid' => data_get($this, 'environment.uuid'),
                 'database_uuid' => data_get($this, 'uuid'),
             ]);
         }
diff --git a/app/Models/StandaloneMysql.php b/app/Models/StandaloneMysql.php
index 710fea1bc..46556c04d 100644
--- a/app/Models/StandaloneMysql.php
+++ b/app/Models/StandaloneMysql.php
@@ -175,7 +175,7 @@ class StandaloneMysql extends BaseModel
         if (data_get($this, 'environment.project.uuid')) {
             return route('project.database.configuration', [
                 'project_uuid' => data_get($this, 'environment.project.uuid'),
-                'environment_name' => data_get($this, 'environment.name'),
+                'environment_uuid' => data_get($this, 'environment.uuid'),
                 'database_uuid' => data_get($this, 'uuid'),
             ]);
         }
diff --git a/app/Models/StandalonePostgresql.php b/app/Models/StandalonePostgresql.php
index 4a457a6cf..762afe884 100644
--- a/app/Models/StandalonePostgresql.php
+++ b/app/Models/StandalonePostgresql.php
@@ -170,7 +170,7 @@ class StandalonePostgresql extends BaseModel
         if (data_get($this, 'environment.project.uuid')) {
             return route('project.database.configuration', [
                 'project_uuid' => data_get($this, 'environment.project.uuid'),
-                'environment_name' => data_get($this, 'environment.name'),
+                'environment_uuid' => data_get($this, 'environment.uuid'),
                 'database_uuid' => data_get($this, 'uuid'),
             ]);
         }
diff --git a/app/Models/StandaloneRedis.php b/app/Models/StandaloneRedis.php
index 826bb951c..5aeb283a1 100644
--- a/app/Models/StandaloneRedis.php
+++ b/app/Models/StandaloneRedis.php
@@ -170,7 +170,7 @@ class StandaloneRedis extends BaseModel
         if (data_get($this, 'environment.project.uuid')) {
             return route('project.database.configuration', [
                 'project_uuid' => data_get($this, 'environment.project.uuid'),
-                'environment_name' => data_get($this, 'environment.name'),
+                'environment_uuid' => data_get($this, 'environment.uuid'),
                 'database_uuid' => data_get($this, 'uuid'),
             ]);
         }
diff --git a/resources/views/components/resources/breadcrumbs.blade.php b/resources/views/components/resources/breadcrumbs.blade.php
index f9733f63a..f1c1ca99e 100644
--- a/resources/views/components/resources/breadcrumbs.blade.php
+++ b/resources/views/components/resources/breadcrumbs.blade.php
@@ -21,7 +21,9 @@
         <li>
             <div class="flex items-center">
                 <a class="text-xs truncate lg:text-sm"
-                    href="{{ route('project.resource.index', ['environment_name' => $this->parameters['environment_name'], 'project_uuid' => $this->parameters['project_uuid']]) }}">{{ $this->parameters['environment_name'] }}</a>
+                    href="{{ route('project.resource.index', ['environment_uuid' => $this->parameters['environment_uuid'], 'project_uuid' => $this->parameters['project_uuid']]) }}">
+                    {{ data_get($resource, 'environment.name', $this->parameters['environment_uuid']) }}
+                </a>
                 <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold dark:text-warning" fill="currentColor"
                     viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
                     <path fill-rule="evenodd"
diff --git a/resources/views/livewire/project/environment-edit.blade.php b/resources/views/livewire/project/environment-edit.blade.php
index af5e686c4..bdea09ced 100644
--- a/resources/views/livewire/project/environment-edit.blade.php
+++ b/resources/views/livewire/project/environment-edit.blade.php
@@ -26,7 +26,7 @@
                 <li>
                     <div class="flex items-center">
                         <a class="text-xs truncate lg:text-sm"
-                            href="{{ route('project.resource.index', ['environment_name' => $environment->name, 'project_uuid' => $project->uuid]) }}">
+                            href="{{ route('project.resource.index', ['environment_uuid' => $environment->uuid, 'project_uuid' => $project->uuid]) }}">
                             {{ $environment->name }}
                         </a>
                     </div>
diff --git a/resources/views/livewire/project/resource/index.blade.php b/resources/views/livewire/project/resource/index.blade.php
index a618e6db2..8973177f8 100644
--- a/resources/views/livewire/project/resource/index.blade.php
+++ b/resources/views/livewire/project/resource/index.blade.php
@@ -7,15 +7,15 @@
             <h1>Resources</h1>
             @if ($environment->isEmpty())
                 <a class="button"
-                    href="{{ route('project.clone-me', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($parameters, 'environment_name')]) }}">
+                    href="{{ route('project.clone-me', ['project_uuid' => data_get($project, 'uuid'), 'environment_uuid' => data_get($environment, 'uuid')]) }}">
                     Clone
                 </a>
             @else
-                <a href="{{ route('project.resource.create', ['project_uuid' => data_get($parameters, 'project_uuid'), 'environment_name' => data_get($parameters, 'environment_name')]) }}  "
+                <a href="{{ route('project.resource.create', ['project_uuid' => data_get($parameters, 'project_uuid'), 'environment_uuid' => data_get($environment, 'uuid')]) }}"
                     class="button">+
                     New</a>
                 <a class="button"
-                    href="{{ route('project.clone-me', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($parameters, 'environment_name')]) }}">
+                    href="{{ route('project.clone-me', ['project_uuid' => data_get($project, 'uuid'), 'environment_uuid' => data_get($environment, 'uuid')]) }}">
                     Clone
                 </a>
             @endif
@@ -44,7 +44,7 @@
         </nav>
     </div>
     @if ($environment->isEmpty())
-        <a href="{{ route('project.resource.create', ['project_uuid' => data_get($parameters, 'project_uuid'), 'environment_name' => data_get($parameters, 'environment_name')]) }} "
+        <a href="{{ route('project.resource.create', ['project_uuid' => data_get($parameters, 'project_uuid'), 'environment_uuid' => data_get($environment, 'uuid')]) }}"
             class="items-center justify-center box">+ Add New Resource</a>
     @else
         <div x-data="searchComponent()">

From 75491098a0bd3ba07d198c89d014af75e5b20899 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 16:05:24 +0100
Subject: [PATCH 20/60] new notification links

---
 app/Notifications/Application/DeploymentFailed.php  | 5 ++++-
 app/Notifications/Application/DeploymentSuccess.php | 5 ++++-
 app/Notifications/Application/StatusChanged.php     | 6 ++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/Notifications/Application/DeploymentFailed.php b/app/Notifications/Application/DeploymentFailed.php
index fae8951fd..191f7bd2e 100644
--- a/app/Notifications/Application/DeploymentFailed.php
+++ b/app/Notifications/Application/DeploymentFailed.php
@@ -26,6 +26,8 @@ class DeploymentFailed extends Notification implements ShouldQueue
 
     public string $project_uuid;
 
+    public string $environment_uuid;
+
     public string $environment_name;
 
     public ?string $deployment_url = null;
@@ -40,12 +42,13 @@ class DeploymentFailed extends Notification implements ShouldQueue
         $this->preview = $preview;
         $this->application_name = data_get($application, 'name');
         $this->project_uuid = data_get($application, 'environment.project.uuid');
+        $this->environment_uuid = data_get($application, 'environment.uuid');
         $this->environment_name = data_get($application, 'environment.name');
         $this->fqdn = data_get($application, 'fqdn');
         if (str($this->fqdn)->explode(',')->count() > 1) {
             $this->fqdn = str($this->fqdn)->explode(',')->first();
         }
-        $this->deployment_url = base_url()."/project/{$this->project_uuid}/".urlencode($this->environment_name)."/application/{$this->application->uuid}/deployment/{$this->deployment_uuid}";
+        $this->deployment_url = base_url()."/project/{$this->project_uuid}/environments/{$this->environment_uuid}/application/{$this->application->uuid}/deployment/{$this->deployment_uuid}";
     }
 
     public function via(object $notifiable): array
diff --git a/app/Notifications/Application/DeploymentSuccess.php b/app/Notifications/Application/DeploymentSuccess.php
index bfdef9f25..05e3048c5 100644
--- a/app/Notifications/Application/DeploymentSuccess.php
+++ b/app/Notifications/Application/DeploymentSuccess.php
@@ -26,6 +26,8 @@ class DeploymentSuccess extends Notification implements ShouldQueue
 
     public string $project_uuid;
 
+    public string $environment_uuid;
+
     public string $environment_name;
 
     public ?string $deployment_url = null;
@@ -40,12 +42,13 @@ class DeploymentSuccess extends Notification implements ShouldQueue
         $this->preview = $preview;
         $this->application_name = data_get($application, 'name');
         $this->project_uuid = data_get($application, 'environment.project.uuid');
+        $this->environment_uuid = data_get($application, 'environment.uuid');
         $this->environment_name = data_get($application, 'environment.name');
         $this->fqdn = data_get($application, 'fqdn');
         if (str($this->fqdn)->explode(',')->count() > 1) {
             $this->fqdn = str($this->fqdn)->explode(',')->first();
         }
-        $this->deployment_url = base_url()."/project/{$this->project_uuid}/".urlencode($this->environment_name)."/application/{$this->application->uuid}/deployment/{$this->deployment_uuid}";
+        $this->deployment_url = base_url()."/project/{$this->project_uuid}/environments/{$this->environment_uuid}/application/{$this->application->uuid}/deployment/{$this->deployment_uuid}";
     }
 
     public function via(object $notifiable): array
diff --git a/app/Notifications/Application/StatusChanged.php b/app/Notifications/Application/StatusChanged.php
index 3b062effb..be18b800b 100644
--- a/app/Notifications/Application/StatusChanged.php
+++ b/app/Notifications/Application/StatusChanged.php
@@ -19,6 +19,8 @@ class StatusChanged extends Notification implements ShouldQueue
 
     public string $project_uuid;
 
+    public string $environment_uuid;
+
     public string $environment_name;
 
     public ?string $resource_url = null;
@@ -30,12 +32,12 @@ class StatusChanged extends Notification implements ShouldQueue
         $this->onQueue('high');
         $this->resource_name = data_get($resource, 'name');
         $this->project_uuid = data_get($resource, 'environment.project.uuid');
-        $this->environment_name = data_get($resource, 'environment.name');
+        $this->environment_uuid = data_get($resource, 'environment.uuid');
         $this->fqdn = data_get($resource, 'fqdn', null);
         if (str($this->fqdn)->explode(',')->count() > 1) {
             $this->fqdn = str($this->fqdn)->explode(',')->first();
         }
-        $this->resource_url = base_url()."/project/{$this->project_uuid}/".urlencode($this->environment_name)."/application/{$this->resource->uuid}";
+        $this->resource_url = base_url()."/project/{$this->project_uuid}/environments/{$this->environment_uuid}/application/{$this->resource->uuid}";
     }
 
     public function via(object $notifiable): array

From bde895b6cd76621a648d1939cdbcb52bc35b54e7 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 16:08:27 +0100
Subject: [PATCH 21/60] fix scheduled task url

---
 app/Livewire/Project/Shared/ScheduledTask/Show.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Livewire/Project/Shared/ScheduledTask/Show.php b/app/Livewire/Project/Shared/ScheduledTask/Show.php
index 0900a1d70..0764ab3b9 100644
--- a/app/Livewire/Project/Shared/ScheduledTask/Show.php
+++ b/app/Livewire/Project/Shared/ScheduledTask/Show.php
@@ -46,7 +46,7 @@ class Show extends Component
     #[Locked]
     public string $task_uuid;
 
-    public function mount(string $task_uuid, string $project_uuid, string $environment_name, ?string $application_uuid = null, ?string $service_uuid = null)
+    public function mount(string $task_uuid, string $project_uuid, string $environment_uuid, ?string $application_uuid = null, ?string $service_uuid = null)
     {
         try {
             $this->task_uuid = $task_uuid;
@@ -60,7 +60,7 @@ class Show extends Component
                 $this->resource = Service::ownedByCurrentTeam()->where('uuid', $service_uuid)->firstOrFail();
             }
             $this->parameters = [
-                'environment_name' => $environment_name,
+                'environment_uuid' => $environment_uuid,
                 'project_uuid' => $project_uuid,
                 'application_uuid' => $application_uuid,
                 'service_uuid' => $service_uuid,

From 371b4a3f83ca3e3e077f13a55be099e131343c10 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 16:11:53 +0100
Subject: [PATCH 22/60] remove unused var

---
 app/Notifications/Application/StatusChanged.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Notifications/Application/StatusChanged.php b/app/Notifications/Application/StatusChanged.php
index be18b800b..4d0b0b3db 100644
--- a/app/Notifications/Application/StatusChanged.php
+++ b/app/Notifications/Application/StatusChanged.php
@@ -21,8 +21,6 @@ class StatusChanged extends Notification implements ShouldQueue
 
     public string $environment_uuid;
 
-    public string $environment_name;
-
     public ?string $resource_url = null;
 
     public ?string $fqdn;

From c5f365e38442576d4b5e11bef580fd3362d68cb0 Mon Sep 17 00:00:00 2001
From: Zao Soula <contact@zaosoula.fr>
Date: Thu, 12 Dec 2024 19:39:11 +0100
Subject: [PATCH 23/60] feat: add infomaniak oauth

---
 app/Providers/EventServiceProvider.php  |  2 +
 bootstrap/helpers/socialite.php         |  1 +
 composer.json                           |  1 +
 composer.lock                           | 53 ++++++++++++++++++++++++-
 database/seeders/OauthSettingSeeder.php |  1 +
 lang/ar.json                            |  1 +
 lang/cs.json                            |  1 +
 lang/de.json                            |  1 +
 lang/en.json                            |  1 +
 lang/es.json                            |  3 +-
 lang/fa.json                            |  1 +
 lang/fr.json                            |  1 +
 lang/it.json                            |  1 +
 lang/ja.json                            |  1 +
 lang/pt.json                            |  1 +
 lang/ro.json                            |  1 +
 lang/tr.json                            |  1 +
 lang/vi.json                            |  1 +
 lang/zh-cn.json                         |  1 +
 lang/zh-tw.json                         |  1 +
 20 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index aa3579f8d..428f78cb5 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -11,6 +11,7 @@ use Illuminate\Foundation\Events\MaintenanceModeEnabled;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
 use SocialiteProviders\Authentik\AuthentikExtendSocialite;
 use SocialiteProviders\Azure\AzureExtendSocialite;
+use SocialiteProviders\Infomaniak\InfomaniakExtendSocialite;
 use SocialiteProviders\Manager\SocialiteWasCalled;
 
 class EventServiceProvider extends ServiceProvider
@@ -25,6 +26,7 @@ class EventServiceProvider extends ServiceProvider
         SocialiteWasCalled::class => [
             AzureExtendSocialite::class.'@handle',
             AuthentikExtendSocialite::class.'@handle',
+            InfomaniakExtendSocialite::class.'@handle',
         ],
         ProxyStarted::class => [
             ProxyStartedNotification::class,
diff --git a/bootstrap/helpers/socialite.php b/bootstrap/helpers/socialite.php
index 130227e81..09dffb78a 100644
--- a/bootstrap/helpers/socialite.php
+++ b/bootstrap/helpers/socialite.php
@@ -40,6 +40,7 @@ function get_socialite_provider(string $provider)
         'github' => \Laravel\Socialite\Two\GithubProvider::class,
         'gitlab' => \Laravel\Socialite\Two\GitlabProvider::class,
         'google' => \Laravel\Socialite\Two\GoogleProvider::class,
+        'infomaniak' => \SocialiteProviders\Infomaniak\Provider::class,
     ];
 
     return Socialite::buildProvider(
diff --git a/composer.json b/composer.json
index b8dc354c3..8e8ad0a4b 100644
--- a/composer.json
+++ b/composer.json
@@ -40,6 +40,7 @@
         "resend/resend-laravel": "^0.15.0",
         "sentry/sentry-laravel": "^4.6",
         "socialiteproviders/authentik": "^5.2",
+        "socialiteproviders/infomaniak": "^4.0",
         "socialiteproviders/microsoft-azure": "^5.1",
         "spatie/laravel-activitylog": "^4.7.3",
         "spatie/laravel-data": "^4.11",
diff --git a/composer.lock b/composer.lock
index 3fbe72afb..50d64cba2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "871067cb42e6347ca53ff36e81ac5079",
+    "content-hash": "5517a7becb5d31fa2ef3ecfaea06f7a7",
     "packages": [
         {
             "name": "3sidedcube/laravel-redoc",
@@ -7467,6 +7467,57 @@
             },
             "time": "2023-11-07T22:21:16+00:00"
         },
+        {
+            "name": "socialiteproviders/infomaniak",
+            "version": "4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SocialiteProviders/Infomaniak.git",
+                "reference": "9796ad686204443bfdf3ff19a6c409e8771667e1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SocialiteProviders/Infomaniak/zipball/9796ad686204443bfdf3ff19a6c409e8771667e1",
+                "reference": "9796ad686204443bfdf3ff19a6c409e8771667e1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": "^8.0",
+                "socialiteproviders/manager": "^4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "SocialiteProviders\\Infomaniak\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Leopold Jacquot",
+                    "email": "leopold.jacquot@infomaniak.com"
+                }
+            ],
+            "description": "Infomaniak OAuth2 Provider for Laravel Socialite",
+            "keywords": [
+                "infomaniak",
+                "laravel",
+                "oauth",
+                "oauth2",
+                "provider",
+                "socialite"
+            ],
+            "support": {
+                "docs": "https://socialiteproviders.com/qq",
+                "issues": "https://github.com/socialiteproviders/providers/issues",
+                "source": "https://github.com/socialiteproviders/providers"
+            },
+            "time": "2024-11-20T05:42:36+00:00"
+        },
         {
             "name": "socialiteproviders/manager",
             "version": "v4.7.0",
diff --git a/database/seeders/OauthSettingSeeder.php b/database/seeders/OauthSettingSeeder.php
index bf902175f..f219aecc0 100644
--- a/database/seeders/OauthSettingSeeder.php
+++ b/database/seeders/OauthSettingSeeder.php
@@ -19,6 +19,7 @@ class OauthSettingSeeder extends Seeder
             'gitlab',
             'google',
             'authentik',
+            'infomaniak',
         ]);
 
         $isOauthSeeded = OauthSetting::count() > 0;
diff --git a/lang/ar.json b/lang/ar.json
index 4b9afbe99..b473318d3 100644
--- a/lang/ar.json
+++ b/lang/ar.json
@@ -5,6 +5,7 @@
     "auth.login.github": "تسجيل الدخول باستخدام GitHub",
     "auth.login.gitlab": "تسجيل الدخول باستخدام Gitlab",
     "auth.login.google": "تسجيل الدخول باستخدام Google",
+    "auth.login.infomaniak": "تسجيل الدخول باستخدام Infomaniak",
     "auth.already_registered": "هل سبق لك التسجيل؟",
     "auth.confirm_password": "تأكيد كلمة المرور",
     "auth.forgot_password": "نسيت كلمة المرور",
diff --git a/lang/cs.json b/lang/cs.json
index 48b47b06a..270fd272b 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -5,6 +5,7 @@
     "auth.login.github": "Přihlásit se pomocí GitHubu",
     "auth.login.gitlab": "Přihlásit se pomocí Gitlabu",
     "auth.login.google": "Přihlásit se pomocí Google",
+    "auth.login.infomaniak": "Přihlásit se pomocí Infomaniak",
     "auth.already_registered": "Již jste registrováni?",
     "auth.confirm_password": "Potvrďte heslo",
     "auth.forgot_password": "Zapomněli jste heslo",
diff --git a/lang/de.json b/lang/de.json
index 29fec629f..c5644e3a7 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -5,6 +5,7 @@
     "auth.login.github": "Mit GitHub anmelden",
     "auth.login.gitlab": "Mit GitLab anmelden",
     "auth.login.google": "Mit Google anmelden",
+    "auth.login.infomaniak": "Mit Infomaniak anmelden",
     "auth.already_registered": "Bereits registriert?",
     "auth.confirm_password": "Passwort bestätigen",
     "auth.forgot_password": "Passwort vergessen",
diff --git a/lang/en.json b/lang/en.json
index 4e0749ece..cdca68601 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -6,6 +6,7 @@
     "auth.login.github": "Login with GitHub",
     "auth.login.gitlab": "Login with Gitlab",
     "auth.login.google": "Login with Google",
+    "auth.login.infomaniak": "Login with Infomaniak",
     "auth.already_registered": "Already registered?",
     "auth.confirm_password": "Confirm password",
     "auth.forgot_password": "Forgot password",
diff --git a/lang/es.json b/lang/es.json
index 0d8c0c940..aceacd462 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -5,6 +5,7 @@
     "auth.login.github": "Acceder con GitHub",
     "auth.login.gitlab": "Acceder con Gitlab",
     "auth.login.google": "Acceder con Google",
+    "auth.login.infomaniak": "Acceder con Infomaniak",
     "auth.already_registered": "¿Ya estás registrado?",
     "auth.confirm_password": "Confirmar contraseña",
     "auth.forgot_password": "¿Olvidaste tu contraseña?",
@@ -27,4 +28,4 @@
     "input.recovery_code": "Código de recuperación",
     "button.save": "Guardar",
     "repository.url": "<span class='text-helper'>Examples</span><br>Para repositorios públicos, usar <span class='text-helper'>https://...</span>.<br>Para repositorios privados, usar <span class='text-helper'>git@...</span>.<br><br>https://github.com/coollabsio/coolify-examples <span class='text-helper'>main</span> la rama 'main' será seleccionada.<br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>nodejs-fastify</span> la rama 'nodejs-fastify' será seleccionada.<br>https://gitea.com/sedlav/expressjs.git <span class='text-helper'>main</span> la rama 'main' será seleccionada.<br>https://gitlab.com/andrasbacsai/nodejs-example.git <span class='text-helper'>main</span> la rama 'main' será seleccionada."
-}
\ No newline at end of file
+}
diff --git a/lang/fa.json b/lang/fa.json
index d0ecc4a3b..7a714e626 100644
--- a/lang/fa.json
+++ b/lang/fa.json
@@ -5,6 +5,7 @@
     "auth.login.github": "ورود با گیت هاب",
     "auth.login.gitlab": "ورود با گیت لب",
     "auth.login.google": "ورود با گوگل",
+    "auth.login.infomaniak": "ورود با Infomaniak",
     "auth.already_registered": "قبلاً ثبت نام کرده‌اید؟",
     "auth.confirm_password": "تایید رمز عبور",
     "auth.forgot_password": "فراموشی رمز عبور",
diff --git a/lang/fr.json b/lang/fr.json
index dbd5a1bf7..a94d633d3 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -5,6 +5,7 @@
     "auth.login.github": "Connexion avec GitHub",
     "auth.login.gitlab": "Connexion avec Gitlab",
     "auth.login.google": "Connexion avec Google",
+    "auth.login.infomaniak": "Connexion avec Infomaniak",
     "auth.already_registered": "Déjà enregistré ?",
     "auth.confirm_password": "Confirmer le mot de passe",
     "auth.forgot_password": "Mot de passe oublié",
diff --git a/lang/it.json b/lang/it.json
index 6e4feb9cc..30b9f3902 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -5,6 +5,7 @@
     "auth.login.github": "Accedi con GitHub",
     "auth.login.gitlab": "Accedi con Gitlab",
     "auth.login.google": "Accedi con Google",
+    "auth.login.infomaniak": "Accedi con Infomaniak",
     "auth.already_registered": "Già registrato?",
     "auth.confirm_password": "Conferma password",
     "auth.forgot_password": "Password dimenticata",
diff --git a/lang/ja.json b/lang/ja.json
index 4652a3b17..4d4589900 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -5,6 +5,7 @@
     "auth.login.github": "GitHubでログイン",
     "auth.login.gitlab": "Gitlabでログイン",
     "auth.login.google": "Googleでログイン",
+    "auth.login.infomaniak": "Infomaniakでログイン",
     "auth.already_registered": "すでに登録済みですか？",
     "auth.confirm_password": "パスワードを確認",
     "auth.forgot_password": "パスワードを忘れた",
diff --git a/lang/pt.json b/lang/pt.json
index b5dd5c434..c5f393e65 100644
--- a/lang/pt.json
+++ b/lang/pt.json
@@ -5,6 +5,7 @@
     "auth.login.github": "Entrar com GitHub",
     "auth.login.gitlab": "Entrar com Gitlab",
     "auth.login.google": "Entrar com Google",
+    "auth.login.infomaniak": "Entrar com Infomaniak",
     "auth.already_registered": "Já tem uma conta?",
     "auth.confirm_password": "Confirmar senha",
     "auth.forgot_password": "Esqueceu a senha?",
diff --git a/lang/ro.json b/lang/ro.json
index db1aa85db..4c7968cfa 100644
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -5,6 +5,7 @@
     "auth.login.github": "Autentificare prin GitHub",
     "auth.login.gitlab": "Autentificare prin Gitlab",
     "auth.login.google": "Autentificare prin Google",
+    "auth.login.infomaniak": "Autentificare prin Infomaniak",
     "auth.already_registered": "Sunteți deja înregistrat?",
     "auth.confirm_password": "Confirmați parola",
     "auth.forgot_password": "Ați uitat parola",
diff --git a/lang/tr.json b/lang/tr.json
index 255b0d15b..3cbcee409 100644
--- a/lang/tr.json
+++ b/lang/tr.json
@@ -5,6 +5,7 @@
     "auth.login.github": "GitHub ile Giriş Yap",
     "auth.login.gitlab": "GitLab ile Giriş Yap",
     "auth.login.google": "Google ile Giriş Yap",
+    "auth.login.infomaniak": "Infomaniak ile Giriş Yap",
     "auth.already_registered": "Zaten kayıtlı mısınız?",
     "auth.confirm_password": "Şifreyi Onayla",
     "auth.forgot_password": "Şifremi Unuttum",
diff --git a/lang/vi.json b/lang/vi.json
index 548dbe8b7..bb43fd34d 100644
--- a/lang/vi.json
+++ b/lang/vi.json
@@ -5,6 +5,7 @@
     "auth.login.github": "Đăng Nhập Bằng GitHub",
     "auth.login.gitlab": "Đăng Nhập Bằng Gitlab",
     "auth.login.google": "Đăng Nhập Bằng Google",
+    "auth.login.infomaniak": "Đăng Nhập Bằng Infomaniak",
     "auth.already_registered": "Đã đăng ký?",
     "auth.confirm_password": "Nhập lại mật khẩu",
     "auth.forgot_password": "Quên mật khẩu",
diff --git a/lang/zh-cn.json b/lang/zh-cn.json
index 70c457fa8..944887a5f 100644
--- a/lang/zh-cn.json
+++ b/lang/zh-cn.json
@@ -5,6 +5,7 @@
     "auth.login.github": "使用 GitHub 登录",
     "auth.login.gitlab": "使用 Gitlab 登录",
     "auth.login.google": "使用 Google 登录",
+    "auth.login.infomaniak": "使用 Infomaniak 登录",
     "auth.already_registered": "已经注册？",
     "auth.confirm_password": "确认密码",
     "auth.forgot_password": "忘记密码",
diff --git a/lang/zh-tw.json b/lang/zh-tw.json
index 63956f7a1..c42ebb33e 100644
--- a/lang/zh-tw.json
+++ b/lang/zh-tw.json
@@ -5,6 +5,7 @@
     "auth.login.github": "使用 GitHub 登入",
     "auth.login.gitlab": "使用 Gitlab 登入",
     "auth.login.google": "使用 Google 登入",
+    "auth.login.infomaniak": "使用 Infomaniak 登入",
     "auth.already_registered": "已經註冊？",
     "auth.confirm_password": "確認密碼",
     "auth.forgot_password": "忘記密碼",

From fcdec3a80df96cd0f3793c3fcae2306d8d23d43e Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Sun, 15 Dec 2024 15:09:58 +0100
Subject: [PATCH 24/60] fix: unreachable notifications

---
 app/Models/Server.php | 52 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 4 deletions(-)

diff --git a/app/Models/Server.php b/app/Models/Server.php
index cc8211789..1e4413d20 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -1024,14 +1024,58 @@ $schema://$host {
         $this->refresh();
         $unreachableNotificationSent = (bool) $this->unreachable_notification_sent;
         $isReachable = (bool) $this->settings->is_reachable;
-        // If the server is reachable, send the reachable notification if it was sent before
+
+        ray('Server Reachability Check', [
+            'server_id' => $this->id,
+            'unreachable_notification_sent' => $unreachableNotificationSent,
+            'is_reachable' => $isReachable,
+            'unreachable_count' => $this->unreachable_count,
+        ]);
+
         if ($isReachable === true) {
+            ray('Server is reachable - resetting counts');
+            $this->unreachable_count = 0;
+            $this->save();
+
             if ($unreachableNotificationSent === true) {
+                ray('Sending reachable notification');
                 $this->sendReachableNotification();
             }
-        } else {
-            // If the server is unreachable, send the unreachable notification if it was not sent before
-            if ($unreachableNotificationSent === false) {
+
+            return;
+        }
+
+        ray('Server is not reachable - incrementing count');
+        $this->increment('unreachable_count');
+        ray('Unreachable count: '.$this->unreachable_count);
+        if ($this->unreachable_count === 1) {
+            $this->settings->is_reachable = true;
+            $this->settings->saveQuietly();
+
+            return;
+        }
+
+        if ($this->unreachable_count >= 2 && ! $unreachableNotificationSent) {
+            ray('Starting additional checks', [
+                'unreachable_count' => $this->unreachable_count,
+            ]);
+            $failedChecks = 0;
+            for ($i = 0; $i < 2; $i++) {
+                sleep(5);
+                $status = $this->status();
+                ray('Check attempt '.($i + 1), ['status' => $status]);
+                if (! $status) {
+                    $failedChecks++;
+                }
+            }
+
+            ray('Additional checks complete', [
+                'failed_checks' => $failedChecks,
+                'will_send_notification' => ($failedChecks === 2 && ! $unreachableNotificationSent),
+            ]);
+
+            if ($failedChecks === 2 && ! $unreachableNotificationSent) {
+                ray('Sending unreachable notification');
                 $this->sendUnreachableNotification();
             }
         }

From 46f99347b89dd788da67a930aa7d1ff4e44d6f56 Mon Sep 17 00:00:00 2001
From: ShadowArcanist <projectshadowmoon@gmail.com>
Date: Sun, 15 Dec 2024 22:34:09 +0530
Subject: [PATCH 25/60] Added missing Discord Env for Outline one click service
 template

---
 templates/compose/getoutline.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/compose/getoutline.yaml b/templates/compose/getoutline.yaml
index ae8d26682..8c15d8499 100644
--- a/templates/compose/getoutline.yaml
+++ b/templates/compose/getoutline.yaml
@@ -57,6 +57,10 @@ services:
       - GITHUB_APP_NAME=${GITHUB_APP_NAME}
       - GITHUB_APP_ID=${GITHUB_APP_ID}
       - GITHUB_APP_PRIVATE_KEY=${GITHUB_APP_PRIVATE_KEY}
+      - DISCORD_CLIENT_ID=${DISCORD_CLIENT_ID}
+      - DISCORD_CLIENT_SECRET=${DISCORD_CLIENT_SECRET}
+      - DISCORD_SERVER_ID=${DISCORD_SERVER_ID}
+      - DISCORD_SERVER_ROLES=${DISCORD_SERVER_ROLES}
       - PGSSLMODE=${PGSSLMODE:-disable}
       - FORCE_HTTPS=${FORCE_HTTPS:-true}
     healthcheck:

From c4cee62ff6ccc5a93e7c51e0e8377f0e5f9929ed Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 16 Dec 2024 09:45:47 +0100
Subject: [PATCH 26/60] version++

---
 config/constants.php | 2 +-
 versions.json        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/constants.php b/config/constants.php
index a8a70235b..99859ffb8 100644
--- a/config/constants.php
+++ b/config/constants.php
@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.379',
+        'version' => '4.0.0-beta.380',
         'self_hosted' => env('SELF_HOSTED', true),
         'autoupdate' => env('AUTOUPDATE'),
         'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),
diff --git a/versions.json b/versions.json
index c5f41a4db..d00272987 100644
--- a/versions.json
+++ b/versions.json
@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.379"
+            "version": "4.0.0-beta.380"
         },
         "nightly": {
-            "version": "4.0.0-beta.380"
+            "version": "4.0.0-beta.381"
         },
         "helper": {
             "version": "1.0.4"

From 65ba6b947a78b5f9638a1ed5c465fbedde80637c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 16 Dec 2024 09:48:41 +0100
Subject: [PATCH 27/60] fix: oauthseeder

---
 database/seeders/OauthSettingSeeder.php | 80 +++++++++++--------------
 1 file changed, 36 insertions(+), 44 deletions(-)

diff --git a/database/seeders/OauthSettingSeeder.php b/database/seeders/OauthSettingSeeder.php
index bf902175f..df7619fec 100644
--- a/database/seeders/OauthSettingSeeder.php
+++ b/database/seeders/OauthSettingSeeder.php
@@ -4,6 +4,7 @@ namespace Database\Seeders;
 
 use App\Models\OauthSetting;
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\Log;
 
 class OauthSettingSeeder extends Seeder
 {
@@ -12,62 +13,53 @@ class OauthSettingSeeder extends Seeder
      */
     public function run(): void
     {
-        $providers = collect([
-            'azure',
-            'bitbucket',
-            'github',
-            'gitlab',
-            'google',
-            'authentik',
-        ]);
+        try {
+            $providers = collect([
+                'azure',
+                'bitbucket',
+                'github',
+                'gitlab',
+                'google',
+                'authentik',
+            ]);
 
-        $isOauthSeeded = OauthSetting::count() > 0;
+            $isOauthSeeded = OauthSetting::count() > 0;
 
-        // We changed how providers are defined in the database, so we authentik does not exists, we need to recreate all of the auth providers
-        // Before authentik was a provider, providers started with 0 id
+            // We changed how providers are defined in the database, so we authentik does not exists, we need to recreate all of the auth providers
+            // Before authentik was a provider, providers started with 0 id
 
-        $isOauthAuthentik = OauthSetting::where('provider', 'authentik')->exists();
-        if ($isOauthSeeded) {
-            if (! $isOauthAuthentik) {
-                $allProviders = OauthSetting::all();
-                $notFoundProviders = $providers->diff($allProviders->pluck('provider'));
-
-                $allProviders->each(function ($provider) {
-                    $provider->delete();
-                });
-                $allProviders->each(function ($provider) use ($providers) {
-                    $providerName = $provider->provider;
-
-                    $foundProvider = $providers->first(function ($provider) use ($providerName) {
-                        return $provider === $providerName;
-                    });
-
-                    if ($foundProvider) {
-                        $newProvder = new OauthSetting;
-                        $newProvder = $provider;
-                        unset($newProvder->id);
-                        $newProvder->save();
-                    }
-                });
-
-                foreach ($notFoundProviders as $provider) {
-                    OauthSetting::create([
-                        'provider' => $provider,
-                    ]);
-                }
-            } else {
+            $isOauthAuthentik = OauthSetting::where('provider', 'authentik')->exists();
+            if (! $isOauthSeeded || $isOauthAuthentik) {
                 foreach ($providers as $provider) {
                     OauthSetting::updateOrCreate([
                         'provider' => $provider,
                     ]);
                 }
+
+                return;
             }
-        } else {
-            foreach ($providers as $provider) {
-                OauthSetting::updateOrCreate([
+
+            $allProviders = OauthSetting::all();
+            $notFoundProviders = $providers->diff($allProviders->pluck('provider'));
+
+            $allProviders->each(function ($provider) {
+                $provider->delete();
+            });
+            $allProviders->each(function ($provider) {
+                $provider = new OauthSetting;
+                $provider->provider = $provider->provider;
+                unset($provider->id);
+                $provider->save();
+            });
+
+            foreach ($notFoundProviders as $provider) {
+                OauthSetting::create([
                     'provider' => $provider,
                 ]);
             }
+
+        } catch (\Exception $e) {
+            Log::error($e->getMessage());
         }
     }
 }

From acf10f39f33d7a499d7a9320c2d34f3b7d1e0390 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 16 Dec 2024 10:19:11 +0100
Subject: [PATCH 28/60] fix: compose loading seq

---
 app/Livewire/Project/Application/General.php                | 6 +++---
 .../views/livewire/project/application/general.blade.php    | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
index ff29b74e9..d1cc3476c 100644
--- a/app/Livewire/Project/Application/General.php
+++ b/app/Livewire/Project/Application/General.php
@@ -327,7 +327,7 @@ class General extends Component
         }
     }
 
-    public function set_redirect()
+    public function setRedirect()
     {
         try {
             $has_www = collect($this->application->fqdns)->filter(fn ($fqdn) => str($fqdn)->contains('www.'))->count();
@@ -360,10 +360,10 @@ class General extends Component
             if ($warning) {
                 $this->dispatch('warning', __('warning.sslipdomain'));
             }
-            $this->resetDefaultLabels();
+            // $this->resetDefaultLabels();
 
             if ($this->application->isDirty('redirect')) {
-                $this->set_redirect();
+                $this->setRedirect();
             }
 
             $this->checkFqdns();
diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php
index 4812fd4ba..bdcde8deb 100644
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@@ -84,7 +84,7 @@
                         <option value="non-www">Redirect to non-www.</option>
                     </x-forms.select>
                     <x-modal-confirmation title="Confirm Redirection Setting?" buttonTitle="Set Direction"
-                        submitAction="set_redirect" :actions="['All traffic will be redirected to the selected direction.']" confirmationText="{{ $application->fqdn . '/' }}"
+                        submitAction="setRedirect" :actions="['All traffic will be redirected to the selected direction.']" confirmationText="{{ $application->fqdn . '/' }}"
                         confirmationLabel="Please confirm the execution of the action by entering the Application URL below"
                         shortConfirmationLabel="Application URL" :confirmWithPassword="false" step2ButtonText="Set Direction">
                         <x-slot:customButton>
@@ -161,8 +161,7 @@
                             </div>
                             <div class="pt-1 text-xs">Nixpacks will detect the required configuration
                                 automatically.
-                                <a class="underline"
-                                    href="https://coolify.io/docs/applications">Framework
+                                <a class="underline" href="https://coolify.io/docs/applications">Framework
                                     Specific Docs</a>
                             </div>
                         @endif

From 2565deba4f92eb8377c17589bb1ff5a10d73d19a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 16 Dec 2024 10:25:56 +0100
Subject: [PATCH 29/60] fix: resource clone name + volume name generation

---
 app/Livewire/Project/Shared/ResourceOperations.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Livewire/Project/Shared/ResourceOperations.php b/app/Livewire/Project/Shared/ResourceOperations.php
index e67df6aa9..de7bb3c05 100644
--- a/app/Livewire/Project/Shared/ResourceOperations.php
+++ b/app/Livewire/Project/Shared/ResourceOperations.php
@@ -42,9 +42,11 @@ class ResourceOperations extends Component
         $uuid = (string) new Cuid2;
         $server = $new_destination->server;
         if ($this->resource->getMorphClass() === \App\Models\Application::class) {
+            $name = 'clone-of-'.str($this->resource->name)->limit(20).'-'.$uuid;
+
             $new_resource = $this->resource->replicate()->fill([
                 'uuid' => $uuid,
-                'name' => $this->resource->name.'-clone-'.$uuid,
+                'name' => $name,
                 'fqdn' => generateFqdn($server, $uuid),
                 'status' => 'exited',
                 'destination_id' => $new_destination->id,
@@ -64,8 +66,12 @@ class ResourceOperations extends Component
             }
             $persistentVolumes = $this->resource->persistentStorages()->get();
             foreach ($persistentVolumes as $volume) {
+                $volumeName = str($volume->name)->replace($this->resource->uuid, $new_resource->uuid)->value();
+                if ($volumeName === $volume->name) {
+                    $volumeName = $new_resource->uuid.'-'.str($volume->name)->afterLast('-');
+                }
                 $newPersistentVolume = $volume->replicate()->fill([
-                    'name' => $new_resource->uuid.'-'.str($volume->name)->afterLast('-'),
+                    'name' => $volumeName,
                     'resource_id' => $new_resource->id,
                 ]);
                 $newPersistentVolume->save();

From d58abd19983e7fd497ee7f9456b7fcfb4d9abdab Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 16 Dec 2024 10:38:18 +0100
Subject: [PATCH 30/60] refactor

---
 app/Jobs/DatabaseBackupJob.php              | 5 +----
 app/Livewire/Project/Database/BackupNow.php | 6 ++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php
index 06aec5e49..6730dceb7 100644
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -32,8 +32,6 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
 
     public Server $server;
 
-    public ScheduledDatabaseBackup $backup;
-
     public StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|ServiceDatabase $database;
 
     public ?string $container_name = null;
@@ -58,10 +56,9 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
 
     public ?S3Storage $s3 = null;
 
-    public function __construct($backup)
+    public function __construct(public ScheduledDatabaseBackup $backup)
     {
         $this->onQueue('high');
-        $this->backup = $backup;
     }
 
     public function handle(): void
diff --git a/app/Livewire/Project/Database/BackupNow.php b/app/Livewire/Project/Database/BackupNow.php
index 9c9c175e2..3cd360562 100644
--- a/app/Livewire/Project/Database/BackupNow.php
+++ b/app/Livewire/Project/Database/BackupNow.php
@@ -9,11 +9,9 @@ class BackupNow extends Component
 {
     public $backup;
 
-    public function backup_now()
+    public function backupNow()
     {
-        dispatch(new DatabaseBackupJob(
-            backup: $this->backup
-        ));
+        DatabaseBackupJob::dispatch($this->backup);
         $this->dispatch('success', 'Backup queued. It will be available in a few minutes.');
     }
 }

From 52310fd21a0a3d22638ded8846e95204e9298ce6 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 16 Dec 2024 12:05:16 +0100
Subject: [PATCH 31/60] add debug dev

---
 docker/production/Dockerfile                    | 3 +++
 docker/production/entrypoint.d/99-debug-mode.sh | 6 ++++++
 2 files changed, 9 insertions(+)
 create mode 100644 docker/production/entrypoint.d/99-debug-mode.sh

diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile
index 09281a666..419cac393 100644
--- a/docker/production/Dockerfile
+++ b/docker/production/Dockerfile
@@ -99,6 +99,9 @@ RUN mkdir -p /usr/local/bin && \
 COPY docker/production/etc/php/conf.d/zzz-custom-php.ini /usr/local/etc/php/conf.d/zzz-custom-php.ini
 ENV PHP_OPCACHE_ENABLE=1
 
+# Configure entrypoint
+COPY --chmod=755 docker/production/entrypoint.d/ /usr/local/bin/entrypoint.d/
+
 # Copy application files from previous stages
 COPY --from=base --chown=www-data:www-data /var/www/html/vendor ./vendor
 COPY --from=static-assets --chown=www-data:www-data /app/public/build ./public/build
diff --git a/docker/production/entrypoint.d/99-debug-mode.sh b/docker/production/entrypoint.d/99-debug-mode.sh
new file mode 100644
index 000000000..d1c8e5aa8
--- /dev/null
+++ b/docker/production/entrypoint.d/99-debug-mode.sh
@@ -0,0 +1,6 @@
+# Debug mode
+if [ "$DEBUG" = "true" ]; then
+    echo "Debug mode is enabled"
+    echo "Installing development dependencies..."
+    composer install --dev --no-scripts
+fi

From e0e2126f387ef24eb7400f73c71285a36a0f8188 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 16 Dec 2024 12:08:30 +0100
Subject: [PATCH 32/60] fix: update Dockerfile entrypoint path to
 /etc/entrypoint.d

---
 docker/production/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile
index 419cac393..aaef29f9d 100644
--- a/docker/production/Dockerfile
+++ b/docker/production/Dockerfile
@@ -100,7 +100,7 @@ COPY docker/production/etc/php/conf.d/zzz-custom-php.ini /usr/local/etc/php/conf
 ENV PHP_OPCACHE_ENABLE=1
 
 # Configure entrypoint
-COPY --chmod=755 docker/production/entrypoint.d/ /usr/local/bin/entrypoint.d/
+COPY --chmod=755 docker/production/entrypoint.d/ /etc/entrypoint.d
 
 # Copy application files from previous stages
 COPY --from=base --chown=www-data:www-data /var/www/html/vendor ./vendor

From e90df5a46bc83794d145681d0fd256d8173bacbe Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 16 Dec 2024 12:14:36 +0100
Subject: [PATCH 33/60] fix: debug mode

---
 docker/production/entrypoint.d/99-debug-mode.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/production/entrypoint.d/99-debug-mode.sh b/docker/production/entrypoint.d/99-debug-mode.sh
index d1c8e5aa8..b2900808d 100644
--- a/docker/production/entrypoint.d/99-debug-mode.sh
+++ b/docker/production/entrypoint.d/99-debug-mode.sh
@@ -1,5 +1,5 @@
 # Debug mode
-if [ "$DEBUG" = "true" ]; then
+if [ "$APP_DEBUG" = "true" ]; then
     echo "Debug mode is enabled"
     echo "Installing development dependencies..."
     composer install --dev --no-scripts

From f9d509bc4cd216caf99378298f13cd3f05c52d27 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 16 Dec 2024 12:19:07 +0100
Subject: [PATCH 34/60] enhance debug mode script to clear optimized classes
 after installing development dependencies

---
 docker/production/entrypoint.d/99-debug-mode.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/production/entrypoint.d/99-debug-mode.sh b/docker/production/entrypoint.d/99-debug-mode.sh
index b2900808d..e0a181373 100644
--- a/docker/production/entrypoint.d/99-debug-mode.sh
+++ b/docker/production/entrypoint.d/99-debug-mode.sh
@@ -3,4 +3,6 @@ if [ "$APP_DEBUG" = "true" ]; then
     echo "Debug mode is enabled"
     echo "Installing development dependencies..."
     composer install --dev --no-scripts
+    echo "Clearing optimized classes..."
+    php artisan optimize:clear
 fi

From a0ad4bc90e697b537851b3fb82816183423c8fc2 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 16 Dec 2024 12:48:09 +0100
Subject: [PATCH 35/60] better impersonate

---
 app/Livewire/Admin/Index.php                  | 21 ++++++++++++----
 resources/views/components/navbar.blade.php   | 24 ++++++++++---------
 .../views/livewire/admin/index.blade.php      |  9 +++++--
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/app/Livewire/Admin/Index.php b/app/Livewire/Admin/Index.php
index 359db6329..b5f6d2929 100644
--- a/app/Livewire/Admin/Index.php
+++ b/app/Livewire/Admin/Index.php
@@ -21,16 +21,28 @@ class Index extends Component
 
     public function mount()
     {
-        if (! isCloud()) {
+        if (! isCloud() && ! isDev()) {
             return redirect()->route('dashboard');
         }
-
-        if (Auth::id() !== 0) {
+        if (Auth::id() !== 0 && ! session('impersonating')) {
             return redirect()->route('dashboard');
         }
         $this->getSubscribers();
     }
 
+    public function back()
+    {
+        if (session('impersonating')) {
+            session()->forget('impersonating');
+            $user = User::find(0);
+            $team_to_switch_to = $user->teams->first();
+            Auth::login($user);
+            refreshSession($team_to_switch_to);
+
+            return redirect(request()->header('Referer'));
+        }
+    }
+
     public function submitSearch()
     {
         if ($this->search !== '') {
@@ -52,9 +64,10 @@ class Index extends Component
         if (Auth::id() !== 0) {
             return redirect()->route('dashboard');
         }
+        session(['impersonating' => true]);
         $user = User::find($user_id);
         $team_to_switch_to = $user->teams->first();
-        Cache::forget("team:{$user->id}");
+        // Cache::forget("team:{$user->id}");
         Auth::login($user);
         refreshSession($team_to_switch_to);
 
diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index 7d343c645..9a75200b1 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -340,17 +340,19 @@
                         </li>
                     @endif
 
-                    @if (isCloud() && isInstanceAdmin())
-                        <li>
-                            <a title="Admin" class="menu-item" href="/admin">
-                                <svg class="text-pink-600 icon" viewBox="0 0 256 256"
-                                    xmlns="http://www.w3.org/2000/svg">
-                                    <path fill="currentColor"
-                                        d="M177.62 159.6a52 52 0 0 1-34 34a12.2 12.2 0 0 1-3.6.55a12 12 0 0 1-3.6-23.45a28 28 0 0 0 18.32-18.32a12 12 0 0 1 22.9 7.2ZM220 144a92 92 0 0 1-184 0c0-28.81 11.27-58.18 33.48-87.28a12 12 0 0 1 17.9-1.33l19.69 19.11L127 19.89a12 12 0 0 1 18.94-5.12C168.2 33.25 220 82.85 220 144m-24 0c0-41.71-30.61-78.39-52.52-99.29l-20.21 55.4a12 12 0 0 1-19.63 4.5L80.71 82.36C67 103.38 60 124.06 60 144a68 68 0 0 0 136 0" />
-                                </svg>
-                                Admin
-                            </a>
-                        </li>
+                    @if (isCloud() || isDev())
+                        @if (isInstanceAdmin() || session('impersonating'))
+                            <li>
+                                <a title="Admin" class="menu-item" href="/admin">
+                                    <svg class="text-pink-600 icon" viewBox="0 0 256 256"
+                                        xmlns="http://www.w3.org/2000/svg">
+                                        <path fill="currentColor"
+                                            d="M177.62 159.6a52 52 0 0 1-34 34a12.2 12.2 0 0 1-3.6.55a12 12 0 0 1-3.6-23.45a28 28 0 0 0 18.32-18.32a12 12 0 0 1 22.9 7.2ZM220 144a92 92 0 0 1-184 0c0-28.81 11.27-58.18 33.48-87.28a12 12 0 0 1 17.9-1.33l19.69 19.11L127 19.89a12 12 0 0 1 18.94-5.12C168.2 33.25 220 82.85 220 144m-24 0c0-41.71-30.61-78.39-52.52-99.29l-20.21 55.4a12 12 0 0 1-19.63 4.5L80.71 82.36C67 103.38 60 124.06 60 144a68 68 0 0 0 136 0" />
+                                    </svg>
+                                    Admin
+                                </a>
+                            </li>
+                        @endif
                     @endif
                     <div class="flex-1"></div>
                     @if (isInstanceAdmin() && !isCloud())
diff --git a/resources/views/livewire/admin/index.blade.php b/resources/views/livewire/admin/index.blade.php
index 06914e1e4..7bf3c7c0c 100644
--- a/resources/views/livewire/admin/index.blade.php
+++ b/resources/views/livewire/admin/index.blade.php
@@ -1,7 +1,12 @@
 <div>
     <h1>Admin Dashboard</h1>
-    <h3 class="pt-4">Who am I now?</h3>
-    <div class="pb-4">{{ auth()->user()->name }}</div>
+    <div class="flex gap-2 pt-4">
+        <h3>Who am I now?</h3>
+        @if (session('impersonating'))
+            <x-forms.button wire:click="back">Go back to root</x-forms.button>
+        @endif
+    </div>
+    <div class="pb-4">{{ auth()->user()->name }} ({{ auth()->user()->email }})</div>
     <form wire:submit="submitSearch" class="flex flex-col gap-2 lg:flex-row">
         <x-forms.input wire:model="search" placeholder="Search for a user" />
         <x-forms.button type="submit">Search</x-forms.button>

From 62574941df3e2949af837d728b57e7da8358f794 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 16 Dec 2024 13:00:29 +0100
Subject: [PATCH 36/60] add 'admin' to allowed paths for unsubscribed accounts

---
 bootstrap/helpers/subscriptions.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bootstrap/helpers/subscriptions.php b/bootstrap/helpers/subscriptions.php
index ab9ee9b9d..510516a2f 100644
--- a/bootstrap/helpers/subscriptions.php
+++ b/bootstrap/helpers/subscriptions.php
@@ -69,6 +69,7 @@ function allowedPathsForUnsubscribedAccounts()
         'logout',
         'force-password-reset',
         'livewire/update',
+        'admin',
     ];
 }
 function allowedPathsForBoardingAccounts()

From 1da3febd852d219e6269fa4e6b3603eaeb8cf788 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Mon, 16 Dec 2024 14:04:22 +0100
Subject: [PATCH 37/60] fix: remove duplicated ServerCheckJob call

---
 app/Jobs/ServerCheckJob.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/Jobs/ServerCheckJob.php b/app/Jobs/ServerCheckJob.php
index 49d8dfe08..9818d5c6a 100644
--- a/app/Jobs/ServerCheckJob.php
+++ b/app/Jobs/ServerCheckJob.php
@@ -31,12 +31,7 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
         return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
     }
 
-    public function __construct(public Server $server)
-    {
-        if (isDev()) {
-            $this->handle();
-        }
-    }
+    public function __construct(public Server $server) {}
 
     public function handle()
     {

From e30495a59b1fa795ff5a793e70b88f08467f9be3 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Mon, 16 Dec 2024 14:05:17 +0100
Subject: [PATCH 38/60] feat: new ServerReachabilityChanged event

---
 app/Events/ServerReachabilityChanged.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 app/Events/ServerReachabilityChanged.php

diff --git a/app/Events/ServerReachabilityChanged.php b/app/Events/ServerReachabilityChanged.php
new file mode 100644
index 000000000..fb4680146
--- /dev/null
+++ b/app/Events/ServerReachabilityChanged.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\Server;
+use Illuminate\Foundation\Events\Dispatchable;
+
+class ServerReachabilityChanged
+{
+    use Dispatchable;
+
+    public function __construct(
+        public readonly Server $server
+    ) {
+        $this->server->isReachableChanged();
+    }
+}

From 5571aa4530d4e3e6107f1ebf878e12bb9479a51a Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Mon, 16 Dec 2024 14:06:16 +0100
Subject: [PATCH 39/60] feat: use new ServerReachabilityChanged event instead
 of isDirty

---
 app/Console/Commands/CloudCleanupSubscriptions.php | 3 +++
 app/Livewire/Server/Show.php                       | 2 ++
 app/Models/ServerSetting.php                       | 3 ---
 app/Models/Team.php                                | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Console/Commands/CloudCleanupSubscriptions.php b/app/Console/Commands/CloudCleanupSubscriptions.php
index 9198b003e..9dc6e24f5 100644
--- a/app/Console/Commands/CloudCleanupSubscriptions.php
+++ b/app/Console/Commands/CloudCleanupSubscriptions.php
@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Events\ServerReachabilityChanged;
 use App\Models\Team;
 use Illuminate\Console\Command;
 
@@ -92,6 +93,8 @@ class CloudCleanupSubscriptions extends Command
                 $server->update([
                     'ip' => '1.2.3.4',
                 ]);
+
+                ServerReachabilityChanged::dispatch($server);
             }
         }
     }
diff --git a/app/Livewire/Server/Show.php b/app/Livewire/Server/Show.php
index ac5211c1b..6d267b9c8 100644
--- a/app/Livewire/Server/Show.php
+++ b/app/Livewire/Server/Show.php
@@ -4,6 +4,7 @@ namespace App\Livewire\Server;
 
 use App\Actions\Server\StartSentinel;
 use App\Actions\Server\StopSentinel;
+use App\Events\ServerReachabilityChanged;
 use App\Models\Server;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Validate;
@@ -202,6 +203,7 @@ class Show extends Component
             $this->server->settings->is_reachable = $this->isReachable = true;
             $this->server->settings->is_usable = $this->isUsable = true;
             $this->server->settings->save();
+            ServerReachabilityChanged::dispatch($this->server);
             $this->dispatch('proxyStatusUpdated');
         } else {
             $this->dispatch('error', 'Server is not reachable.', 'Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help. <br><br>Error: '.$error);
diff --git a/app/Models/ServerSetting.php b/app/Models/ServerSetting.php
index e078372e2..f4b776cca 100644
--- a/app/Models/ServerSetting.php
+++ b/app/Models/ServerSetting.php
@@ -85,9 +85,6 @@ class ServerSetting extends Model
             ) {
                 $settings->server->restartSentinel();
             }
-            if ($settings->isDirty('is_reachable')) {
-                $settings->server->isReachableChanged();
-            }
         });
     }
 
diff --git a/app/Models/Team.php b/app/Models/Team.php
index e55cb0d19..33847a3c8 100644
--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Events\ServerReachabilityChanged;
 use App\Notifications\Channels\SendsDiscord;
 use App\Notifications\Channels\SendsEmail;
 use App\Notifications\Channels\SendsPushover;
@@ -202,6 +203,7 @@ class Team extends Model implements SendsDiscord, SendsEmail, SendsPushover, Sen
                 'is_usable' => false,
                 'is_reachable' => false,
             ]);
+            ServerReachabilityChanged::dispatch($server);
         }
     }
 

From 80425a16eec8882d90e102b00cc35eab32c42e0c Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Mon, 16 Dec 2024 14:06:53 +0100
Subject: [PATCH 40/60] fix: few fixes and use new ServerReachabilityChanged
 event

---
 app/Models/Server.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/Models/Server.php b/app/Models/Server.php
index 1e4413d20..aa709bf6b 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -6,6 +6,7 @@ use App\Actions\Proxy\StartProxy;
 use App\Actions\Server\InstallDocker;
 use App\Actions\Server\StartSentinel;
 use App\Enums\ProxyTypes;
+use App\Events\ServerReachabilityChanged;
 use App\Jobs\CheckAndStartSentinelJob;
 use App\Notifications\Server\Reachable;
 use App\Notifications\Server\Unreachable;
@@ -1050,7 +1051,7 @@ $schema://$host {
         ray('Unreachable count: '.$this->unreachable_count);
         if ($this->unreachable_count === 1) {
             $this->settings->is_reachable = true;
-            $this->settings->saveQuietly();
+            $this->settings->save();
 
             return;
         }
@@ -1060,21 +1061,22 @@ $schema://$host {
                 'unreachable_count' => $this->unreachable_count,
             ]);
             $failedChecks = 0;
-            for ($i = 0; $i < 2; $i++) {
-                sleep(5);
+            for ($i = 0; $i < 3; $i++) {
                 $status = $this->status();
+                sleep(5);
                 ray('Check attempt '.($i + 1), ['status' => $status]);
                 if (! $status) {
                     $failedChecks++;
+
                 }
             }
 
             ray('Additional checks complete', [
                 'failed_checks' => $failedChecks,
-                'will_send_notification' => ($failedChecks === 2 && ! $unreachableNotificationSent),
+                'will_send_notification' => ($failedChecks === 3 && ! $unreachableNotificationSent),
             ]);
 
-            if ($failedChecks === 2 && ! $unreachableNotificationSent) {
+            if ($failedChecks === 3 && ! $unreachableNotificationSent) {
                 ray('Sending unreachable notification');
                 $this->sendUnreachableNotification();
             }
@@ -1109,6 +1111,7 @@ $schema://$host {
             if ($this->settings->is_reachable === false) {
                 $this->settings->is_reachable = true;
                 $this->settings->save();
+                ServerReachabilityChanged::dispatch($this);
             }
 
             return ['uptime' => true, 'error' => null];
@@ -1119,6 +1122,7 @@ $schema://$host {
             if ($this->settings->is_reachable === true) {
                 $this->settings->is_reachable = false;
                 $this->settings->save();
+                ServerReachabilityChanged::dispatch($this);
             }
 
             return ['uptime' => false, 'error' => $e->getMessage()];
@@ -1209,6 +1213,7 @@ $schema://$host {
         $this->settings->is_reachable = true;
         $this->settings->is_usable = true;
         $this->settings->save();
+        ServerReachabilityChanged::dispatch($this);
 
         return true;
     }

From e76817d40183ac3ff574715cf8ea217a4ce0d98d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 16 Dec 2024 14:11:45 +0100
Subject: [PATCH 41/60] improve application view

---
 .../Project/Application/Configuration.php     |   9 +
 .../Shared/EnvironmentVariable/Show.php       |   4 -
 .../etc/nginx/site-opts.d/http.conf           |   4 +-
 .../etc/nginx/site-opts.d/http.conf           |   4 +-
 .../application/configuration.blade.php       | 186 ++++++++----------
 routes/web.php                                |  17 ++
 6 files changed, 110 insertions(+), 114 deletions(-)

diff --git a/app/Livewire/Project/Application/Configuration.php b/app/Livewire/Project/Application/Configuration.php
index 5261a0800..bf2811075 100644
--- a/app/Livewire/Project/Application/Configuration.php
+++ b/app/Livewire/Project/Application/Configuration.php
@@ -8,14 +8,21 @@ use Livewire\Component;
 
 class Configuration extends Component
 {
+    public $currentRoute;
+
     public Application $application;
 
+    public $project;
+
+    public $environment;
+
     public $servers;
 
     protected $listeners = ['buildPackUpdated' => '$refresh'];
 
     public function mount()
     {
+        $this->currentRoute = request()->route()->getName();
         $project = currentTeam()
             ->projects()
             ->select('id', 'uuid', 'team_id')
@@ -30,6 +37,8 @@ class Configuration extends Component
             ->where('uuid', request()->route('application_uuid'))
             ->firstOrFail();
 
+        $this->project = $project;
+        $this->environment = $environment;
         $this->application = $application;
         if ($application->destination && $application->destination->server) {
             $mainServer = $application->destination->server;
diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/Show.php b/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
index 6294d97c6..2bccde0e9 100644
--- a/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
+++ b/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
@@ -5,7 +5,6 @@ namespace App\Livewire\Project\Shared\EnvironmentVariable;
 use App\Models\EnvironmentVariable as ModelsEnvironmentVariable;
 use App\Models\SharedEnvironmentVariable;
 use Livewire\Component;
-use Visus\Cuid2\Cuid2;
 
 class Show extends Component
 {
@@ -13,8 +12,6 @@ class Show extends Component
 
     public ModelsEnvironmentVariable|SharedEnvironmentVariable $env;
 
-    public ?string $modalId = null;
-
     public bool $isDisabled = false;
 
     public bool $isLocked = false;
@@ -61,7 +58,6 @@ class Show extends Component
         if ($this->env->getMorphClass() === \App\Models\SharedEnvironmentVariable::class) {
             $this->isSharedVariable = true;
         }
-        $this->modalId = new Cuid2;
         $this->parameters = get_route_parameters();
         $this->checkEnvs();
     }
diff --git a/docker/development/etc/nginx/site-opts.d/http.conf b/docker/development/etc/nginx/site-opts.d/http.conf
index 41735cf06..9f7e49ee2 100644
--- a/docker/development/etc/nginx/site-opts.d/http.conf
+++ b/docker/development/etc/nginx/site-opts.d/http.conf
@@ -39,7 +39,7 @@ location ~ \.php$ {
     fastcgi_index  index.php;
     fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
     include        fastcgi_params;
-    fastcgi_buffers 8 8k;
-    fastcgi_buffer_size 8k;
+    fastcgi_buffers 16 16k;
+    fastcgi_buffer_size 32k;
     fastcgi_read_timeout 99;
 }
diff --git a/docker/production/etc/nginx/site-opts.d/http.conf b/docker/production/etc/nginx/site-opts.d/http.conf
index 41735cf06..9f7e49ee2 100644
--- a/docker/production/etc/nginx/site-opts.d/http.conf
+++ b/docker/production/etc/nginx/site-opts.d/http.conf
@@ -39,7 +39,7 @@ location ~ \.php$ {
     fastcgi_index  index.php;
     fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
     include        fastcgi_params;
-    fastcgi_buffers 8 8k;
-    fastcgi_buffer_size 8k;
+    fastcgi_buffers 16 16k;
+    fastcgi_buffer_size 32k;
     fastcgi_read_timeout 99;
 }
diff --git a/resources/views/livewire/project/application/configuration.blade.php b/resources/views/livewire/project/application/configuration.blade.php
index b5ba6c822..fc2b8c7c0 100644
--- a/resources/views/livewire/project/application/configuration.blade.php
+++ b/resources/views/livewire/project/application/configuration.blade.php
@@ -5,34 +5,36 @@
     <h1>Configuration</h1>
     <livewire:project.shared.configuration-checker :resource="$application" />
     <livewire:project.application.heading :application="$application" />
-    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 pt-6 sm:flex-row">
+
+    <div class="flex flex-col h-full gap-8 pt-6 sm:flex-row">
         <div class="flex flex-col items-start gap-2 min-w-fit">
-            <a class="menu-item" :class="activeTab === 'general' && 'menu-item-active'"
-                @click.prevent="activeTab = 'general'; window.location.hash = 'general'" href="#">General</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.application.configuration', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>General</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.application.advanced', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Advanced</a>
             @if ($application->destination->server->isSwarm())
-                <a class="menu-item" :class="activeTab === 'swarm' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'swarm'; window.location.hash = 'swarm'" href="#">Swarm
+                <a class="menu-item"
+                    wire:current.exact="menu-item-active
+                    href="{{ route('project.application.swarm', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                    wire:navigate>Swarm
                     Configuration</a>
             @endif
-            <a class="menu-item" :class="activeTab === 'advanced' && 'menu-item-active'"
-                @click.prevent="activeTab = 'advanced'; window.location.hash = 'advanced'" href="#">Advanced</a>
-            @if ($application->build_pack !== 'static')
-                <a class="menu-item" :class="activeTab === 'environment-variables' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
-                    href="#">Environment
-                    Variables</a>
-            @endif
-            @if ($application->build_pack !== 'static')
-                <a class="menu-item" :class="activeTab === 'storages' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages
-                </a>
-            @endif
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.application.environment-variables', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Environment Variables</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.application.persistent-storage', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Persistent Storage</a>
             @if ($application->git_based())
-                <a class="menu-item" :class="activeTab === 'source' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'source'; window.location.hash = 'source'" href="#">Source</a>
+                <a class='menu-item' wire:current.exact="menu-item-active"
+                    href="{{ route('project.application.source', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                    wire:navigate>Git Source</a>
             @endif
-            <a class="menu-item" :class="activeTab === 'servers' && 'menu-item-active'" class="flex items-center gap-2"
-                @click.prevent="activeTab = 'servers'; window.location.hash = 'servers'" href="#">Servers
+            <a class="menu-item flex items-center gap-2" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.servers', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Servers
                 @if (str($application->status)->contains('degraded'))
                     <span title="Some servers are unavailable">
                         <svg class="w-4 h-4 text-error" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
@@ -50,102 +52,74 @@
                     </span>
                 @endif
             </a>
-            <a class="menu-item" :class="activeTab === 'scheduled-tasks' && 'menu-item-active'"
-                @click.prevent="activeTab = 'scheduled-tasks'; window.location.hash = 'scheduled-tasks'"
-                href="#">Scheduled Tasks
-            </a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.scheduled-tasks.show', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Scheduled Tasks</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.webhooks', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Webhooks</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.preview-deployments', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Preview Deployments</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.healthcheck', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Healthcheck</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.rollback', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Rollback</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.resource-limits', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Resource Limits</a>
 
-            <a class="menu-item" :class="activeTab === 'webhooks' && 'menu-item-active'"
-                @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
-            </a>
-            @if ($application->git_based())
-                <a class="menu-item" :class="activeTab === 'previews' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'previews'; window.location.hash = 'previews'" href="#">Preview
-                    Deployments
-                </a>
-            @endif
-            @if ($application->build_pack !== 'static' && $application->build_pack !== 'dockercompose')
-                <a class="menu-item" :class="activeTab === 'health' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'health'; window.location.hash = 'health'" href="#">Healthchecks
-                </a>
-            @endif
-            <a class="menu-item" :class="activeTab === 'rollback' && 'menu-item-active'"
-                @click.prevent="activeTab = 'rollback'; window.location.hash = 'rollback'" href="#">Rollback
-            </a>
-            @if ($application->build_pack !== 'dockercompose')
-                <a class="menu-item" :class="activeTab === 'resource-limits' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'resource-limits'; window.location.hash = 'resource-limits'"
-                    href="#">Resource Limits
-                </a>
-            @endif
-            <a class="menu-item" :class="activeTab === 'resource-operations' && 'menu-item-active'"
-                @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
-                href="#">Resource Operations
-            </a>
-            <a class="menu-item" :class="activeTab === 'metrics' && 'menu-item-active'"
-                @click.prevent="activeTab = 'metrics'; window.location.hash = 'metrics'" href="#">Metrics
-            </a>
-            <a class="menu-item" :class="activeTab === 'tags' && 'menu-item-active'"
-                @click.prevent="activeTab = 'tags'; window.location.hash = 'tags'" href="#">Tags
-            </a>
-            <a class="menu-item" :class="activeTab === 'danger' && 'menu-item-active'"
-                @click.prevent="activeTab = 'danger'; window.location.hash = 'danger'" href="#">Danger Zone
-            </a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.resource-operations', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Resource Operations</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.metrics', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Metrics</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.tags', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Tags</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.application.danger', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                wire:navigate>Danger Zone</a>
         </div>
         <div class="w-full">
-            <div x-cloak x-show="activeTab === 'general'" class="h-full">
+            @if (request()->route()->getName() === 'project.application.configuration')
                 <livewire:project.application.general :application="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'swarm'" class="h-full">
+            @elseif (request()->route()->getName() === 'project.application.swarm' && $application->destination->server->isSwarm())
                 <livewire:project.application.swarm :application="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'advanced'" class="h-full">
+            @elseif (request()->route()->getName() === 'project.application.advanced')
                 <livewire:project.application.advanced :application="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'environment-variables'">
+            @elseif (request()->route()->getName() === 'project.application.environment-variables')
                 <livewire:project.shared.environment-variable.all :resource="$application" />
-            </div>
-            @if ($application->git_based())
-                <div x-cloak x-show="activeTab === 'source'">
-                    <livewire:project.application.source :application="$application" />
-                </div>
-            @endif
-            <div x-cloak x-show="activeTab === 'servers'">
+            @elseif (request()->route()->getName() === 'project.application.persistent-storage')
+                <livewire:project.service.storage :resource="$application" />
+            @elseif (request()->route()->getName() === 'project.application.source' && $application->git_based())
+                <livewire:project.application.source :application="$application" />
+            @elseif (request()->route()->getName() === 'project.application.servers')
                 <livewire:project.shared.destination :resource="$application" :servers="$servers" />
-            </div>
-            <div x-cloak x-show="activeTab === 'storages'">
-                <livewire:project.service.storage :resource="$application" lazy />
-            </div>
-            <div x-cloak x-show="activeTab === 'webhooks'">
-                <livewire:project.shared.webhooks :resource="$application" lazy />
-            </div>
-            <div x-cloak x-show="activeTab === 'previews'">
-                <livewire:project.application.previews :application="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'health'">
-                <livewire:project.shared.health-checks :resource="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'rollback'">
-                <livewire:project.application.rollback :application="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'resource-limits'">
-                <livewire:project.shared.resource-limits :resource="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'scheduled-tasks'">
+            @elseif (request()->route()->getName() === 'project.application.scheduled-tasks.show')
                 <livewire:project.shared.scheduled-task.all :resource="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'resource-operations'">
+            @elseif (request()->route()->getName() === 'project.application.webhooks')
+                <livewire:project.shared.webhooks :resource="$application" />
+            @elseif (request()->route()->getName() === 'project.application.preview-deployments')
+                <livewire:project.application.previews :application="$application" />
+            @elseif (request()->route()->getName() === 'project.application.healthcheck')
+                <livewire:project.shared.health-checks :resource="$application" />
+            @elseif (request()->route()->getName() === 'project.application.rollback')
+                <livewire:project.application.rollback :application="$application" />
+            @elseif (request()->route()->getName() === 'project.application.resource-limits')
+                <livewire:project.shared.resource-limits :resource="$application" />
+            @elseif (request()->route()->getName() === 'project.application.resource-operations')
                 <livewire:project.shared.resource-operations :resource="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'metrics'">
+            @elseif (request()->route()->getName() === 'project.application.metrics')
                 <livewire:project.shared.metrics :resource="$application" />
-            </div>
-            <div x-cloak x-show="activeTab === 'tags'">
-                <livewire:project.shared.tags :resource="$application" lazy />
-            </div>
-            <div x-cloak x-show="activeTab === 'danger'">
+            @elseif (request()->route()->getName() === 'project.application.tags')
+                <livewire:project.shared.tags :resource="$application" />
+            @elseif (request()->route()->getName() === 'project.application.danger')
                 <livewire:project.shared.danger :resource="$application" />
-            </div>
+            @endif
         </div>
     </div>
 </div>
diff --git a/routes/web.php b/routes/web.php
index 3d12b9b46..18adc0467 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -183,6 +183,23 @@ Route::middleware(['auth', 'verified'])->group(function () {
     });
     Route::prefix('project/{project_uuid}/{environment_name}/application/{application_uuid}')->group(function () {
         Route::get('/', ApplicationConfiguration::class)->name('project.application.configuration');
+        Route::get('/swarm', ApplicationConfiguration::class)->name('project.application.swarm');
+        Route::get('/advanced', ApplicationConfiguration::class)->name('project.application.advanced');
+        Route::get('/environment-variables', ApplicationConfiguration::class)->name('project.application.environment-variables');
+        Route::get('/persistent-storage', ApplicationConfiguration::class)->name('project.application.persistent-storage');
+        Route::get('/source', ApplicationConfiguration::class)->name('project.application.source');
+        Route::get('/servers', ApplicationConfiguration::class)->name('project.application.servers');
+        Route::get('/scheduled-tasks', ApplicationConfiguration::class)->name('project.application.scheduled-tasks.show');
+        Route::get('/webhooks', ApplicationConfiguration::class)->name('project.application.webhooks');
+        Route::get('/preview-deployments', ApplicationConfiguration::class)->name('project.application.preview-deployments');
+        Route::get('/healthcheck', ApplicationConfiguration::class)->name('project.application.healthcheck');
+        Route::get('/rollback', ApplicationConfiguration::class)->name('project.application.rollback');
+        Route::get('/resource-limits', ApplicationConfiguration::class)->name('project.application.resource-limits');
+        Route::get('/resource-operations', ApplicationConfiguration::class)->name('project.application.resource-operations');
+        Route::get('/metrics', ApplicationConfiguration::class)->name('project.application.metrics');
+        Route::get('/tags', ApplicationConfiguration::class)->name('project.application.tags');
+        Route::get('/danger', ApplicationConfiguration::class)->name('project.application.danger');
+
         Route::get('/deployment', DeploymentIndex::class)->name('project.application.deployment.index');
         Route::get('/deployment/{deployment_uuid}', DeploymentShow::class)->name('project.application.deployment.show');
         Route::get('/logs', Logs::class)->name('project.application.logs');

From 0957fe8bfc74414af444e48a3f5791c7c47ebcf5 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Mon, 16 Dec 2024 14:15:38 +0100
Subject: [PATCH 42/60] chore: remove ray debugging

---
 app/Models/Server.php | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/app/Models/Server.php b/app/Models/Server.php
index aa709bf6b..902433530 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -1026,29 +1026,18 @@ $schema://$host {
         $unreachableNotificationSent = (bool) $this->unreachable_notification_sent;
         $isReachable = (bool) $this->settings->is_reachable;
 
-        ray('Server Reachability Check', [
-            'server_id' => $this->id,
-            'unreachable_notification_sent' => $unreachableNotificationSent,
-            'is_reachable' => $isReachable,
-            'unreachable_count' => $this->unreachable_count,
-        ]);
-
         if ($isReachable === true) {
-            ray('Server is reachable - resetting counts');
             $this->unreachable_count = 0;
             $this->save();
 
             if ($unreachableNotificationSent === true) {
-                ray('Sending reachable notification');
                 $this->sendReachableNotification();
             }
 
             return;
         }
 
-        ray('Server is not reachable - incrementing count');
         $this->increment('unreachable_count');
-        ray('Unreachable count: '.$this->unreachable_count);
         if ($this->unreachable_count === 1) {
             $this->settings->is_reachable = true;
             $this->settings->save();
@@ -1057,27 +1046,16 @@ $schema://$host {
         }
 
         if ($this->unreachable_count >= 2 && ! $unreachableNotificationSent) {
-            ray('Starting additional checks', [
-                'unreachable_count' => $this->unreachable_count,
-            ]);
             $failedChecks = 0;
             for ($i = 0; $i < 3; $i++) {
                 $status = $this->status();
                 sleep(5);
-                ray('Check attempt '.($i + 1), ['status' => $status]);
                 if (! $status) {
                     $failedChecks++;
-
                 }
             }
 
-            ray('Additional checks complete', [
-                'failed_checks' => $failedChecks,
-                'will_send_notification' => ($failedChecks === 3 && ! $unreachableNotificationSent),
-            ]);
-
             if ($failedChecks === 3 && ! $unreachableNotificationSent) {
-                ray('Sending unreachable notification');
                 $this->sendUnreachableNotification();
             }
         }

From 0cbb3a08c285d0052149535455e6003334ef4bdd Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Mon, 16 Dec 2024 14:27:17 +0100
Subject: [PATCH 43/60] fix: use serverStatus not just status

---
 app/Models/Server.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Server.php b/app/Models/Server.php
index 902433530..6abc7cb43 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -1048,7 +1048,7 @@ $schema://$host {
         if ($this->unreachable_count >= 2 && ! $unreachableNotificationSent) {
             $failedChecks = 0;
             for ($i = 0; $i < 3; $i++) {
-                $status = $this->status();
+                $status = $this->serverStatus();
                 sleep(5);
                 if (! $status) {
                     $failedChecks++;

From b0a57817283a9043045219044b3f3ffa41331029 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Mon, 16 Dec 2024 18:28:18 +0100
Subject: [PATCH 44/60] Update service-templates.json

---
 templates/service-templates.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/service-templates.json b/templates/service-templates.json
index 9f1f6a7cc..6e44c44d7 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -977,7 +977,7 @@
     "getoutline": {
         "documentation": "https://docs.getoutline.com/s/hosting/doc/hosting-outline-nipGaCRBDu?utm_source=coolify.io",
         "slogan": "Your team\u2019s knowledge base",
-        "compose": "c2VydmljZXM6CiAgb3V0bGluZToKICAgIGltYWdlOiAnZG9ja2VyLmdldG91dGxpbmUuY29tL291dGxpbmV3aWtpL291dGxpbmU6bGF0ZXN0JwogICAgdm9sdW1lczoKICAgICAgLSAnc3RvcmFnZS1kYXRhOi92YXIvbGliL291dGxpbmUvZGF0YScKICAgIGRlcGVuZHNfb246CiAgICAgIHBvc3RncmVzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICAgIHJlZGlzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fT1VUTElORV8zMDAwCiAgICAgIC0gTk9ERV9FTlY9cHJvZHVjdGlvbgogICAgICAtICdTRUNSRVRfS0VZPSR7U0VSVklDRV9CQVNFNjRfT1VUTElORX0nCiAgICAgIC0gJ1VUSUxTX1NFQ1JFVD0ke1NFUlZJQ0VfUEFTU1dPUkRfNjRfT1VUTElORX0nCiAgICAgIC0gJ0RBVEFCQVNFX1VSTD1wb3N0Z3JlczovLyR7U0VSVklDRV9VU0VSX1BPU1RHUkVTfToke1NFUlZJQ0VfUEFTU1dPUkRfNjRfUE9TVEdSRVN9QHBvc3RncmVzOjU0MzIvJHtQT1NUR1JFU19EQVRBQkFTRTotb3V0bGluZX0nCiAgICAgIC0gJ1JFRElTX1VSTD1yZWRpczovLzoke1NFUlZJQ0VfUEFTU1dPUkRfNjRfUkVESVN9QHJlZGlzOjYzNzknCiAgICAgIC0gJ1VSTD0ke1NFUlZJQ0VfRlFETl9PVVRMSU5FXzMwMDB9JwogICAgICAtICdQT1JUPSR7T1VUTElORV9QT1JUOi0zMDAwfScKICAgICAgLSAnRklMRV9TVE9SQUdFPSR7RklMRV9TVE9SQUdFOi1sb2NhbH0nCiAgICAgIC0gJ0ZJTEVfU1RPUkFHRV9MT0NBTF9ST09UX0RJUj0ke0ZJTEVfU1RPUkFHRV9MT0NBTF9ST09UX0RJUjotL3Zhci9saWIvb3V0bGluZS9kYXRhfScKICAgICAgLSAnRklMRV9TVE9SQUdFX1VQTE9BRF9NQVhfU0laRT0ke0ZJTEVfU1RPUkFHRV9VUExPQURfTUFYX1NJWkU6LTIwMDB9JwogICAgICAtICdGSUxFX1NUT1JBR0VfSU1QT1JUX01BWF9TSVpFPSR7RklMRV9TVE9SQUdFX0lNUE9SVF9NQVhfU0laRTotMTAwfScKICAgICAgLSAnRklMRV9TVE9SQUdFX1dPUktTUEFDRV9JTVBPUlRfTUFYX1NJWkU9JHtGSUxFX1NUT1JBR0VfV09SS1NQQUNFX0lNUE9SVF9NQVhfU0laRX0nCiAgICAgIC0gJ0FXU19BQ0NFU1NfS0VZX0lEPSR7QVdTX0FDQ0VTU19LRVlfSUR9JwogICAgICAtICdBV1NfU0VDUkVUX0FDQ0VTU19LRVk9JHtBV1NfU0VDUkVUX0FDQ0VTU19LRVl9JwogICAgICAtICdBV1NfUkVHSU9OPSR7QVdTX1JFR0lPTn0nCiAgICAgIC0gJ0FXU19TM19BQ0NFTEVSQVRFX1VSTD0ke0FXU19TM19BQ0NFTEVSQVRFX1VSTH0nCiAgICAgIC0gJ0FXU19TM19VUExPQURfQlVDS0VUX1VSTD0ke0FXU19TM19VUExPQURfQlVDS0VUX1VSTH0nCiAgICAgIC0gJ0FXU19TM19VUExPQURfQlVDS0VUX05BTUU9JHtBV1NfUzNfVVBMT0FEX0JVQ0tFVF9OQU1FfScKICAgICAgLSAnQVdTX1MzX0ZPUkNFX1BBVEhfU1RZTEU9JHtBV1NfUzNfRk9SQ0VfUEFUSF9TVFlMRTotdHJ1ZX0nCiAgICAgIC0gJ0FXU19TM19BQ0w9JHtBV1NfUzNfQUNMOi1wcml2YXRlfScKICAgICAgLSAnU0xBQ0tfQ0xJRU5UX0lEPSR7U0xBQ0tfQ0xJRU5UX0lEfScKICAgICAgLSAnU0xBQ0tfQ0xJRU5UX1NFQ1JFVD0ke1NMQUNLX0NMSUVOVF9TRUNSRVR9JwogICAgICAtICdHT09HTEVfQ0xJRU5UX0lEPSR7R09PR0xFX0NMSUVOVF9JRH0nCiAgICAgIC0gJ0dPT0dMRV9DTElFTlRfU0VDUkVUPSR7R09PR0xFX0NMSUVOVF9TRUNSRVR9JwogICAgICAtICdBWlVSRV9DTElFTlRfSUQ9JHtBWlVSRV9DTElFTlRfSUR9JwogICAgICAtICdBWlVSRV9DTElFTlRfU0VDUkVUPSR7QVpVUkVfQ0xJRU5UX1NFQ1JFVH0nCiAgICAgIC0gJ0FaVVJFX1JFU09VUkNFX0FQUF9JRD0ke0FaVVJFX1JFU09VUkNFX0FQUF9JRH0nCiAgICAgIC0gJ09JRENfQ0xJRU5UX0lEPSR7T0lEQ19DTElFTlRfSUR9JwogICAgICAtICdPSURDX0NMSUVOVF9TRUNSRVQ9JHtPSURDX0NMSUVOVF9TRUNSRVR9JwogICAgICAtICdPSURDX0FVVEhfVVJJPSR7T0lEQ19BVVRIX1VSSX0nCiAgICAgIC0gJ09JRENfVE9LRU5fVVJJPSR7T0lEQ19UT0tFTl9VUkl9JwogICAgICAtICdPSURDX1VTRVJJTkZPX1VSST0ke09JRENfVVNFUklORk9fVVJJfScKICAgICAgLSAnT0lEQ19MT0dPVVRfVVJJPSR7T0lEQ19MT0dPVVRfVVJJfScKICAgICAgLSAnT0lEQ19VU0VSTkFNRV9DTEFJTT0ke09JRENfVVNFUk5BTUVfQ0xBSU19JwogICAgICAtICdPSURDX0RJU1BMQVlfTkFNRT0ke09JRENfRElTUExBWV9OQU1FfScKICAgICAgLSAnT0lEQ19TQ09QRVM9JHtPSURDX1NDT1BFU30nCiAgICAgIC0gJ0dJVEhVQl9DTElFTlRfSUQ9JHtHSVRIVUJfQ0xJRU5UX0lEfScKICAgICAgLSAnR0lUSFVCX0NMSUVOVF9TRUNSRVQ9JHtHSVRIVUJfQ0xJRU5UX1NFQ1JFVH0nCiAgICAgIC0gJ0dJVEhVQl9BUFBfTkFNRT0ke0dJVEhVQl9BUFBfTkFNRX0nCiAgICAgIC0gJ0dJVEhVQl9BUFBfSUQ9JHtHSVRIVUJfQVBQX0lEfScKICAgICAgLSAnR0lUSFVCX0FQUF9QUklWQVRFX0tFWT0ke0dJVEhVQl9BUFBfUFJJVkFURV9LRVl9JwogICAgICAtICdQR1NTTE1PREU9JHtQR1NTTE1PREU6LWRpc2FibGV9JwogICAgICAtICdGT1JDRV9IVFRQUz0ke0ZPUkNFX0hUVFBTOi10cnVlfScKICAgIGhlYWx0aGNoZWNrOgogICAgICBkaXNhYmxlOiB0cnVlCiAgcmVkaXM6CiAgICBpbWFnZTogJ3JlZGlzOmFscGluZScKICAgIGVudmlyb25tZW50OgogICAgICAtICdSRURJU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfNjRfUkVESVN9JwogICAgY29tbWFuZDoKICAgICAgLSByZWRpcy1zZXJ2ZXIKICAgICAgLSAnLS1yZXF1aXJlcGFzcycKICAgICAgLSAnJHtTRVJWSUNFX1BBU1NXT1JEXzY0X1JFRElTfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSByZWRpcy1jbGkKICAgICAgICAtICctYScKICAgICAgICAtICcke1NFUlZJQ0VfUEFTU1dPUkRfNjRfUkVESVN9JwogICAgICAgIC0gUElORwogICAgICBpbnRlcnZhbDogMTBzCiAgICAgIHRpbWVvdXQ6IDMwcwogICAgICByZXRyaWVzOiAzCiAgcG9zdGdyZXM6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjEyLWFscGluZScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2RhdGFiYXNlLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ1BPU1RHUkVTX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfNjRfUE9TVEdSRVN9JwogICAgICAtICdQT1NUR1JFU19EQj0ke1BPU1RHUkVTX0RBVEFCQVNFOi1vdXRsaW5lfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBwZ19pc3JlYWR5CiAgICAgICAgLSAnLVUnCiAgICAgICAgLSAnJHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9JwogICAgICAgIC0gJy1kJwogICAgICAgIC0gJyR7UE9TVEdSRVNfREFUQUJBU0U6LW91dGxpbmV9JwogICAgICBpbnRlcnZhbDogMzBzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAzCg==",
+        "compose": "c2VydmljZXM6CiAgb3V0bGluZToKICAgIGltYWdlOiAnZG9ja2VyLmdldG91dGxpbmUuY29tL291dGxpbmV3aWtpL291dGxpbmU6bGF0ZXN0JwogICAgdm9sdW1lczoKICAgICAgLSAnc3RvcmFnZS1kYXRhOi92YXIvbGliL291dGxpbmUvZGF0YScKICAgIGRlcGVuZHNfb246CiAgICAgIHBvc3RncmVzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICAgIHJlZGlzOgogICAgICAgIGNvbmRpdGlvbjogc2VydmljZV9oZWFsdGh5CiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fT1VUTElORV8zMDAwCiAgICAgIC0gTk9ERV9FTlY9cHJvZHVjdGlvbgogICAgICAtICdTRUNSRVRfS0VZPSR7U0VSVklDRV9CQVNFNjRfT1VUTElORX0nCiAgICAgIC0gJ1VUSUxTX1NFQ1JFVD0ke1NFUlZJQ0VfUEFTU1dPUkRfNjRfT1VUTElORX0nCiAgICAgIC0gJ0RBVEFCQVNFX1VSTD1wb3N0Z3JlczovLyR7U0VSVklDRV9VU0VSX1BPU1RHUkVTfToke1NFUlZJQ0VfUEFTU1dPUkRfNjRfUE9TVEdSRVN9QHBvc3RncmVzOjU0MzIvJHtQT1NUR1JFU19EQVRBQkFTRTotb3V0bGluZX0nCiAgICAgIC0gJ1JFRElTX1VSTD1yZWRpczovLzoke1NFUlZJQ0VfUEFTU1dPUkRfNjRfUkVESVN9QHJlZGlzOjYzNzknCiAgICAgIC0gJ1VSTD0ke1NFUlZJQ0VfRlFETl9PVVRMSU5FXzMwMDB9JwogICAgICAtICdQT1JUPSR7T1VUTElORV9QT1JUOi0zMDAwfScKICAgICAgLSAnRklMRV9TVE9SQUdFPSR7RklMRV9TVE9SQUdFOi1sb2NhbH0nCiAgICAgIC0gJ0ZJTEVfU1RPUkFHRV9MT0NBTF9ST09UX0RJUj0ke0ZJTEVfU1RPUkFHRV9MT0NBTF9ST09UX0RJUjotL3Zhci9saWIvb3V0bGluZS9kYXRhfScKICAgICAgLSAnRklMRV9TVE9SQUdFX1VQTE9BRF9NQVhfU0laRT0ke0ZJTEVfU1RPUkFHRV9VUExPQURfTUFYX1NJWkU6LTIwMDB9JwogICAgICAtICdGSUxFX1NUT1JBR0VfSU1QT1JUX01BWF9TSVpFPSR7RklMRV9TVE9SQUdFX0lNUE9SVF9NQVhfU0laRTotMTAwfScKICAgICAgLSAnRklMRV9TVE9SQUdFX1dPUktTUEFDRV9JTVBPUlRfTUFYX1NJWkU9JHtGSUxFX1NUT1JBR0VfV09SS1NQQUNFX0lNUE9SVF9NQVhfU0laRX0nCiAgICAgIC0gJ0FXU19BQ0NFU1NfS0VZX0lEPSR7QVdTX0FDQ0VTU19LRVlfSUR9JwogICAgICAtICdBV1NfU0VDUkVUX0FDQ0VTU19LRVk9JHtBV1NfU0VDUkVUX0FDQ0VTU19LRVl9JwogICAgICAtICdBV1NfUkVHSU9OPSR7QVdTX1JFR0lPTn0nCiAgICAgIC0gJ0FXU19TM19BQ0NFTEVSQVRFX1VSTD0ke0FXU19TM19BQ0NFTEVSQVRFX1VSTH0nCiAgICAgIC0gJ0FXU19TM19VUExPQURfQlVDS0VUX1VSTD0ke0FXU19TM19VUExPQURfQlVDS0VUX1VSTH0nCiAgICAgIC0gJ0FXU19TM19VUExPQURfQlVDS0VUX05BTUU9JHtBV1NfUzNfVVBMT0FEX0JVQ0tFVF9OQU1FfScKICAgICAgLSAnQVdTX1MzX0ZPUkNFX1BBVEhfU1RZTEU9JHtBV1NfUzNfRk9SQ0VfUEFUSF9TVFlMRTotdHJ1ZX0nCiAgICAgIC0gJ0FXU19TM19BQ0w9JHtBV1NfUzNfQUNMOi1wcml2YXRlfScKICAgICAgLSAnU0xBQ0tfQ0xJRU5UX0lEPSR7U0xBQ0tfQ0xJRU5UX0lEfScKICAgICAgLSAnU0xBQ0tfQ0xJRU5UX1NFQ1JFVD0ke1NMQUNLX0NMSUVOVF9TRUNSRVR9JwogICAgICAtICdHT09HTEVfQ0xJRU5UX0lEPSR7R09PR0xFX0NMSUVOVF9JRH0nCiAgICAgIC0gJ0dPT0dMRV9DTElFTlRfU0VDUkVUPSR7R09PR0xFX0NMSUVOVF9TRUNSRVR9JwogICAgICAtICdBWlVSRV9DTElFTlRfSUQ9JHtBWlVSRV9DTElFTlRfSUR9JwogICAgICAtICdBWlVSRV9DTElFTlRfU0VDUkVUPSR7QVpVUkVfQ0xJRU5UX1NFQ1JFVH0nCiAgICAgIC0gJ0FaVVJFX1JFU09VUkNFX0FQUF9JRD0ke0FaVVJFX1JFU09VUkNFX0FQUF9JRH0nCiAgICAgIC0gJ09JRENfQ0xJRU5UX0lEPSR7T0lEQ19DTElFTlRfSUR9JwogICAgICAtICdPSURDX0NMSUVOVF9TRUNSRVQ9JHtPSURDX0NMSUVOVF9TRUNSRVR9JwogICAgICAtICdPSURDX0FVVEhfVVJJPSR7T0lEQ19BVVRIX1VSSX0nCiAgICAgIC0gJ09JRENfVE9LRU5fVVJJPSR7T0lEQ19UT0tFTl9VUkl9JwogICAgICAtICdPSURDX1VTRVJJTkZPX1VSST0ke09JRENfVVNFUklORk9fVVJJfScKICAgICAgLSAnT0lEQ19MT0dPVVRfVVJJPSR7T0lEQ19MT0dPVVRfVVJJfScKICAgICAgLSAnT0lEQ19VU0VSTkFNRV9DTEFJTT0ke09JRENfVVNFUk5BTUVfQ0xBSU19JwogICAgICAtICdPSURDX0RJU1BMQVlfTkFNRT0ke09JRENfRElTUExBWV9OQU1FfScKICAgICAgLSAnT0lEQ19TQ09QRVM9JHtPSURDX1NDT1BFU30nCiAgICAgIC0gJ0dJVEhVQl9DTElFTlRfSUQ9JHtHSVRIVUJfQ0xJRU5UX0lEfScKICAgICAgLSAnR0lUSFVCX0NMSUVOVF9TRUNSRVQ9JHtHSVRIVUJfQ0xJRU5UX1NFQ1JFVH0nCiAgICAgIC0gJ0dJVEhVQl9BUFBfTkFNRT0ke0dJVEhVQl9BUFBfTkFNRX0nCiAgICAgIC0gJ0dJVEhVQl9BUFBfSUQ9JHtHSVRIVUJfQVBQX0lEfScKICAgICAgLSAnR0lUSFVCX0FQUF9QUklWQVRFX0tFWT0ke0dJVEhVQl9BUFBfUFJJVkFURV9LRVl9JwogICAgICAtICdESVNDT1JEX0NMSUVOVF9JRD0ke0RJU0NPUkRfQ0xJRU5UX0lEfScKICAgICAgLSAnRElTQ09SRF9DTElFTlRfU0VDUkVUPSR7RElTQ09SRF9DTElFTlRfU0VDUkVUfScKICAgICAgLSAnRElTQ09SRF9TRVJWRVJfSUQ9JHtESVNDT1JEX1NFUlZFUl9JRH0nCiAgICAgIC0gJ0RJU0NPUkRfU0VSVkVSX1JPTEVTPSR7RElTQ09SRF9TRVJWRVJfUk9MRVN9JwogICAgICAtICdQR1NTTE1PREU9JHtQR1NTTE1PREU6LWRpc2FibGV9JwogICAgICAtICdGT1JDRV9IVFRQUz0ke0ZPUkNFX0hUVFBTOi10cnVlfScKICAgIGhlYWx0aGNoZWNrOgogICAgICBkaXNhYmxlOiB0cnVlCiAgcmVkaXM6CiAgICBpbWFnZTogJ3JlZGlzOmFscGluZScKICAgIGVudmlyb25tZW50OgogICAgICAtICdSRURJU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfNjRfUkVESVN9JwogICAgY29tbWFuZDoKICAgICAgLSByZWRpcy1zZXJ2ZXIKICAgICAgLSAnLS1yZXF1aXJlcGFzcycKICAgICAgLSAnJHtTRVJWSUNFX1BBU1NXT1JEXzY0X1JFRElTfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSByZWRpcy1jbGkKICAgICAgICAtICctYScKICAgICAgICAtICcke1NFUlZJQ0VfUEFTU1dPUkRfNjRfUkVESVN9JwogICAgICAgIC0gUElORwogICAgICBpbnRlcnZhbDogMTBzCiAgICAgIHRpbWVvdXQ6IDMwcwogICAgICByZXRyaWVzOiAzCiAgcG9zdGdyZXM6CiAgICBpbWFnZTogJ3Bvc3RncmVzOjEyLWFscGluZScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2RhdGFiYXNlLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ1BPU1RHUkVTX1VTRVI9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9JwogICAgICAtICdQT1NUR1JFU19QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfNjRfUE9TVEdSRVN9JwogICAgICAtICdQT1NUR1JFU19EQj0ke1BPU1RHUkVTX0RBVEFCQVNFOi1vdXRsaW5lfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBwZ19pc3JlYWR5CiAgICAgICAgLSAnLVUnCiAgICAgICAgLSAnJHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9JwogICAgICAgIC0gJy1kJwogICAgICAgIC0gJyR7UE9TVEdSRVNfREFUQUJBU0U6LW91dGxpbmV9JwogICAgICBpbnRlcnZhbDogMzBzCiAgICAgIHRpbWVvdXQ6IDIwcwogICAgICByZXRyaWVzOiAzCg==",
         "tags": [
             "knowledge base",
             "documentation"

From 7edd2285b516d89ef4d945d570b752a827eb87df Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 17 Dec 2024 09:57:31 +0100
Subject: [PATCH 45/60] Refactor PostgreSQL selection UI in project creation
 form for improved layout and documentation links

---
 .../livewire/project/new/select.blade.php     | 121 +++++++++---------
 1 file changed, 59 insertions(+), 62 deletions(-)

diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php
index 54a2e953e..e6067817d 100644
--- a/resources/views/livewire/project/new/select.blade.php
+++ b/resources/views/livewire/project/new/select.blade.php
@@ -273,77 +273,74 @@
         <h2>Select a Postgresql type</h2>
         <div>If you need extra extensions, you can select Supabase PostgreSQL (or others), otherwise select PostgreSQL
             16 (default).</div>
-        <div class="flex flex-col gap-4">
-            <div class="flex flex-col gap-2">
-                <div class="gap-2 border border-transparent cursor-pointer box-without-bg dark:bg-coolgray-100 bg-white dark:hover:text-neutral-400 dark:hover:bg-coollabs group flex "
-                    wire:click="setPostgresqlType('postgres:16-alpine')">
-                    <div class="flex flex-col">
-                        <div class="box-title">PostgreSQL 16 (default)</div>
-                        <div class="box-description">
-                            PostgreSQL is a powerful, open-source object-relational database system (no extensions).
-                        </div>
+        <div class="flex flex-col gap-6 pt-8">
+            <div class="gap-2 border border-transparent cursor-pointer box-without-bg dark:bg-coolgray-100 bg-white dark:hover:text-neutral-400 dark:hover:bg-coollabs group flex "
+                wire:click="setPostgresqlType('postgres:16-alpine')">
+                <div class="flex flex-col">
+                    <div class="box-title">PostgreSQL 16 (default)</div>
+                    <div class="box-description">
+                        PostgreSQL is a powerful, open-source object-relational database system (no extensions).
                     </div>
-                    <div class="flex-1"></div>
+                </div>
+                <div class="flex-1"></div>
 
-                    <div class="flex items-center px-2" title="Read the documentation.">
-                        <a class="p-2 hover:underline group-hover:dark:text-white dark:text-white text-neutral-6000"
-                            onclick="event.stopPropagation()" href="https://hub.docker.com/_/postgres/"
-                            target="_blank">
-                            Documentation
-                        </a>
+                <div class="flex items-center px-2" title="Read the documentation.">
+                    <a class="p-2 hover:underline group-hover:dark:text-white dark:text-white text-neutral-6000"
+                        onclick="event.stopPropagation()" href="https://hub.docker.com/_/postgres/" target="_blank">
+                        Documentation
+                    </a>
+                </div>
+            </div>
+            <div class="gap-2 border border-transparent cursor-pointer box-without-bg dark:bg-coolgray-100 bg-white dark:hover:text-neutral-400 dark:hover:bg-coollabs group flex"
+                wire:click="setPostgresqlType('supabase/postgres:15.6.1.113')">
+                <div class="flex flex-col">
+                    <div class="box-title">Supabase PostgreSQL (with extensions)</div>
+                    <div class="box-description">
+                        Supabase is a modern, open-source alternative to PostgreSQL with lots of extensions.
                     </div>
                 </div>
-                <div class="gap-2 border border-transparent cursor-pointer box-without-bg dark:bg-coolgray-100 bg-white dark:hover:text-neutral-400 dark:hover:bg-coollabs group flex"
-                    wire:click="setPostgresqlType('supabase/postgres:15.6.1.113')">
-                    <div class="flex flex-col">
-                        <div class="box-title">Supabase PostgreSQL (with extensions)</div>
-                        <div class="box-description">
-                            Supabase is a modern, open-source alternative to PostgreSQL with lots of extensions.
-                        </div>
-                    </div>
-                    <div class="flex-1"></div>
-                    <div class="flex items-center px-2" title="Read the documentation.">
-                        <a class="p-2 hover:underline group-hover:dark:text-white dark:text-white text-neutral-600"
-                            onclick="event.stopPropagation()" href="https://github.com/supabase/postgres"
-                            target="_blank">
-                            Documentation
-                        </a>
+                <div class="flex-1"></div>
+                <div class="flex items-center px-2" title="Read the documentation.">
+                    <a class="p-2 hover:underline group-hover:dark:text-white dark:text-white text-neutral-600"
+                        onclick="event.stopPropagation()" href="https://github.com/supabase/postgres"
+                        target="_blank">
+                        Documentation
+                    </a>
+                </div>
+            </div>
+            <div class="gap-2 border border-transparent cursor-pointer box-without-bg dark:bg-coolgray-100 bg-white dark:hover:text-neutral-400 dark:hover:bg-coollabs group flex"
+                wire:click="setPostgresqlType('postgis/postgis')">
+                <div class="flex flex-col">
+                    <div class="box-title">PostGIS</div>
+                    <div class="box-description">
+                        PostGIS is a PostgreSQL extension for geographic objects.
                     </div>
                 </div>
-                <div class="gap-2 border border-transparent cursor-pointer box-without-bg dark:bg-coolgray-100 bg-white dark:hover:text-neutral-400 dark:hover:bg-coollabs group flex"
-                    wire:click="setPostgresqlType('postgis/postgis')">
-                    <div class="flex flex-col">
-                        <div class="box-title">PostGIS</div>
-                        <div class="box-description">
-                            PostGIS is a PostgreSQL extension for geographic objects.
-                        </div>
-                    </div>
-                    <div class="flex-1"></div>
-                    <div class="flex items-center px-2" title="Read the documentation.">
-                        <a class="p-2 hover:underline group-hover:dark:text-white dark:text-white text-neutral-600"
-                            onclick="event.stopPropagation()" href="https://github.com/postgis/docker-postgis"
-                            target="_blank">
-                            Documentation
-                        </a>
+                <div class="flex-1"></div>
+                <div class="flex items-center px-2" title="Read the documentation.">
+                    <a class="p-2 hover:underline group-hover:dark:text-white dark:text-white text-neutral-600"
+                        onclick="event.stopPropagation()" href="https://github.com/postgis/docker-postgis"
+                        target="_blank">
+                        Documentation
+                    </a>
+                </div>
+            </div>
+            <div class="gap-2 border border-transparent cursor-pointer box-without-bg dark:bg-coolgray-100 bg-white dark:hover:text-neutral-400 dark:hover:bg-coollabs group flex"
+                wire:click="setPostgresqlType('pgvector/pgvector:pg16')">
+                <div class="flex flex-col">
+                    <div class="box-title">PGVector (16)</div>
+                    <div class="box-description">
+                        PGVector is a PostgreSQL extension for vector data types.
                     </div>
                 </div>
-                <div class="gap-2 border border-transparent cursor-pointer box-without-bg dark:bg-coolgray-100 bg-white dark:hover:text-neutral-400 dark:hover:bg-coollabs group flex"
-                    wire:click="setPostgresqlType('pgvector/pgvector:pg16')">
-                    <div class="flex flex-col">
-                        <div class="box-title">PGVector (16)</div>
-                        <div class="box-description">
-                            PGVector is a PostgreSQL extension for vector data types.
-                        </div>
-                    </div>
-                    <div class="flex-1"></div>
+                <div class="flex-1"></div>
 
-                    <div class="flex items-center px-2" title="Read the documentation.">
-                        <a class="p-2 hover:underline group-hover:dark:text-white dark:text-white text-neutral-600"
-                            onclick="event.stopPropagation()" href="https://github.com/pgvector/pgvector"
-                            target="_blank">
-                            Documentation
-                        </a>
-                    </div>
+                <div class="flex items-center px-2" title="Read the documentation.">
+                    <a class="p-2 hover:underline group-hover:dark:text-white dark:text-white text-neutral-600"
+                        onclick="event.stopPropagation()" href="https://github.com/pgvector/pgvector"
+                        target="_blank">
+                        Documentation
+                    </a>
                 </div>
             </div>
         </div>

From 2a9d4992513d80b67fce23f819c12cea7796a9e7 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 17 Dec 2024 10:38:32 +0100
Subject: [PATCH 46/60] feat: migrate env variables to polymorphic relationship
 fix: proxy status query ui

---
 .../Api/ApplicationsController.php            |  36 +++-
 .../Controllers/Api/ServicesController.php    |  19 +-
 .../Project/Application/DeploymentNavbar.php  |   2 +-
 app/Livewire/Project/CloneMe.php              |  15 +-
 app/Livewire/Project/New/DockerCompose.php    |   3 +-
 app/Livewire/Project/Resource/Create.php      |   3 +-
 .../Shared/EnvironmentVariable/All.php        |  67 ++-----
 .../Shared/EnvironmentVariable/Show.php       | 102 +++++++----
 .../Project/Shared/ResourceOperations.php     |   3 +-
 app/Models/Application.php                    |  52 ++++--
 app/Models/EnvironmentVariable.php            |  73 ++++----
 app/Models/Service.php                        |  14 +-
 app/Models/StandaloneClickhouse.php           |  10 +-
 app/Models/StandaloneDragonfly.php            |  16 +-
 app/Models/StandaloneKeydb.php                |  16 +-
 app/Models/StandaloneMariadb.php              |  10 +-
 app/Models/StandaloneMongodb.php              |  16 +-
 app/Models/StandaloneMysql.php                |  16 +-
 app/Models/StandalonePostgresql.php           |  16 +-
 app/Models/StandaloneRedis.php                |  16 +-
 app/View/Components/Forms/Button.php          |   3 +-
 bootstrap/helpers/services.php                |  51 ++++--
 bootstrap/helpers/shared.php                  |  85 +++++----
 ...columns_to_environment_variables_table.php | 165 ++++++++++++++++++
 .../views/components/forms/button.blade.php   |  14 +-
 resources/views/components/loading.blade.php  |   4 +-
 .../views/components/server/navbar.blade.php  |   1 +
 .../views/components/status/running.blade.php |  54 +++---
 .../project/database/heading.blade.php        |   2 +-
 .../shared/environment-variable/all.blade.php |   6 +-
 .../environment-variable/show.blade.php       |  61 +++----
 .../livewire/server/proxy/deploy.blade.php    |  35 ++--
 .../livewire/server/proxy/status.blade.php    |  13 +-
 33 files changed, 625 insertions(+), 374 deletions(-)
 create mode 100644 database/migrations/2024_12_16_134437_add_resourceable_columns_to_environment_variables_table.php

diff --git a/app/Http/Controllers/Api/ApplicationsController.php b/app/Http/Controllers/Api/ApplicationsController.php
index f02c4255d..6e7370bb3 100644
--- a/app/Http/Controllers/Api/ApplicationsController.php
+++ b/app/Http/Controllers/Api/ApplicationsController.php
@@ -27,6 +27,9 @@ class ApplicationsController extends Controller
     {
         $application->makeHidden([
             'id',
+            'resourceable',
+            'resourceable_id',
+            'resourceable_type',
         ]);
         if (request()->attributes->get('can_read_sensitive', false) === false) {
             $application->makeHidden([
@@ -1893,8 +1896,9 @@ class ApplicationsController extends Controller
         $is_preview = $request->is_preview ?? false;
         $is_build_time = $request->is_build_time ?? false;
         $is_literal = $request->is_literal ?? false;
+        $key = str($request->key)->trim()->replace(' ', '_')->value;
         if ($is_preview) {
-            $env = $application->environment_variables_preview->where('key', $request->key)->first();
+            $env = $application->environment_variables_preview->where('key', $key)->first();
             if ($env) {
                 $env->value = $request->value;
                 if ($env->is_build_time != $is_build_time) {
@@ -1921,7 +1925,7 @@ class ApplicationsController extends Controller
                 ], 404);
             }
         } else {
-            $env = $application->environment_variables->where('key', $request->key)->first();
+            $env = $application->environment_variables->where('key', $key)->first();
             if ($env) {
                 $env->value = $request->value;
                 if ($env->is_build_time != $is_build_time) {
@@ -2064,6 +2068,7 @@ class ApplicationsController extends Controller
         $bulk_data = collect($bulk_data)->map(function ($item) {
             return collect($item)->only(['key', 'value', 'is_preview', 'is_build_time', 'is_literal']);
         });
+        $returnedEnvs = collect();
         foreach ($bulk_data as $item) {
             $validator = customApiValidator($item, [
                 'key' => 'string|required',
@@ -2085,8 +2090,9 @@ class ApplicationsController extends Controller
             $is_literal = $item->get('is_literal') ?? false;
             $is_multi_line = $item->get('is_multiline') ?? false;
             $is_shown_once = $item->get('is_shown_once') ?? false;
+            $key = str($item->get('key'))->trim()->replace(' ', '_')->value;
             if ($is_preview) {
-                $env = $application->environment_variables_preview->where('key', $item->get('key'))->first();
+                $env = $application->environment_variables_preview->where('key', $key)->first();
                 if ($env) {
                     $env->value = $item->get('value');
                     if ($env->is_build_time != $is_build_time) {
@@ -2111,10 +2117,12 @@ class ApplicationsController extends Controller
                         'is_literal' => $is_literal,
                         'is_multiline' => $is_multi_line,
                         'is_shown_once' => $is_shown_once,
+                        'resourceable_type' => get_class($application),
+                        'resourceable_id' => $application->id,
                     ]);
                 }
             } else {
-                $env = $application->environment_variables->where('key', $item->get('key'))->first();
+                $env = $application->environment_variables->where('key', $key)->first();
                 if ($env) {
                     $env->value = $item->get('value');
                     if ($env->is_build_time != $is_build_time) {
@@ -2139,12 +2147,15 @@ class ApplicationsController extends Controller
                         'is_literal' => $is_literal,
                         'is_multiline' => $is_multi_line,
                         'is_shown_once' => $is_shown_once,
+                        'resourceable_type' => get_class($application),
+                        'resourceable_id' => $application->id,
                     ]);
                 }
             }
+            $returnedEnvs->push($this->removeSensitiveData($env));
         }
 
-        return response()->json($this->removeSensitiveData($env))->setStatusCode(201);
+        return response()->json($returnedEnvs)->setStatusCode(201);
     }
 
     #[OA\Post(
@@ -2257,8 +2268,10 @@ class ApplicationsController extends Controller
             ], 422);
         }
         $is_preview = $request->is_preview ?? false;
+        $key = str($request->key)->trim()->replace(' ', '_')->value;
+
         if ($is_preview) {
-            $env = $application->environment_variables_preview->where('key', $request->key)->first();
+            $env = $application->environment_variables_preview->where('key', $key)->first();
             if ($env) {
                 return response()->json([
                     'message' => 'Environment variable already exists. Use PATCH request to update it.',
@@ -2272,6 +2285,8 @@ class ApplicationsController extends Controller
                     'is_literal' => $request->is_literal ?? false,
                     'is_multiline' => $request->is_multiline ?? false,
                     'is_shown_once' => $request->is_shown_once ?? false,
+                    'resourceable_type' => get_class($application),
+                    'resourceable_id' => $application->id,
                 ]);
 
                 return response()->json([
@@ -2279,7 +2294,7 @@ class ApplicationsController extends Controller
                 ])->setStatusCode(201);
             }
         } else {
-            $env = $application->environment_variables->where('key', $request->key)->first();
+            $env = $application->environment_variables->where('key', $key)->first();
             if ($env) {
                 return response()->json([
                     'message' => 'Environment variable already exists. Use PATCH request to update it.',
@@ -2293,6 +2308,8 @@ class ApplicationsController extends Controller
                     'is_literal' => $request->is_literal ?? false,
                     'is_multiline' => $request->is_multiline ?? false,
                     'is_shown_once' => $request->is_shown_once ?? false,
+                    'resourceable_type' => get_class($application),
+                    'resourceable_id' => $application->id,
                 ]);
 
                 return response()->json([
@@ -2380,7 +2397,10 @@ class ApplicationsController extends Controller
                 'message' => 'Application not found.',
             ], 404);
         }
-        $found_env = EnvironmentVariable::where('uuid', $request->env_uuid)->where('application_id', $application->id)->first();
+        $found_env = EnvironmentVariable::where('uuid', $request->env_uuid)
+            ->where('resourceable_type', Application::class)
+            ->where('resourceable_id', $application->id)
+            ->first();
         if (! $found_env) {
             return response()->json([
                 'message' => 'Environment variable not found.',
diff --git a/app/Http/Controllers/Api/ServicesController.php b/app/Http/Controllers/Api/ServicesController.php
index bcaba7107..f5ecdcf28 100644
--- a/app/Http/Controllers/Api/ServicesController.php
+++ b/app/Http/Controllers/Api/ServicesController.php
@@ -20,6 +20,9 @@ class ServicesController extends Controller
     {
         $service->makeHidden([
             'id',
+            'resourceable',
+            'resourceable_id',
+            'resourceable_type',
         ]);
         if (request()->attributes->get('can_read_sensitive', false) === false) {
             $service->makeHidden([
@@ -333,7 +336,8 @@ class ServicesController extends Controller
                         EnvironmentVariable::create([
                             'key' => $key,
                             'value' => $generatedValue,
-                            'service_id' => $service->id,
+                            'resourceable_id' => $service->id,
+                            'resourceable_type' => $service->getMorphClass(),
                             'is_build_time' => false,
                             'is_preview' => false,
                         ]);
@@ -673,7 +677,8 @@ class ServicesController extends Controller
             ], 422);
         }
 
-        $env = $service->environment_variables()->where('key', $request->key)->first();
+        $key = str($request->key)->trim()->replace(' ', '_')->value;
+        $env = $service->environment_variables()->where('key', $key)->first();
         if (! $env) {
             return response()->json(['message' => 'Environment variable not found.'], 404);
         }
@@ -799,9 +804,9 @@ class ServicesController extends Controller
                     'errors' => $validator->errors(),
                 ], 422);
             }
-
+            $key = str($item['key'])->trim()->replace(' ', '_')->value;
             $env = $service->environment_variables()->updateOrCreate(
-                ['key' => $item['key']],
+                ['key' => $key],
                 $item
             );
 
@@ -909,7 +914,8 @@ class ServicesController extends Controller
             ], 422);
         }
 
-        $existingEnv = $service->environment_variables()->where('key', $request->key)->first();
+        $key = str($request->key)->trim()->replace(' ', '_')->value;
+        $existingEnv = $service->environment_variables()->where('key', $key)->first();
         if ($existingEnv) {
             return response()->json([
                 'message' => 'Environment variable already exists. Use PATCH request to update it.',
@@ -995,7 +1001,8 @@ class ServicesController extends Controller
         }
 
         $env = EnvironmentVariable::where('uuid', $request->env_uuid)
-            ->where('service_id', $service->id)
+            ->where('resourceable_type', Service::class)
+            ->where('resourceable_id', $service->id)
             ->first();
 
         if (! $env) {
diff --git a/app/Livewire/Project/Application/DeploymentNavbar.php b/app/Livewire/Project/Application/DeploymentNavbar.php
index 6a6fa2482..87b40d4dc 100644
--- a/app/Livewire/Project/Application/DeploymentNavbar.php
+++ b/app/Livewire/Project/Application/DeploymentNavbar.php
@@ -23,7 +23,7 @@ class DeploymentNavbar extends Component
 
     public function mount()
     {
-        $this->application = Application::find($this->application_deployment_queue->application_id);
+        $this->application = Application::ownedByCurrentTeam()->find($this->application_deployment_queue->application_id);
         $this->server = $this->application->destination->server;
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
     }
diff --git a/app/Livewire/Project/CloneMe.php b/app/Livewire/Project/CloneMe.php
index 4d2bc6589..a8e3e6cab 100644
--- a/app/Livewire/Project/CloneMe.php
+++ b/app/Livewire/Project/CloneMe.php
@@ -119,7 +119,7 @@ class CloneMe extends Component
                 $environmentVaribles = $application->environment_variables()->get();
                 foreach ($environmentVaribles as $environmentVarible) {
                     $newEnvironmentVariable = $environmentVarible->replicate()->fill([
-                        'application_id' => $newApplication->id,
+                        'resourceable_id' => $newApplication->id,
                     ]);
                     $newEnvironmentVariable->save();
                 }
@@ -145,17 +145,8 @@ class CloneMe extends Component
                 $environmentVaribles = $database->environment_variables()->get();
                 foreach ($environmentVaribles as $environmentVarible) {
                     $payload = [];
-                    if ($database->type() === 'standalone-postgresql') {
-                        $payload['standalone_postgresql_id'] = $newDatabase->id;
-                    } elseif ($database->type() === 'standalone-redis') {
-                        $payload['standalone_redis_id'] = $newDatabase->id;
-                    } elseif ($database->type() === 'standalone-mongodb') {
-                        $payload['standalone_mongodb_id'] = $newDatabase->id;
-                    } elseif ($database->type() === 'standalone-mysql') {
-                        $payload['standalone_mysql_id'] = $newDatabase->id;
-                    } elseif ($database->type() === 'standalone-mariadb') {
-                        $payload['standalone_mariadb_id'] = $newDatabase->id;
-                    }
+                    $payload['resourceable_id'] = $newDatabase->id;
+                    $payload['resourceable_type'] = $newDatabase->getMorphClass();
                     $newEnvironmentVariable = $environmentVarible->replicate()->fill($payload);
                     $newEnvironmentVariable->save();
                 }
diff --git a/app/Livewire/Project/New/DockerCompose.php b/app/Livewire/Project/New/DockerCompose.php
index 199a20cf6..e6667e6f3 100644
--- a/app/Livewire/Project/New/DockerCompose.php
+++ b/app/Livewire/Project/New/DockerCompose.php
@@ -87,7 +87,8 @@ class DockerCompose extends Component
                     'value' => $variable,
                     'is_build_time' => false,
                     'is_preview' => false,
-                    'service_id' => $service->id,
+                    'resourceable_id' => $service->id,
+                    'resourceable_type' => $service->getMorphClass(),
                 ]);
             }
             $service->name = "service-$service->uuid";
diff --git a/app/Livewire/Project/Resource/Create.php b/app/Livewire/Project/Resource/Create.php
index 9266a57fc..4fbda2211 100644
--- a/app/Livewire/Project/Resource/Create.php
+++ b/app/Livewire/Project/Resource/Create.php
@@ -95,7 +95,8 @@ class Create extends Component
                                 EnvironmentVariable::create([
                                     'key' => $key,
                                     'value' => $value,
-                                    'service_id' => $service->id,
+                                    'resourceable_id' => $service->id,
+                                    'resourceable_type' => $service->getMorphClass(),
                                     'is_build_time' => false,
                                     'is_preview' => false,
                                 ]);
diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/All.php b/app/Livewire/Project/Shared/EnvironmentVariable/All.php
index 787d33a69..80156bf65 100644
--- a/app/Livewire/Project/Shared/EnvironmentVariable/All.php
+++ b/app/Livewire/Project/Shared/EnvironmentVariable/All.php
@@ -4,7 +4,6 @@ namespace App\Livewire\Project\Shared\EnvironmentVariable;
 
 use App\Models\EnvironmentVariable;
 use Livewire\Component;
-use Visus\Cuid2\Cuid2;
 
 class All extends Component
 {
@@ -14,38 +13,35 @@ class All extends Component
 
     public bool $showPreview = false;
 
-    public ?string $modalId = null;
-
     public ?string $variables = null;
 
     public ?string $variablesPreview = null;
 
     public string $view = 'normal';
 
+    public bool $is_env_sorting_enabled = false;
+
     protected $listeners = [
         'saveKey' => 'submit',
         'refreshEnvs',
         'environmentVariableDeleted' => 'refreshEnvs',
     ];
 
-    protected $rules = [
-        'resource.settings.is_env_sorting_enabled' => 'required|boolean',
-    ];
-
     public function mount()
     {
+        $this->is_env_sorting_enabled = data_get($this->resource, 'settings.is_env_sorting_enabled', false);
         $this->resourceClass = get_class($this->resource);
         $resourceWithPreviews = [\App\Models\Application::class];
-        $simpleDockerfile = ! is_null(data_get($this->resource, 'dockerfile'));
+        $simpleDockerfile = filled(data_get($this->resource, 'dockerfile'));
         if (str($this->resourceClass)->contains($resourceWithPreviews) && ! $simpleDockerfile) {
             $this->showPreview = true;
         }
-        $this->modalId = new Cuid2;
         $this->sortEnvironmentVariables();
     }
 
     public function instantSave()
     {
+        $this->resource->settings->is_env_sorting_enabled = $this->is_env_sorting_enabled;
         $this->resource->settings->save();
         $this->sortEnvironmentVariables();
         $this->dispatch('success', 'Environment variable settings updated.');
@@ -53,7 +49,7 @@ class All extends Component
 
     public function sortEnvironmentVariables()
     {
-        if (! data_get($this->resource, 'settings.is_env_sorting_enabled')) {
+        if ($this->is_env_sorting_enabled === false) {
             if ($this->resource->environment_variables) {
                 $this->resource->environment_variables = $this->resource->environment_variables->sortBy('order')->values();
             }
@@ -178,35 +174,12 @@ class All extends Component
         $environment->is_multiline = $data['is_multiline'] ?? false;
         $environment->is_literal = $data['is_literal'] ?? false;
         $environment->is_preview = $data['is_preview'] ?? false;
-
-        $resourceType = $this->resource->type();
-        $resourceIdField = $this->getResourceIdField($resourceType);
-
-        if ($resourceIdField) {
-            $environment->$resourceIdField = $this->resource->id;
-        }
+        $environment->resourceable_id = $this->resource->id;
+        $environment->resourceable_type = $this->resource->getMorphClass();
 
         return $environment;
     }
 
-    private function getResourceIdField($resourceType)
-    {
-        $resourceTypes = [
-            'application' => 'application_id',
-            'standalone-postgresql' => 'standalone_postgresql_id',
-            'standalone-redis' => 'standalone_redis_id',
-            'standalone-mongodb' => 'standalone_mongodb_id',
-            'standalone-mysql' => 'standalone_mysql_id',
-            'standalone-mariadb' => 'standalone_mariadb_id',
-            'standalone-keydb' => 'standalone_keydb_id',
-            'standalone-dragonfly' => 'standalone_dragonfly_id',
-            'standalone-clickhouse' => 'standalone_clickhouse_id',
-            'service' => 'service_id',
-        ];
-
-        return $resourceTypes[$resourceType] ?? null;
-    }
-
     private function deleteRemovedVariables($isPreview, $variables)
     {
         $method = $isPreview ? 'environment_variables_preview' : 'environment_variables';
@@ -231,34 +204,14 @@ class All extends Component
                 $environment->is_build_time = false;
                 $environment->is_multiline = false;
                 $environment->is_preview = $isPreview;
+                $environment->resourceable_id = $this->resource->id;
+                $environment->resourceable_type = $this->resource->getMorphClass();
 
-                $this->setEnvironmentResourceId($environment);
                 $environment->save();
             }
         }
     }
 
-    private function setEnvironmentResourceId($environment)
-    {
-        $resourceTypes = [
-            'application' => 'application_id',
-            'standalone-postgresql' => 'standalone_postgresql_id',
-            'standalone-redis' => 'standalone_redis_id',
-            'standalone-mongodb' => 'standalone_mongodb_id',
-            'standalone-mysql' => 'standalone_mysql_id',
-            'standalone-mariadb' => 'standalone_mariadb_id',
-            'standalone-keydb' => 'standalone_keydb_id',
-            'standalone-dragonfly' => 'standalone_dragonfly_id',
-            'standalone-clickhouse' => 'standalone_clickhouse_id',
-            'service' => 'service_id',
-        ];
-
-        $resourceType = $this->resource->type();
-        if (isset($resourceTypes[$resourceType])) {
-            $environment->{$resourceTypes[$resourceType]} = $this->resource->id;
-        }
-    }
-
     public function refreshEnvs()
     {
         $this->resource->refresh();
diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/Show.php b/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
index 2bccde0e9..4b66bfdcb 100644
--- a/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
+++ b/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
@@ -20,6 +20,26 @@ class Show extends Component
 
     public string $type;
 
+    public string $key;
+
+    public ?string $value = null;
+
+    public ?string $real_value = null;
+
+    public bool $is_shared = false;
+
+    public bool $is_build_time = false;
+
+    public bool $is_multiline = false;
+
+    public bool $is_literal = false;
+
+    public bool $is_shown_once = false;
+
+    public bool $is_required = false;
+
+    public bool $is_really_required = false;
+
     protected $listeners = [
         'refreshEnvs' => 'refresh',
         'refresh',
@@ -27,39 +47,59 @@ class Show extends Component
     ];
 
     protected $rules = [
-        'env.key' => 'required|string',
-        'env.value' => 'nullable',
-        'env.is_build_time' => 'required|boolean',
-        'env.is_multiline' => 'required|boolean',
-        'env.is_literal' => 'required|boolean',
-        'env.is_shown_once' => 'required|boolean',
-        'env.real_value' => 'nullable',
-        'env.is_required' => 'required|boolean',
+        'key' => 'required|string',
+        'value' => 'nullable',
+        'is_build_time' => 'required|boolean',
+        'is_multiline' => 'required|boolean',
+        'is_literal' => 'required|boolean',
+        'is_shown_once' => 'required|boolean',
+        'real_value' => 'nullable',
+        'is_required' => 'required|boolean',
     ];
 
-    protected $validationAttributes = [
-        'env.key' => 'Key',
-        'env.value' => 'Value',
-        'env.is_build_time' => 'Build Time',
-        'env.is_multiline' => 'Multiline',
-        'env.is_literal' => 'Literal',
-        'env.is_shown_once' => 'Shown Once',
-        'env.is_required' => 'Required',
-    ];
-
-    public function refresh()
-    {
-        $this->env->refresh();
-        $this->checkEnvs();
-    }
-
     public function mount()
     {
+        $this->syncData();
         if ($this->env->getMorphClass() === \App\Models\SharedEnvironmentVariable::class) {
             $this->isSharedVariable = true;
         }
         $this->parameters = get_route_parameters();
         $this->checkEnvs();
+
+    }
+
+    public function refresh()
+    {
+        $this->syncData();
+        $this->checkEnvs();
+    }
+
+    public function syncData(bool $toModel = false)
+    {
+        if ($toModel) {
+            $this->validate();
+            $this->env->key = $this->key;
+            $this->env->value = $this->value;
+            $this->env->is_build_time = $this->is_build_time;
+            $this->env->is_multiline = $this->is_multiline;
+            $this->env->is_literal = $this->is_literal;
+            $this->env->is_shown_once = $this->is_shown_once;
+            $this->env->is_required = $this->is_required;
+            $this->env->is_shared = $this->is_shared;
+            $this->env->save();
+        } else {
+
+            $this->key = $this->env->key;
+            $this->value = $this->env->value;
+            $this->is_build_time = $this->env->is_build_time ?? false;
+            $this->is_multiline = $this->env->is_multiline;
+            $this->is_literal = $this->env->is_literal;
+            $this->is_shown_once = $this->env->is_shown_once;
+            $this->is_required = $this->env->is_required ?? false;
+            $this->is_really_required = $this->env->is_really_required ?? false;
+            $this->is_shared = $this->env->is_shared ?? false;
+            $this->real_value = $this->env->real_value;
+        }
     }
 
     public function checkEnvs()
@@ -103,17 +143,17 @@ class Show extends Component
         try {
             if ($this->isSharedVariable) {
                 $this->validate([
-                    'env.key' => 'required|string',
-                    'env.value' => 'nullable',
-                    'env.is_shown_once' => 'required|boolean',
+                    'key' => 'required|string',
+                    'value' => 'nullable',
+                    'is_shown_once' => 'required|boolean',
                 ]);
             } else {
                 $this->validate();
             }
 
-            if (! $this->isSharedVariable && $this->env->is_required && str($this->env->real_value)->isEmpty()) {
+            if (! $this->isSharedVariable && $this->is_required && str($this->value)->isEmpty()) {
                 $oldValue = $this->env->getOriginal('value');
-                $this->env->value = $oldValue;
+                $this->value = $oldValue;
                 $this->dispatch('error', 'Required environment variable cannot be empty.');
 
                 return;
@@ -122,10 +162,10 @@ class Show extends Component
             $this->serialize();
 
             if ($this->isSharedVariable) {
-                unset($this->env->is_required);
+                unset($this->is_required);
             }
 
-            $this->env->save();
+            $this->syncData(true);
             $this->dispatch('success', 'Environment variable updated.');
             $this->dispatch('envsUpdated');
         } catch (\Exception $e) {
diff --git a/app/Livewire/Project/Shared/ResourceOperations.php b/app/Livewire/Project/Shared/ResourceOperations.php
index de7bb3c05..98b31641a 100644
--- a/app/Livewire/Project/Shared/ResourceOperations.php
+++ b/app/Livewire/Project/Shared/ResourceOperations.php
@@ -60,7 +60,8 @@ class ResourceOperations extends Component
             $environmentVaribles = $this->resource->environment_variables()->get();
             foreach ($environmentVaribles as $environmentVarible) {
                 $newEnvironmentVariable = $environmentVarible->replicate()->fill([
-                    'application_id' => $new_resource->id,
+                    'resourceable_id' => $new_resource->id,
+                    'resourceable_type' => $new_resource->getMorphClass(),
                 ]);
                 $newEnvironmentVariable->save();
             }
diff --git a/app/Models/Application.php b/app/Models/Application.php
index bfb2a1041..6413c8fea 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -695,46 +695,62 @@ class Application extends BaseModel
         return $this->settings->is_static ? [80] : $this->ports_exposes_array;
     }
 
-    public function environment_variables(): HasMany
+    public function environment_variables()
     {
-        return $this->hasMany(EnvironmentVariable::class)->where('is_preview', false)->orderBy('key', 'asc');
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->where('is_preview', false)
+            ->orderBy('key', 'asc');
     }
 
-    public function runtime_environment_variables(): HasMany
+    public function runtime_environment_variables()
     {
-        return $this->hasMany(EnvironmentVariable::class)->where('is_preview', false)->where('key', 'not like', 'NIXPACKS_%');
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->where('is_preview', false)
+            ->where('key', 'not like', 'NIXPACKS_%');
     }
 
-    // Preview Deployments
-
-    public function build_environment_variables(): HasMany
+    public function build_environment_variables()
     {
-        return $this->hasMany(EnvironmentVariable::class)->where('is_preview', false)->where('is_build_time', true)->where('key', 'not like', 'NIXPACKS_%');
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->where('is_preview', false)
+            ->where('is_build_time', true)
+            ->where('key', 'not like', 'NIXPACKS_%');
     }
 
-    public function nixpacks_environment_variables(): HasMany
+    public function nixpacks_environment_variables()
     {
-        return $this->hasMany(EnvironmentVariable::class)->where('is_preview', false)->where('key', 'like', 'NIXPACKS_%');
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->where('is_preview', false)
+            ->where('key', 'like', 'NIXPACKS_%');
     }
 
-    public function environment_variables_preview(): HasMany
+    public function environment_variables_preview()
     {
-        return $this->hasMany(EnvironmentVariable::class)->where('is_preview', true)->orderBy('key', 'asc');
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->where('is_preview', true)
+            ->orderByRaw("LOWER(key) LIKE LOWER('SERVICE%') DESC, LOWER(key) ASC");
     }
 
-    public function runtime_environment_variables_preview(): HasMany
+    public function runtime_environment_variables_preview()
     {
-        return $this->hasMany(EnvironmentVariable::class)->where('is_preview', true)->where('key', 'not like', 'NIXPACKS_%');
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->where('is_preview', true)
+            ->where('key', 'not like', 'NIXPACKS_%');
     }
 
-    public function build_environment_variables_preview(): HasMany
+    public function build_environment_variables_preview()
     {
-        return $this->hasMany(EnvironmentVariable::class)->where('is_preview', true)->where('is_build_time', true)->where('key', 'not like', 'NIXPACKS_%');
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->where('is_preview', true)
+            ->where('is_build_time', true)
+            ->where('key', 'not like', 'NIXPACKS_%');
     }
 
-    public function nixpacks_environment_variables_preview(): HasMany
+    public function nixpacks_environment_variables_preview()
     {
-        return $this->hasMany(EnvironmentVariable::class)->where('is_preview', true)->where('key', 'like', 'NIXPACKS_%');
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->where('is_preview', true)
+            ->where('key', 'like', 'NIXPACKS_%');
     }
 
     public function scheduled_tasks(): HasMany
diff --git a/app/Models/EnvironmentVariable.php b/app/Models/EnvironmentVariable.php
index 96c57e63e..507ff0d7e 100644
--- a/app/Models/EnvironmentVariable.php
+++ b/app/Models/EnvironmentVariable.php
@@ -14,9 +14,8 @@ use Visus\Cuid2\Cuid2;
     properties: [
         'id' => ['type' => 'integer'],
         'uuid' => ['type' => 'string'],
-        'application_id' => ['type' => 'integer'],
-        'service_id' => ['type' => 'integer'],
-        'database_id' => ['type' => 'integer'],
+        'resourceable_type' => ['type' => 'string'],
+        'resourceable_id' => ['type' => 'integer'],
         'is_build_time' => ['type' => 'boolean'],
         'is_literal' => ['type' => 'boolean'],
         'is_multiline' => ['type' => 'boolean'],
@@ -42,6 +41,8 @@ class EnvironmentVariable extends Model
         'is_multiline' => 'boolean',
         'is_preview' => 'boolean',
         'version' => 'string',
+        'resourceable_type' => 'string',
+        'resourceable_id' => 'integer',
     ];
 
     protected $appends = ['real_value', 'is_shared', 'is_really_required'];
@@ -53,18 +54,25 @@ class EnvironmentVariable extends Model
                 $model->uuid = (string) new Cuid2;
             }
         });
+
         static::created(function (EnvironmentVariable $environment_variable) {
-            if ($environment_variable->application_id && ! $environment_variable->is_preview) {
-                $found = ModelsEnvironmentVariable::where('key', $environment_variable->key)->where('application_id', $environment_variable->application_id)->where('is_preview', true)->first();
+            if ($environment_variable->resourceable_type === Application::class && ! $environment_variable->is_preview) {
+                $found = ModelsEnvironmentVariable::where('key', $environment_variable->key)
+                    ->where('resourceable_type', Application::class)
+                    ->where('resourceable_id', $environment_variable->resourceable_id)
+                    ->where('is_preview', true)
+                    ->first();
+
                 if (! $found) {
-                    $application = Application::find($environment_variable->application_id);
-                    if ($application->build_pack !== 'dockerfile') {
+                    $application = Application::find($environment_variable->resourceable_id);
+                    if ($application && $application->build_pack !== 'dockerfile') {
                         ModelsEnvironmentVariable::create([
                             'key' => $environment_variable->key,
                             'value' => $environment_variable->value,
                             'is_build_time' => $environment_variable->is_build_time,
                             'is_multiline' => $environment_variable->is_multiline ?? false,
-                            'application_id' => $environment_variable->application_id,
+                            'resourceable_type' => Application::class,
+                            'resourceable_id' => $environment_variable->resourceable_id,
                             'is_preview' => true,
                         ]);
                     }
@@ -74,6 +82,7 @@ class EnvironmentVariable extends Model
                 'version' => config('constants.coolify.version'),
             ]);
         });
+
         static::saving(function (EnvironmentVariable $environmentVariable) {
             $environmentVariable->updateIsShared();
         });
@@ -92,43 +101,32 @@ class EnvironmentVariable extends Model
         );
     }
 
+    /**
+     * Get the parent resourceable model.
+     */
+    public function resourceable()
+    {
+        return $this->morphTo();
+    }
+
     public function resource()
     {
-        $resource = null;
-        if ($this->application_id) {
-            $resource = Application::find($this->application_id);
-        } elseif ($this->service_id) {
-            $resource = Service::find($this->service_id);
-        } elseif ($this->standalone_postgresql_id) {
-            $resource = StandalonePostgresql::find($this->standalone_postgresql_id);
-        } elseif ($this->standalone_redis_id) {
-            $resource = StandaloneRedis::find($this->standalone_redis_id);
-        } elseif ($this->standalone_mongodb_id) {
-            $resource = StandaloneMongodb::find($this->standalone_mongodb_id);
-        } elseif ($this->standalone_mysql_id) {
-            $resource = StandaloneMysql::find($this->standalone_mysql_id);
-        } elseif ($this->standalone_mariadb_id) {
-            $resource = StandaloneMariadb::find($this->standalone_mariadb_id);
-        } elseif ($this->standalone_keydb_id) {
-            $resource = StandaloneKeydb::find($this->standalone_keydb_id);
-        } elseif ($this->standalone_dragonfly_id) {
-            $resource = StandaloneDragonfly::find($this->standalone_dragonfly_id);
-        } elseif ($this->standalone_clickhouse_id) {
-            $resource = StandaloneClickhouse::find($this->standalone_clickhouse_id);
-        }
-
-        return $resource;
+        return $this->resourceable;
     }
 
     public function realValue(): Attribute
     {
-        $resource = $this->resource();
-
         return Attribute::make(
-            get: function () use ($resource) {
-                $env = $this->get_real_environment_variables($this->value, $resource);
+            get: function () {
+                if (! $this->relationLoaded('resourceable')) {
+                    $this->load('resourceable');
+                }
+                $resource = $this->resourceable;
+                if (! $resource) {
+                    return null;
+                }
 
-                return data_get($env, 'value', $env);
+                return $this->get_real_environment_variables($this->value, $resource);
             }
         );
     }
@@ -164,7 +162,6 @@ class EnvironmentVariable extends Model
         if ($sharedEnvsFound->isEmpty()) {
             return $environment_variable;
         }
-
         foreach ($sharedEnvsFound as $sharedEnv) {
             $type = str($sharedEnv)->match('/(.*?)\./');
             if (! collect(SHARED_VARIABLE_TYPES)->contains($type)) {
diff --git a/app/Models/Service.php b/app/Models/Service.php
index 5a2690490..c605f189b 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -1120,7 +1120,8 @@ class Service extends BaseModel
                     'key' => $key,
                     'value' => $value,
                     'is_build_time' => false,
-                    'service_id' => $this->id,
+                    'resourceable_id' => $this->id,
+                    'resourceable_type' => $this->getMorphClass(),
                     'is_preview' => false,
                 ]);
             }
@@ -1232,14 +1233,17 @@ class Service extends BaseModel
         return $this->hasMany(ScheduledTask::class)->orderBy('name', 'asc');
     }
 
-    public function environment_variables(): HasMany
+    public function environment_variables()
     {
-        return $this->hasMany(EnvironmentVariable::class)->orderByRaw("LOWER(key) LIKE LOWER('SERVICE%') DESC, LOWER(key) ASC");
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->orderBy('key', 'asc');
     }
 
-    public function environment_variables_preview(): HasMany
+    public function environment_variables_preview()
     {
-        return $this->hasMany(EnvironmentVariable::class)->where('is_preview', true)->orderByRaw("LOWER(key) LIKE LOWER('SERVICE%') DESC, LOWER(key) ASC");
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->where('is_preview', true)
+            ->orderByRaw("LOWER(key) LIKE LOWER('SERVICE%') DESC, LOWER(key) ASC");
     }
 
     public function workdir()
diff --git a/app/Models/StandaloneClickhouse.php b/app/Models/StandaloneClickhouse.php
index 6d66c6854..ec56d0fdd 100644
--- a/app/Models/StandaloneClickhouse.php
+++ b/app/Models/StandaloneClickhouse.php
@@ -5,7 +5,6 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class StandaloneClickhouse extends BaseModel
@@ -251,14 +250,15 @@ class StandaloneClickhouse extends BaseModel
         return $this->morphTo();
     }
 
-    public function environment_variables(): HasMany
+    public function environment_variables()
     {
-        return $this->hasMany(EnvironmentVariable::class);
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->orderBy('key', 'asc');
     }
 
-    public function runtime_environment_variables(): HasMany
+    public function runtime_environment_variables()
     {
-        return $this->hasMany(EnvironmentVariable::class);
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
     }
 
     public function persistentStorages()
diff --git a/app/Models/StandaloneDragonfly.php b/app/Models/StandaloneDragonfly.php
index f7d83f0a3..683c9acb4 100644
--- a/app/Models/StandaloneDragonfly.php
+++ b/app/Models/StandaloneDragonfly.php
@@ -5,7 +5,6 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class StandaloneDragonfly extends BaseModel
@@ -251,14 +250,9 @@ class StandaloneDragonfly extends BaseModel
         return $this->morphTo();
     }
 
-    public function environment_variables(): HasMany
+    public function runtime_environment_variables()
     {
-        return $this->hasMany(EnvironmentVariable::class);
-    }
-
-    public function runtime_environment_variables(): HasMany
-    {
-        return $this->hasMany(EnvironmentVariable::class);
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
     }
 
     public function persistentStorages()
@@ -319,4 +313,10 @@ class StandaloneDragonfly extends BaseModel
     {
         return false;
     }
+
+    public function environment_variables()
+    {
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->orderBy('key', 'asc');
+    }
 }
diff --git a/app/Models/StandaloneKeydb.php b/app/Models/StandaloneKeydb.php
index 083c743d9..e239020ac 100644
--- a/app/Models/StandaloneKeydb.php
+++ b/app/Models/StandaloneKeydb.php
@@ -5,7 +5,6 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class StandaloneKeydb extends BaseModel
@@ -251,14 +250,9 @@ class StandaloneKeydb extends BaseModel
         return $this->morphTo();
     }
 
-    public function environment_variables(): HasMany
+    public function runtime_environment_variables()
     {
-        return $this->hasMany(EnvironmentVariable::class);
-    }
-
-    public function runtime_environment_variables(): HasMany
-    {
-        return $this->hasMany(EnvironmentVariable::class);
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
     }
 
     public function persistentStorages()
@@ -319,4 +313,10 @@ class StandaloneKeydb extends BaseModel
     {
         return false;
     }
+
+    public function environment_variables()
+    {
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->orderBy('key', 'asc');
+    }
 }
diff --git a/app/Models/StandaloneMariadb.php b/app/Models/StandaloneMariadb.php
index 833dad6c4..c010cf441 100644
--- a/app/Models/StandaloneMariadb.php
+++ b/app/Models/StandaloneMariadb.php
@@ -5,7 +5,6 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class StandaloneMariadb extends BaseModel
@@ -251,14 +250,15 @@ class StandaloneMariadb extends BaseModel
         return $this->morphTo();
     }
 
-    public function environment_variables(): HasMany
+    public function environment_variables()
     {
-        return $this->hasMany(EnvironmentVariable::class);
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->orderBy('key', 'asc');
     }
 
-    public function runtime_environment_variables(): HasMany
+    public function runtime_environment_variables()
     {
-        return $this->hasMany(EnvironmentVariable::class);
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
     }
 
     public function persistentStorages()
diff --git a/app/Models/StandaloneMongodb.php b/app/Models/StandaloneMongodb.php
index dd8893180..e18317088 100644
--- a/app/Models/StandaloneMongodb.php
+++ b/app/Models/StandaloneMongodb.php
@@ -5,7 +5,6 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class StandaloneMongodb extends BaseModel
@@ -271,14 +270,9 @@ class StandaloneMongodb extends BaseModel
         return $this->morphTo();
     }
 
-    public function environment_variables(): HasMany
+    public function runtime_environment_variables()
     {
-        return $this->hasMany(EnvironmentVariable::class);
-    }
-
-    public function runtime_environment_variables(): HasMany
-    {
-        return $this->hasMany(EnvironmentVariable::class);
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
     }
 
     public function persistentStorages()
@@ -339,4 +333,10 @@ class StandaloneMongodb extends BaseModel
     {
         return true;
     }
+
+    public function environment_variables()
+    {
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->orderBy('key', 'asc');
+    }
 }
diff --git a/app/Models/StandaloneMysql.php b/app/Models/StandaloneMysql.php
index 710fea1bc..e6c976a8a 100644
--- a/app/Models/StandaloneMysql.php
+++ b/app/Models/StandaloneMysql.php
@@ -5,7 +5,6 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class StandaloneMysql extends BaseModel
@@ -252,14 +251,9 @@ class StandaloneMysql extends BaseModel
         return $this->morphTo();
     }
 
-    public function environment_variables(): HasMany
+    public function runtime_environment_variables()
     {
-        return $this->hasMany(EnvironmentVariable::class);
-    }
-
-    public function runtime_environment_variables(): HasMany
-    {
-        return $this->hasMany(EnvironmentVariable::class);
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
     }
 
     public function persistentStorages()
@@ -320,4 +314,10 @@ class StandaloneMysql extends BaseModel
     {
         return true;
     }
+
+    public function environment_variables()
+    {
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->orderBy('key', 'asc');
+    }
 }
diff --git a/app/Models/StandalonePostgresql.php b/app/Models/StandalonePostgresql.php
index 4a457a6cf..141768a7c 100644
--- a/app/Models/StandalonePostgresql.php
+++ b/app/Models/StandalonePostgresql.php
@@ -5,7 +5,6 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class StandalonePostgresql extends BaseModel
@@ -252,14 +251,9 @@ class StandalonePostgresql extends BaseModel
         return $this->morphTo();
     }
 
-    public function environment_variables(): HasMany
+    public function runtime_environment_variables()
     {
-        return $this->hasMany(EnvironmentVariable::class);
-    }
-
-    public function runtime_environment_variables(): HasMany
-    {
-        return $this->hasMany(EnvironmentVariable::class);
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
     }
 
     public function persistentStorages()
@@ -320,4 +314,10 @@ class StandalonePostgresql extends BaseModel
 
         return $parsedCollection->toArray();
     }
+
+    public function environment_variables()
+    {
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->orderBy('key', 'asc');
+    }
 }
diff --git a/app/Models/StandaloneRedis.php b/app/Models/StandaloneRedis.php
index 826bb951c..df1681fc9 100644
--- a/app/Models/StandaloneRedis.php
+++ b/app/Models/StandaloneRedis.php
@@ -5,7 +5,6 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class StandaloneRedis extends BaseModel
@@ -262,14 +261,9 @@ class StandaloneRedis extends BaseModel
         return $this->morphTo();
     }
 
-    public function environment_variables(): HasMany
+    public function runtime_environment_variables()
     {
-        return $this->hasMany(EnvironmentVariable::class);
-    }
-
-    public function runtime_environment_variables(): HasMany
-    {
-        return $this->hasMany(EnvironmentVariable::class);
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
     }
 
     public function persistentStorages()
@@ -359,4 +353,10 @@ class StandaloneRedis extends BaseModel
             }
         );
     }
+
+    public function environment_variables()
+    {
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+            ->orderBy('key', 'asc');
+    }
 }
diff --git a/app/View/Components/Forms/Button.php b/app/View/Components/Forms/Button.php
index da8b46dec..bf88d3f88 100644
--- a/app/View/Components/Forms/Button.php
+++ b/app/View/Components/Forms/Button.php
@@ -15,7 +15,8 @@ class Button extends Component
         public bool $disabled = false,
         public bool $noStyle = false,
         public ?string $modalId = null,
-        public string $defaultClass = 'button'
+        public string $defaultClass = 'button',
+        public bool $showLoadingIndicator = true,
     ) {
         if ($this->noStyle) {
             $this->defaultClass = '';
diff --git a/bootstrap/helpers/services.php b/bootstrap/helpers/services.php
index fd2e1231f..cd99713a2 100644
--- a/bootstrap/helpers/services.php
+++ b/bootstrap/helpers/services.php
@@ -2,6 +2,7 @@
 
 use App\Models\Application;
 use App\Models\EnvironmentVariable;
+use App\Models\Service;
 use App\Models\ServiceApplication;
 use App\Models\ServiceDatabase;
 use Illuminate\Support\Stringable;
@@ -119,7 +120,10 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
             if ($resourceFqdns->count() === 1) {
                 $resourceFqdns = $resourceFqdns->first();
                 $variableName = 'SERVICE_FQDN_'.str($resource->name)->upper()->replace('-', '');
-                $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+                $generatedEnv = EnvironmentVariable::where('resourceable_type', Service::class)
+                    ->where('resourceable_id', $resource->service_id)
+                    ->where('key', $variableName)
+                    ->first();
                 $fqdn = Url::fromString($resourceFqdns);
                 $port = $fqdn->getPort();
                 $path = $fqdn->getPath();
@@ -134,7 +138,10 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
                 }
                 if ($port) {
                     $variableName = $variableName."_$port";
-                    $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+                    $generatedEnv = EnvironmentVariable::where('resourceable_type', Service::class)
+                        ->where('resourceable_id', $resource->service_id)
+                        ->where('key', $variableName)
+                        ->first();
                     if ($generatedEnv) {
                         if ($path === '/') {
                             $generatedEnv->value = $fqdn;
@@ -145,7 +152,10 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
                     }
                 }
                 $variableName = 'SERVICE_URL_'.str($resource->name)->upper()->replace('-', '');
-                $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+                $generatedEnv = EnvironmentVariable::where('resourceable_type', Service::class)
+                    ->where('resourceable_id', $resource->service_id)
+                    ->where('key', $variableName)
+                    ->first();
                 $url = Url::fromString($fqdn);
                 $port = $url->getPort();
                 $path = $url->getPath();
@@ -161,7 +171,10 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
                 }
                 if ($port) {
                     $variableName = $variableName."_$port";
-                    $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+                    $generatedEnv = EnvironmentVariable::where('resourceable_type', Service::class)
+                        ->where('resourceable_id', $resource->service_id)
+                        ->where('key', $variableName)
+                        ->first();
                     if ($generatedEnv) {
                         if ($path === '/') {
                             $generatedEnv->value = $url;
@@ -179,10 +192,16 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
                     $path = $host->getPath();
                     $host = $host->getScheme().'://'.$host->getHost();
                     if ($port) {
-                        $port_envs = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'like', "SERVICE_FQDN_%_$port")->get();
+                        $port_envs = EnvironmentVariable::where('resourceable_type', Service::class)
+                            ->where('resourceable_id', $resource->service_id)
+                            ->where('key', 'like', "SERVICE_FQDN_%_$port")
+                            ->get();
                         foreach ($port_envs as $port_env) {
                             $service_fqdn = str($port_env->key)->beforeLast('_')->after('SERVICE_FQDN_');
-                            $env = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'SERVICE_FQDN_'.$service_fqdn)->first();
+                            $env = EnvironmentVariable::where('resourceable_type', Service::class)
+                                ->where('resourceable_id', $resource->service_id)
+                                ->where('key', 'SERVICE_FQDN_'.$service_fqdn)
+                                ->first();
                             if ($env) {
                                 if ($path === '/') {
                                     $env->value = $host;
@@ -198,10 +217,16 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
                             }
                             $port_env->save();
                         }
-                        $port_envs_url = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'like', "SERVICE_URL_%_$port")->get();
+                        $port_envs_url = EnvironmentVariable::where('resourceable_type', Service::class)
+                            ->where('resourceable_id', $resource->service_id)
+                            ->where('key', 'like', "SERVICE_URL_%_$port")
+                            ->get();
                         foreach ($port_envs_url as $port_env_url) {
                             $service_url = str($port_env_url->key)->beforeLast('_')->after('SERVICE_URL_');
-                            $env = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'SERVICE_URL_'.$service_url)->first();
+                            $env = EnvironmentVariable::where('resourceable_type', Service::class)
+                                ->where('resourceable_id', $resource->service_id)
+                                ->where('key', 'SERVICE_URL_'.$service_url)
+                                ->first();
                             if ($env) {
                                 if ($path === '/') {
                                     $env->value = $url;
@@ -219,7 +244,10 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
                         }
                     } else {
                         $variableName = 'SERVICE_FQDN_'.str($resource->name)->upper()->replace('-', '');
-                        $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+                        $generatedEnv = EnvironmentVariable::where('resourceable_type', Service::class)
+                            ->where('resourceable_id', $resource->service_id)
+                            ->where('key', $variableName)
+                            ->first();
                         $fqdn = Url::fromString($fqdn);
                         $fqdn = $fqdn->getScheme().'://'.$fqdn->getHost().$fqdn->getPath();
                         if ($generatedEnv) {
@@ -227,7 +255,10 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
                             $generatedEnv->save();
                         }
                         $variableName = 'SERVICE_URL_'.str($resource->name)->upper()->replace('-', '');
-                        $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+                        $generatedEnv = EnvironmentVariable::where('resourceable_type', Service::class)
+                            ->where('resourceable_id', $resource->service_id)
+                            ->where('key', $variableName)
+                            ->first();
                         $url = Url::fromString($fqdn);
                         $url = $url->getHost().$url->getPath();
                         if ($generatedEnv) {
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 7aa411cd1..b9fde2070 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -1819,7 +1819,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                 'key' => $key,
                                 'value' => $fqdn,
                                 'is_build_time' => false,
-                                'service_id' => $resource->id,
+                                'resourceable_type' => get_class($resource),
+                                'resourceable_id' => $resource->id,
                                 'is_preview' => false,
                             ]);
                         }
@@ -1831,7 +1832,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             }
                             $env = EnvironmentVariable::where([
                                 'key' => $key,
-                                'service_id' => $resource->id,
+                                'resourceable_type' => get_class($resource),
+                                'resourceable_id' => $resource->id,
                             ])->first();
                             if ($env) {
                                 $env_url = Url::fromString($savedService->fqdn);
@@ -1854,14 +1856,16 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                     if ($value?->startsWith('$')) {
                         $foundEnv = EnvironmentVariable::where([
                             'key' => $key,
-                            'service_id' => $resource->id,
+                            'resourceable_type' => get_class($resource),
+                            'resourceable_id' => $resource->id,
                         ])->first();
                         $value = replaceVariables($value);
                         $key = $value;
                         if ($value->startsWith('SERVICE_')) {
                             $foundEnv = EnvironmentVariable::where([
                                 'key' => $key,
-                                'service_id' => $resource->id,
+                                'resourceable_type' => get_class($resource),
+                                'resourceable_id' => $resource->id,
                             ])->first();
                             ['command' => $command, 'forService' => $forService, 'generatedValue' => $generatedValue, 'port' => $port] = parseEnvVariable($value);
                             if (! is_null($command)) {
@@ -1895,7 +1899,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                             'key' => $key,
                                             'value' => $fqdn,
                                             'is_build_time' => false,
-                                            'service_id' => $resource->id,
+                                            'resourceable_type' => get_class($resource),
+                                            'resourceable_id' => $resource->id,
                                             'is_preview' => false,
                                         ]);
                                     }
@@ -1912,7 +1917,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                             }
                                             $env = EnvironmentVariable::where([
                                                 'key' => $key,
-                                                'service_id' => $resource->id,
+                                                'resourceable_type' => get_class($resource),
+                                                'resourceable_id' => $resource->id,
                                             ])->first();
                                             if ($env) {
                                                 $env_url = Url::fromString($env->value);
@@ -1932,7 +1938,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                             'key' => $key,
                                             'value' => $generatedValue,
                                             'is_build_time' => false,
-                                            'service_id' => $resource->id,
+                                            'resourceable_type' => get_class($resource),
+                                            'resourceable_id' => $resource->id,
                                             'is_preview' => false,
                                         ]);
                                     }
@@ -1957,18 +1964,21 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             }
                             $foundEnv = EnvironmentVariable::where([
                                 'key' => $key,
-                                'service_id' => $resource->id,
+                                'resourceable_type' => get_class($resource),
+                                'resourceable_id' => $resource->id,
                             ])->first();
                             if ($foundEnv) {
                                 $defaultValue = data_get($foundEnv, 'value');
                             }
                             EnvironmentVariable::updateOrCreate([
                                 'key' => $key,
-                                'service_id' => $resource->id,
+                                'resourceable_type' => get_class($resource),
+                                'resourceable_id' => $resource->id,
                             ], [
                                 'value' => $defaultValue,
                                 'is_build_time' => false,
-                                'service_id' => $resource->id,
+                                'resourceable_type' => get_class($resource),
+                                'resourceable_id' => $resource->id,
                                 'is_preview' => false,
                             ]);
                         }
@@ -2831,6 +2841,10 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
             data_set($service, 'container_name', $containerName);
             data_forget($service, 'volumes.*.content');
             data_forget($service, 'volumes.*.isDirectory');
+            data_forget($service, 'volumes.*.is_directory');
+            data_forget($service, 'exclude_from_hc');
+            data_set($service, 'environment', $serviceVariables->toArray());
+            updateCompose($savedService);
 
             return $service;
         });
@@ -2869,13 +2883,11 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
     }
 
     if ($isApplication) {
-        $nameOfId = 'application_id';
         $pullRequestId = $pull_request_id;
         $isPullRequest = $pullRequestId == 0 ? false : true;
         $server = data_get($resource, 'destination.server');
         $fileStorages = $resource->fileStorages();
     } elseif ($isService) {
-        $nameOfId = 'service_id';
         $server = data_get($resource, 'server');
         $allServices = get_service_templates();
     } else {
@@ -3042,9 +3054,10 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
                     }
 
                     if (substr_count(str($key)->value(), '_') === 2) {
-                        $resource->environment_variables()->where('key', $key->value())->where($nameOfId, $resource->id)->firstOrCreate([
+                        $resource->environment_variables()->firstOrCreate([
                             'key' => $key->value(),
-                            $nameOfId => $resource->id,
+                            'resourceable_type' => get_class($resource),
+                            'resourceable_id' => $resource->id,
                         ], [
                             'value' => $fqdn,
                             'is_build_time' => false,
@@ -3053,9 +3066,10 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
                     }
                     if (substr_count(str($key)->value(), '_') === 3) {
                         $newKey = str($key)->beforeLast('_');
-                        $resource->environment_variables()->where('key', $newKey->value())->where($nameOfId, $resource->id)->firstOrCreate([
+                        $resource->environment_variables()->firstOrCreate([
                             'key' => $newKey->value(),
-                            $nameOfId => $resource->id,
+                            'resourceable_type' => get_class($resource),
+                            'resourceable_id' => $resource->id,
                         ], [
                             'value' => $fqdn,
                             'is_build_time' => false,
@@ -3071,7 +3085,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
                     $key = str($key);
                     $value = replaceVariables($value);
                     $command = parseCommandFromMagicEnvVariable($key);
-                    $found = $resource->environment_variables()->where('key', $key->value())->where($nameOfId, $resource->id)->first();
+                    $found = $resource->environment_variables()->where('key', $key->value())->where('resourceable_type', get_class($resource))->where('resourceable_id', $resource->id)->first();
                     if ($found) {
                         continue;
                     }
@@ -3085,9 +3099,10 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
                         } elseif ($isService) {
                             $fqdn = generateFqdn($server, "$fqdnFor-$uuid");
                         }
-                        $resource->environment_variables()->where('key', $key->value())->where($nameOfId, $resource->id)->firstOrCreate([
+                        $resource->environment_variables()->firstOrCreate([
                             'key' => $key->value(),
-                            $nameOfId => $resource->id,
+                            'resourceable_type' => get_class($resource),
+                            'resourceable_id' => $resource->id,
                         ], [
                             'value' => $fqdn,
                             'is_build_time' => false,
@@ -3104,9 +3119,10 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
                             $fqdn = generateFqdn($server, "$fqdnFor-$uuid");
                         }
                         $fqdn = str($fqdn)->replace('http://', '')->replace('https://', '');
-                        $resource->environment_variables()->where('key', $key->value())->where($nameOfId, $resource->id)->firstOrCreate([
+                        $resource->environment_variables()->firstOrCreate([
                             'key' => $key->value(),
-                            $nameOfId => $resource->id,
+                            'resourceable_type' => get_class($resource),
+                            'resourceable_id' => $resource->id,
                         ], [
                             'value' => $fqdn,
                             'is_build_time' => false,
@@ -3114,9 +3130,10 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
                         ]);
                     } else {
                         $value = generateEnvValue($command, $resource);
-                        $resource->environment_variables()->where('key', $key->value())->where($nameOfId, $resource->id)->firstOrCreate([
+                        $resource->environment_variables()->firstOrCreate([
                             'key' => $key->value(),
-                            $nameOfId => $resource->id,
+                            'resourceable_type' => get_class($resource),
+                            'resourceable_id' => $resource->id,
                         ], [
                             'value' => $value,
                             'is_build_time' => false,
@@ -3464,9 +3481,10 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
             $originalValue = $value;
             $parsedValue = replaceVariables($value);
             if ($value->startsWith('$SERVICE_')) {
-                $resource->environment_variables()->where('key', $key)->where($nameOfId, $resource->id)->firstOrCreate([
+                $resource->environment_variables()->firstOrCreate([
                     'key' => $key,
-                    $nameOfId => $resource->id,
+                    'resourceable_type' => get_class($resource),
+                    'resourceable_id' => $resource->id,
                 ], [
                     'value' => $value,
                     'is_build_time' => false,
@@ -3480,9 +3498,10 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
             }
             if ($key->value() === $parsedValue->value()) {
                 $value = null;
-                $resource->environment_variables()->where('key', $key)->where($nameOfId, $resource->id)->firstOrCreate([
+                $resource->environment_variables()->firstOrCreate([
                     'key' => $key,
-                    $nameOfId => $resource->id,
+                    'resourceable_type' => get_class($resource),
+                    'resourceable_id' => $resource->id,
                 ], [
                     'value' => $value,
                     'is_build_time' => false,
@@ -3516,22 +3535,24 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
                     if ($originalValue->value() === $value->value()) {
                         // This means the variable does not have a default value, so it needs to be created in Coolify
                         $parsedKeyValue = replaceVariables($value);
-                        $resource->environment_variables()->where('key', $parsedKeyValue)->where($nameOfId, $resource->id)->firstOrCreate([
+                        $resource->environment_variables()->firstOrCreate([
                             'key' => $parsedKeyValue,
-                            $nameOfId => $resource->id,
+                            'resourceable_type' => get_class($resource),
+                            'resourceable_id' => $resource->id,
                         ], [
                             'is_build_time' => false,
                             'is_preview' => false,
                             'is_required' => $isRequired,
                         ]);
                         // Add the variable to the environment so it will be shown in the deployable compose file
-                        $environment[$parsedKeyValue->value()] = $resource->environment_variables()->where('key', $parsedKeyValue)->where($nameOfId, $resource->id)->first()->value;
+                        $environment[$parsedKeyValue->value()] = $resource->environment_variables()->where('key', $parsedKeyValue)->where('resourceable_type', get_class($resource))->where('resourceable_id', $resource->id)->first()->value;
 
                         continue;
                     }
-                    $resource->environment_variables()->where('key', $key)->where($nameOfId, $resource->id)->firstOrCreate([
+                    $resource->environment_variables()->firstOrCreate([
                         'key' => $key,
-                        $nameOfId => $resource->id,
+                        'resourceable_type' => get_class($resource),
+                        'resourceable_id' => $resource->id,
                     ], [
                         'value' => $value,
                         'is_build_time' => false,
diff --git a/database/migrations/2024_12_16_134437_add_resourceable_columns_to_environment_variables_table.php b/database/migrations/2024_12_16_134437_add_resourceable_columns_to_environment_variables_table.php
new file mode 100644
index 000000000..c4b718638
--- /dev/null
+++ b/database/migrations/2024_12_16_134437_add_resourceable_columns_to_environment_variables_table.php
@@ -0,0 +1,165 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('environment_variables', function (Blueprint $table) {
+            $table->string('resourceable_type')->nullable();
+            $table->unsignedBigInteger('resourceable_id')->nullable();
+            $table->index(['resourceable_type', 'resourceable_id']);
+        });
+
+        // Populate the new columns
+        DB::table('environment_variables')->whereNotNull('application_id')
+            ->update([
+                'resourceable_type' => 'App\\Models\\Application',
+                'resourceable_id' => DB::raw('application_id'),
+            ]);
+
+        DB::table('environment_variables')->whereNotNull('service_id')
+            ->update([
+                'resourceable_type' => 'App\\Models\\Service',
+                'resourceable_id' => DB::raw('service_id'),
+            ]);
+
+        DB::table('environment_variables')->whereNotNull('standalone_postgresql_id')
+            ->update([
+                'resourceable_type' => 'App\\Models\\StandalonePostgresql',
+                'resourceable_id' => DB::raw('standalone_postgresql_id'),
+            ]);
+
+        DB::table('environment_variables')->whereNotNull('standalone_redis_id')
+            ->update([
+                'resourceable_type' => 'App\\Models\\StandaloneRedis',
+                'resourceable_id' => DB::raw('standalone_redis_id'),
+            ]);
+
+        DB::table('environment_variables')->whereNotNull('standalone_mongodb_id')
+            ->update([
+                'resourceable_type' => 'App\\Models\\StandaloneMongodb',
+                'resourceable_id' => DB::raw('standalone_mongodb_id'),
+            ]);
+
+        DB::table('environment_variables')->whereNotNull('standalone_mysql_id')
+            ->update([
+                'resourceable_type' => 'App\\Models\\StandaloneMysql',
+                'resourceable_id' => DB::raw('standalone_mysql_id'),
+            ]);
+
+        DB::table('environment_variables')->whereNotNull('standalone_mariadb_id')
+            ->update([
+                'resourceable_type' => 'App\\Models\\StandaloneMariadb',
+                'resourceable_id' => DB::raw('standalone_mariadb_id'),
+            ]);
+
+        DB::table('environment_variables')->whereNotNull('standalone_keydb_id')
+            ->update([
+                'resourceable_type' => 'App\\Models\\StandaloneKeydb',
+                'resourceable_id' => DB::raw('standalone_keydb_id'),
+            ]);
+
+        DB::table('environment_variables')->whereNotNull('standalone_dragonfly_id')
+            ->update([
+                'resourceable_type' => 'App\\Models\\StandaloneDragonfly',
+                'resourceable_id' => DB::raw('standalone_dragonfly_id'),
+            ]);
+
+        DB::table('environment_variables')->whereNotNull('standalone_clickhouse_id')
+            ->update([
+                'resourceable_type' => 'App\\Models\\StandaloneClickhouse',
+                'resourceable_id' => DB::raw('standalone_clickhouse_id'),
+            ]);
+
+        // After successful migration, we can drop the old foreign key columns
+        Schema::table('environment_variables', function (Blueprint $table) {
+            $table->dropColumn([
+                'application_id',
+                'service_id',
+                'standalone_postgresql_id',
+                'standalone_redis_id',
+                'standalone_mongodb_id',
+                'standalone_mysql_id',
+                'standalone_mariadb_id',
+                'standalone_keydb_id',
+                'standalone_dragonfly_id',
+                'standalone_clickhouse_id',
+            ]);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('environment_variables', function (Blueprint $table) {
+            // Restore the old columns
+            $table->unsignedBigInteger('application_id')->nullable();
+            $table->unsignedBigInteger('service_id')->nullable();
+            $table->unsignedBigInteger('standalone_postgresql_id')->nullable();
+            $table->unsignedBigInteger('standalone_redis_id')->nullable();
+            $table->unsignedBigInteger('standalone_mongodb_id')->nullable();
+            $table->unsignedBigInteger('standalone_mysql_id')->nullable();
+            $table->unsignedBigInteger('standalone_mariadb_id')->nullable();
+            $table->unsignedBigInteger('standalone_keydb_id')->nullable();
+            $table->unsignedBigInteger('standalone_dragonfly_id')->nullable();
+            $table->unsignedBigInteger('standalone_clickhouse_id')->nullable();
+        });
+
+        Schema::table('environment_variables', function (Blueprint $table) {
+            // Restore data from polymorphic relationship
+            DB::table('environment_variables')
+                ->where('resourceable_type', 'App\\Models\\Application')
+                ->update(['application_id' => DB::raw('resourceable_id')]);
+
+            DB::table('environment_variables')
+                ->where('resourceable_type', 'App\\Models\\Service')
+                ->update(['service_id' => DB::raw('resourceable_id')]);
+
+            DB::table('environment_variables')
+                ->where('resourceable_type', 'App\\Models\\StandalonePostgresql')
+                ->update(['standalone_postgresql_id' => DB::raw('resourceable_id')]);
+
+            DB::table('environment_variables')
+                ->where('resourceable_type', 'App\\Models\\StandaloneRedis')
+                ->update(['standalone_redis_id' => DB::raw('resourceable_id')]);
+
+            DB::table('environment_variables')
+                ->where('resourceable_type', 'App\\Models\\StandaloneMongodb')
+                ->update(['standalone_mongodb_id' => DB::raw('resourceable_id')]);
+
+            DB::table('environment_variables')
+                ->where('resourceable_type', 'App\\Models\\StandaloneMysql')
+                ->update(['standalone_mysql_id' => DB::raw('resourceable_id')]);
+
+            DB::table('environment_variables')
+                ->where('resourceable_type', 'App\\Models\\StandaloneMariadb')
+                ->update(['standalone_mariadb_id' => DB::raw('resourceable_id')]);
+
+            DB::table('environment_variables')
+                ->where('resourceable_type', 'App\\Models\\StandaloneKeydb')
+                ->update(['standalone_keydb_id' => DB::raw('resourceable_id')]);
+
+            DB::table('environment_variables')
+                ->where('resourceable_type', 'App\\Models\\StandaloneDragonfly')
+                ->update(['standalone_dragonfly_id' => DB::raw('resourceable_id')]);
+
+            DB::table('environment_variables')
+                ->where('resourceable_type', 'App\\Models\\StandaloneClickhouse')
+                ->update(['standalone_clickhouse_id' => DB::raw('resourceable_id')]);
+
+            // Drop the polymorphic columns
+            $table->dropIndex(['resourceable_type', 'resourceable_id']);
+            $table->dropColumn(['resourceable_type', 'resourceable_id']);
+        });
+    }
+};
diff --git a/resources/views/components/forms/button.blade.php b/resources/views/components/forms/button.blade.php
index a109e84ac..96cdb4420 100644
--- a/resources/views/components/forms/button.blade.php
+++ b/resources/views/components/forms/button.blade.php
@@ -8,11 +8,13 @@
         @endisset>
 
     {{ $slot }}
-    @if ($attributes->whereStartsWith('wire:click')->first())
-        <x-loading-on-button wire:target="{{ $attributes->whereStartsWith('wire:click')->first() }}"
-            wire:loading.delay />
-    @elseif($attributes->whereStartsWith('wire:target')->first())
-        <x-loading-on-button wire:target="{{ $attributes->whereStartsWith('wire:target')->first() }}"
-            wire:loading.delay />
+    @if ($showLoadingIndicator)
+        @if ($attributes->whereStartsWith('wire:click')->first())
+            <x-loading-on-button wire:target="{{ $attributes->whereStartsWith('wire:click')->first() }}"
+                wire:loading.delay />
+        @elseif($attributes->whereStartsWith('wire:target')->first())
+            <x-loading-on-button wire:target="{{ $attributes->whereStartsWith('wire:target')->first() }}"
+                wire:loading.delay />
+        @endif
     @endif
 </button>
diff --git a/resources/views/components/loading.blade.php b/resources/views/components/loading.blade.php
index 7ee3b1d1a..80a47375e 100644
--- a/resources/views/components/loading.blade.php
+++ b/resources/views/components/loading.blade.php
@@ -3,8 +3,8 @@
     @if (isset($text))
         <div>{{ $text }}</div>
     @endif
-    <svg class="w-4 h-4 mx-1 ml-3 text-coollabs dark:text-warning animate-spin" xmlns="http://www.w3.org/2000/svg" fill="none"
-        viewBox="0 0 24 24">
+    <svg class="w-4 h-4 mx-1 ml-3 text-coollabs dark:text-warning animate-spin" xmlns="http://www.w3.org/2000/svg"
+        fill="none" viewBox="0 0 24 24">
         <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
         <path class="opacity-75" fill="currentColor"
             d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z">
diff --git a/resources/views/components/server/navbar.blade.php b/resources/views/components/server/navbar.blade.php
index 518831c83..fe0b02ce8 100644
--- a/resources/views/components/server/navbar.blade.php
+++ b/resources/views/components/server/navbar.blade.php
@@ -49,5 +49,6 @@
         <div class="order-first sm:order-last">
             <livewire:server.proxy.deploy :server="$server" />
         </div>
+
     </div>
 </div>
diff --git a/resources/views/components/status/running.blade.php b/resources/views/components/status/running.blade.php
index 0e0f08fa4..4e5f0c275 100644
--- a/resources/views/components/status/running.blade.php
+++ b/resources/views/components/status/running.blade.php
@@ -5,30 +5,42 @@
     'noLoading' => false,
 ])
 <div class="flex items-center">
-    @if (!$noLoading)
-        <x-loading wire:loading.delay.longer />
-    @endif
-    <span wire:loading.remove.delay.longer class="flex items-center">
-    <div class="badge badge-success "></div>
-    <div class="pl-2 pr-1 text-xs font-bold tracking-wider text-success" @if($title) title="{{$title}}" @endif>
-    @if ($lastDeploymentLink)
-        <a href="{{ $lastDeploymentLink }}" target="_blank" class="underline cursor-pointer">
-            {{ str($status)->before(':')->headline() }}
-        </a>
-    @else
-        {{ str($status)->before(':')->headline() }}
-    @endif
-    </div>
-    @if (!str($status)->startsWith('Proxy') && !str($status)->contains('('))
-        @if (str($status)->contains('unhealthy'))
-            <x-helper helper="Unhealthy state. <span class='dark:text-warning text-coollabs'>This doesn't mean that the resource is malfunctioning.</span><br><br>- If the resource is accessible, it indicates that no health check is configured - it is not mandatory.<br>- If the resource is not accessible (returning 404 or 503), it may indicate that a health check is needed and has not passed. <span class='dark:text-warning text-coollabs'>Your action is required.</span><br><br>More details in the <a href='https://coolify.io/docs/knowledge-base/traefik/healthcheck/' class='underline dark:text-warning text-coollabs' target='_blank'>documentation</a>."  >
+    <div class="flex items-center">
+        <span wire:loading.delay.longer>
+            <div class="badge badge-warning"></div>
+        </span>
+        <span wire:loading.remove.delay.longer>
+            <div class="badge badge-success"></div>
+        </span>
+        <div class="pl-2 pr-1 text-xs font-bold tracking-wider text-success"
+            @if ($title) title="{{ $title }}" @endif>
+            @if ($lastDeploymentLink)
+                <a href="{{ $lastDeploymentLink }}" target="_blank" class="underline cursor-pointer">
+                    {{ str($status)->before(':')->headline() }}
+                </a>
+            @else
+                {{ str($status)->before(':')->headline() }}
+            @endif
+        </div>
+        @php
+            $showUnhealthyHelper =
+                !str($status)->startsWith('Proxy') &&
+                !str($status)->contains('(') &&
+                str($status)->contains('unhealthy');
+        @endphp
+        @if ($showUnhealthyHelper)
+            <x-helper
+                helper="Unhealthy state. <span class='dark:text-warning text-coollabs'>This doesn't mean that the resource is malfunctioning.</span><br><br>- If the resource is accessible, it indicates that no health check is configured - it is not mandatory.<br>- If the resource is not accessible (returning 404 or 503), it may indicate that a health check is needed and has not passed. <span class='dark:text-warning text-coollabs'>Your action is required.</span><br><br>More details in the <a href='https://coolify.io/docs/knowledge-base/traefik/healthcheck/' class='underline dark:text-warning text-coollabs' target='_blank'>documentation</a>.">
                 <x-slot:icon>
-                    <svg class="hidden w-4 h-4 dark:text-warning lg:block" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
-                        <path fill="currentColor" d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16"></path>
+                    <svg class="hidden w-4 h-4 dark:text-warning lg:block" viewBox="0 0 256 256"
+                        xmlns="http://www.w3.org/2000/svg">
+                        <path fill="currentColor"
+                            d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16">
+                        </path>
                     </svg>
                 </x-slot:icon>
             </x-helper>
         @endif
-    @endif
-    </span>
+    </div>
+
 </div>
diff --git a/resources/views/livewire/project/database/heading.blade.php b/resources/views/livewire/project/database/heading.blade.php
index e334b2ce9..237d679c6 100644
--- a/resources/views/livewire/project/database/heading.blade.php
+++ b/resources/views/livewire/project/database/heading.blade.php
@@ -3,7 +3,7 @@
     <x-slide-over @startdatabase.window="slideOverOpen = true" closeWithX fullScreen>
         <x-slot:title>Database Startup</x-slot:title>
         <x-slot:content>
-            <livewire:activity-monitor header="Logs" showWaiting />
+            <livewire:activity-monitor header="Logs" showWaiting fullHeight />
         </x-slot:content>
     </x-slide-over>
     <div class="navbar-main">
diff --git a/resources/views/livewire/project/shared/environment-variable/all.blade.php b/resources/views/livewire/project/shared/environment-variable/all.blade.php
index 38ea192b5..3be31ba55 100644
--- a/resources/views/livewire/project/shared/environment-variable/all.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/all.blade.php
@@ -13,7 +13,7 @@
         <div>Environment variables (secrets) for this resource. </div>
         @if ($this->resourceClass === 'App\Models\Application' && data_get($this->resource, 'build_pack') !== 'dockercompose')
             <div class="w-64 pt-2">
-                <x-forms.checkbox id="resource.settings.is_env_sorting_enabled" label="Sort alphabetically"
+                <x-forms.checkbox id="is_env_sorting_enabled" label="Sort alphabetically"
                     helper="Turn this off if one environment is dependent on an other. It will be sorted by creation order (like you pasted them or in the order you created them)."
                     instantSave></x-forms.checkbox>
             </div>
@@ -55,10 +55,10 @@
                 <h3>Preview Deployments Environment Variables</h3>
                 <div>Environment (secrets) variables for Preview Deployments.</div>
             </div>
-            @foreach ($resource->environment_variables_preview as $env)
+            {{-- @foreach ($resource->environment_variables_preview as $env)
                 <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                     :env="$env" :type="$resource->type()" />
-            @endforeach
+            @endforeach --}}
         @endif
     @else
         <form wire:submit.prevent='submit' class="flex flex-col gap-2">
diff --git a/resources/views/livewire/project/shared/environment-variable/show.blade.php b/resources/views/livewire/project/shared/environment-variable/show.blade.php
index 96d1331ed..a005728ed 100644
--- a/resources/views/livewire/project/shared/environment-variable/show.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/show.blade.php
@@ -1,17 +1,14 @@
 <div>
-    <form wire:submit='submit'
-        @class([
-            'flex flex-col items-center gap-4 p-4 bg-white border lg:items-start dark:bg-base',
-            'border-error' => $env->is_really_required,
-            'dark:border-coolgray-300' => !$env->is_really_required,
-        ])
-        >
+    <form wire:submit='submit' @class([
+        'flex flex-col items-center gap-4 p-4 bg-white border lg:items-start dark:bg-base',
+        'border-error' => $is_really_required,
+        'dark:border-coolgray-300' => !$is_really_required,
+    ])>
         @if ($isLocked)
             <div class="flex flex-1 w-full gap-2">
-                <x-forms.input disabled id="env.key" />
+                <x-forms.input disabled id="key" />
                 <svg class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                    <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                        stroke-width="2">
+                    <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
                         <path d="M5 13a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2v6a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2v-6z" />
                         <path d="M11 16a1 1 0 1 0 2 0a1 1 0 0 0-2 0m-3-5V7a4 4 0 1 1 8 0v4" />
                     </g>
@@ -25,49 +22,49 @@
         @else
             @if ($isDisabled)
                 <div class="flex flex-col w-full gap-2 lg:flex-row">
-                    <x-forms.input disabled id="env.key" />
-                    <x-forms.input disabled type="password" id="env.value" />
-                    @if ($env->is_shared)
-                        <x-forms.input disabled type="password" id="env.real_value" />
+                    <x-forms.input disabled id="key" />
+                    <x-forms.input disabled type="password" id="value" />
+                    @if ($is_shared)
+                        <x-forms.input disabled type="password" id="real_value" />
                     @endif
                 </div>
             @else
                 <div class="flex flex-col w-full gap-2 lg:flex-row">
-                    @if ($env->is_multiline)
-                        <x-forms.input isMultiline="{{ $env->is_multiline }}" id="env.key" />
-                        <x-forms.textarea type="password" id="env.value" />
+                    @if ($is_multiline)
+                        <x-forms.input isMultiline="{{ $is_multiline }}" id="key" />
+                        <x-forms.textarea type="password" id="value" />
                     @else
-                        <x-forms.input id="env.key" />
-                        <x-forms.input type="password" id="env.value" />
+                        <x-forms.input id="key" />
+                        <x-forms.input type="password" id="value" />
                     @endif
-                    @if ($env->is_shared)
-                        <x-forms.input disabled type="password" id="env.real_value" />
+                    @if ($is_shared)
+                        <x-forms.input disabled type="password" id="real_value" />
                     @endif
                 </div>
             @endif
             <div class="flex flex-col w-full gap-2 lg:flex-row">
                 @if ($type === 'service')
-                    <x-forms.checkbox instantSave id="env.is_build_time"
+                    <x-forms.checkbox instantSave id="is_build_time"
                         helper="If you are using Docker, remember to modify the file to be ready to receive the build time args. Ex.: for docker file, add `ARG name_of_the_variable`, or dockercompose add `- 'name_of_the_variable=${name_of_the_variable}'`"
                         label="Build Variable?" />
                 @else
-                    @if ($env->is_shared)
-                        <x-forms.checkbox instantSave id="env.is_build_time"
+                    @if ($is_shared)
+                        <x-forms.checkbox instantSave id="is_build_time"
                             helper="If you are using Docker, remember to modify the file to be ready to receive the build time args. Ex.: for docker file, add `ARG name_of_the_variable`, or dockercompose add `- 'name_of_the_variable=${name_of_the_variable}'`"
                             label="Build Variable?" />
-                        <x-forms.checkbox instantSave id="env.is_literal"
+                        <x-forms.checkbox instantSave id="is_literal"
                             helper="This means that when you use $VARIABLES in a value, it should be interpreted as the actual characters '$VARIABLES' and not as the value of a variable named VARIABLE.<br><br>Useful if you have $ sign in your value and there are some characters after it, but you would not like to interpolate it from another value. In this case, you should set this to true."
                             label="Is Literal?" />
                     @else
                         @if ($isSharedVariable)
-                            <x-forms.checkbox instantSave id="env.is_multiline" label="Is Multiline?" />
+                            <x-forms.checkbox instantSave id="is_multiline" label="Is Multiline?" />
                         @else
-                            <x-forms.checkbox instantSave id="env.is_build_time"
+                            <x-forms.checkbox instantSave id="is_build_time"
                                 helper="If you are using Docker, remember to modify the file to be ready to receive the build time args. Ex.: for dockerfile, add `ARG name_of_the_variable`, or dockercompose add `- 'name_of_the_variable=${name_of_the_variable}'`"
                                 label="Build Variable?" />
-                            <x-forms.checkbox instantSave id="env.is_multiline" label="Is Multiline?" />
-                            @if (!data_get($env, 'is_multiline'))
-                                <x-forms.checkbox instantSave id="env.is_literal"
+                            <x-forms.checkbox instantSave id="is_multiline" label="Is Multiline?" />
+                            @if ($is_multiline === false)
+                                <x-forms.checkbox instantSave id="is_literal"
                                     helper="This means that when you use $VARIABLES in a value, it should be interpreted as the actual characters '$VARIABLES' and not as the value of a variable named VARIABLE.<br><br>Useful if you have $ sign in your value and there are some characters after it, but you would not like to interpolate it from another value. In this case, you should set this to true."
                                     label="Is Literal?" />
                             @endif
@@ -84,7 +81,7 @@
                     </x-forms.button>
                     <x-modal-confirmation title="Confirm Environment Variable Deletion?" isErrorButton
                         buttonTitle="Delete" submitAction="delete" :actions="['The selected environment variable will be permanently deleted.']"
-                        confirmationText="{{ $env->key }}"
+                        confirmationText="{{ $key }}"
                         confirmationLabel="Please confirm the execution of the actions by entering the Environment Variable Name below"
                         shortConfirmationLabel="Environment Variable Name" :confirmWithPassword="false"
                         step2ButtonText="Permanently Delete" />
@@ -97,7 +94,7 @@
                     </x-forms.button>
                     <x-modal-confirmation title="Confirm Environment Variable Deletion?" isErrorButton
                         buttonTitle="Delete" submitAction="delete" :actions="['The selected environment variable will be permanently deleted.']"
-                        confirmationText="{{ $env->key }}"
+                        confirmationText="{{ $key }}"
                         confirmationLabel="Please confirm the execution of the actions by entering the Environment Variable Name below"
                         shortConfirmationLabel="Environment Variable Name" :confirmWithPassword="false"
                         step2ButtonText="Permanently Delete" />
diff --git a/resources/views/livewire/server/proxy/deploy.blade.php b/resources/views/livewire/server/proxy/deploy.blade.php
index 8882704cc..5be8d36a5 100644
--- a/resources/views/livewire/server/proxy/deploy.blade.php
+++ b/resources/views/livewire/server/proxy/deploy.blade.php
@@ -20,17 +20,12 @@
                         </a>
                     </button>
                 @endif
-                <x-modal-confirmation 
-                    title="Confirm Proxy Restart?"
-                    buttonTitle="Restart Proxy"
-                    submitAction="restart"
-                    :actions="['This proxy will be stopped and started again.', 'All resources hosted on coolify will be unavailable during the restart.']"
-                    :confirmWithText="false"
-                    :confirmWithPassword="false"
-                    step2ButtonText="Restart Proxy"
-                    :dispatchEvent="true"
-                    dispatchEventType="restartEvent"
-                >
+                <x-modal-confirmation title="Confirm Proxy Restart?" buttonTitle="Restart Proxy" submitAction="restart"
+                    :actions="[
+                        'This proxy will be stopped and started again.',
+                        'All resources hosted on coolify will be unavailable during the restart.',
+                    ]" :confirmWithText="false" :confirmWithPassword="false" step2ButtonText="Restart Proxy"
+                    :dispatchEvent="true" dispatchEventType="restartEvent">
                     <x-slot:button-title>
                         <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                             <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
@@ -42,17 +37,12 @@
                         Restart Proxy
                     </x-slot:button-title>
                 </x-modal-confirmation>
-                <x-modal-confirmation 
-                    title="Confirm Proxy Stopping?"
-                    buttonTitle="Stop Proxy"
-                    submitAction="stop(true)"
-                    :actions="['The coolify proxy will be stopped.', 'All resources hosted on coolify will be unavailable.']"
-                    :confirmWithText="false"
-                    :confirmWithPassword="false"
-                    step2ButtonText="Stop Proxy"
-                    :dispatchEvent="true"
-                    dispatchEventType="stopEvent"
-                >
+                <x-modal-confirmation title="Confirm Proxy Stopping?" buttonTitle="Stop Proxy" submitAction="stop(true)"
+                    :actions="[
+                        'The coolify proxy will be stopped.',
+                        'All resources hosted on coolify will be unavailable.',
+                    ]" :confirmWithText="false" :confirmWithPassword="false" step2ButtonText="Stop Proxy" :dispatchEvent="true"
+                    dispatchEventType="stopEvent">
                     <x-slot:button-title>
                         <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
                             stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
@@ -82,7 +72,6 @@
     @script
         <script>
             $wire.$on('checkProxyEvent', () => {
-                $wire.$dispatch('info', 'Starting proxy.');
                 $wire.$call('checkProxy');
             });
             $wire.$on('restartEvent', () => {
diff --git a/resources/views/livewire/server/proxy/status.blade.php b/resources/views/livewire/server/proxy/status.blade.php
index 4dce706e8..5aa3ca765 100644
--- a/resources/views/livewire/server/proxy/status.blade.php
+++ b/resources/views/livewire/server/proxy/status.blade.php
@@ -1,14 +1,15 @@
 <div x-init="$wire.checkProxy()" class="flex gap-2">
+    <x-forms.button wire:click='checkProxy(true)' :showLoadingIndicator="false">Refresh</x-forms.button>
     @if (data_get($server, 'proxy.status') === 'running')
-        <x-status.running status="Proxy Running" noLoading />
+        <x-status.running status="Proxy Running" />
     @elseif (data_get($server, 'proxy.status') === 'restarting')
-        <x-status.restarting status="Proxy Restarting" noLoading />
+        <x-status.restarting status="Proxy Restarting" />
     @elseif (data_get($server, 'proxy.force_stop'))
-        <x-status.stopped status="Proxy Stopped" noLoading />
+        <x-status.stopped status="Proxy Stopped" />
     @elseif (data_get($server, 'proxy.status') === 'exited')
-        <x-status.stopped status="Proxy Exited" noLoading />
+        <x-status.stopped status="Proxy Exited" />
     @else
-        <x-status.stopped status="Proxy Not Running" noLoading />
+        <x-status.stopped status="Proxy Not Running" />
     @endif
-    <x-forms.button wire:click='checkProxy(true)'>Refresh</x-forms.button>
+
 </div>

From 99947422c2003ddc3bb94c92d5ba925596a7869d Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Tue, 17 Dec 2024 10:43:31 +0100
Subject: [PATCH 47/60] fix: Oauth seeder

---
 database/seeders/OauthSettingSeeder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/seeders/OauthSettingSeeder.php b/database/seeders/OauthSettingSeeder.php
index e5fa8282e..fa692d2dc 100644
--- a/database/seeders/OauthSettingSeeder.php
+++ b/database/seeders/OauthSettingSeeder.php
@@ -22,7 +22,7 @@ class OauthSettingSeeder extends Seeder
                 'google',
                 'authentik',
                 'infomaniak',
-            ])
+            ]);
 
             $isOauthSeeded = OauthSetting::count() > 0;
 

From cd14501612dc4a578aaaad3c61ff1da694de408c Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Tue, 17 Dec 2024 11:01:35 +0100
Subject: [PATCH 48/60] remove port 80 from http.conf

---
 docker/development/etc/nginx/site-opts.d/http.conf | 2 --
 docker/production/etc/nginx/site-opts.d/http.conf  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/docker/development/etc/nginx/site-opts.d/http.conf b/docker/development/etc/nginx/site-opts.d/http.conf
index 9f7e49ee2..a5bbd78a3 100644
--- a/docker/development/etc/nginx/site-opts.d/http.conf
+++ b/docker/development/etc/nginx/site-opts.d/http.conf
@@ -1,5 +1,3 @@
-listen 80 default_server;
-listen [::]:80 default_server;
 listen 8080 default_server;
 listen [::]:8080 default_server;
 
diff --git a/docker/production/etc/nginx/site-opts.d/http.conf b/docker/production/etc/nginx/site-opts.d/http.conf
index 9f7e49ee2..a5bbd78a3 100644
--- a/docker/production/etc/nginx/site-opts.d/http.conf
+++ b/docker/production/etc/nginx/site-opts.d/http.conf
@@ -1,5 +1,3 @@
-listen 80 default_server;
-listen [::]:80 default_server;
 listen 8080 default_server;
 listen [::]:8080 default_server;
 

From 02976e454a466119d9af92cb01203647261f1323 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Tue, 17 Dec 2024 11:02:47 +0100
Subject: [PATCH 49/60] fix: check port 8080 and fallback to 80

---
 docker/coolify-realtime/terminal-server.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/docker/coolify-realtime/terminal-server.js b/docker/coolify-realtime/terminal-server.js
index 6633204b2..d1d74c89f 100755
--- a/docker/coolify-realtime/terminal-server.js
+++ b/docker/coolify-realtime/terminal-server.js
@@ -33,12 +33,22 @@ const verifyClient = async (info, callback) => {
 
     try {
         // Authenticate with Laravel backend
-        const response = await axios.post(`http://coolify/terminal/auth`, null, {
-            headers: {
-                'Cookie': `${sessionCookieName}=${laravelSession}`,
-                'X-XSRF-TOKEN': xsrfToken
-            },
-        });
+        let response;
+        try {
+            response = await axios.post(`http://coolify:8080/terminal/auth`, null, {
+                headers: {
+                    'Cookie': `${sessionCookieName}=${laravelSession}`,
+                    'X-XSRF-TOKEN': xsrfToken
+                },
+            });
+        } catch (error) {
+            response = await axios.post(`http://coolify/terminal/auth`, null, {
+                headers: {
+                    'Cookie': `${sessionCookieName}=${laravelSession}`,
+                    'X-XSRF-TOKEN': xsrfToken
+                },
+            });
+        }
 
         if (response.status === 200) {
             // Authentication successful

From b7748479d4c1b7a12dc72eb10a45b765167e0e1f Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 17 Dec 2024 11:13:13 +0100
Subject: [PATCH 50/60] fix: service ui structure

---
 .../Project/Service/Configuration.php         |  28 ++++-
 .../project/application/heading.blade.php     |  12 +-
 .../project/service/configuration.blade.php   | 111 ++++++++----------
 .../livewire/project/service/navbar.blade.php |   6 +-
 .../livewire/project/shared/logs.blade.php    |  12 +-
 routes/web.php                                |   8 ++
 6 files changed, 93 insertions(+), 84 deletions(-)

diff --git a/app/Livewire/Project/Service/Configuration.php b/app/Livewire/Project/Service/Configuration.php
index 319ead361..99a0dea7f 100644
--- a/app/Livewire/Project/Service/Configuration.php
+++ b/app/Livewire/Project/Service/Configuration.php
@@ -9,16 +9,22 @@ use Livewire\Component;
 
 class Configuration extends Component
 {
+    public $currentRoute;
+
+    public $project;
+
+    public $environment;
+
     public ?Service $service = null;
 
     public $applications;
 
     public $databases;
 
-    public array $parameters;
-
     public array $query;
 
+    public array $parameters;
+
     public function getListeners()
     {
         $userId = Auth::id();
@@ -38,11 +44,21 @@ class Configuration extends Component
     public function mount()
     {
         $this->parameters = get_route_parameters();
+        $this->currentRoute = request()->route()->getName();
         $this->query = request()->query();
-        $this->service = Service::whereUuid($this->parameters['service_uuid'])->first();
-        if (! $this->service) {
-            return redirect()->route('dashboard');
-        }
+        $project = currentTeam()
+            ->projects()
+            ->select('id', 'uuid', 'team_id')
+            ->where('uuid', request()->route('project_uuid'))
+            ->firstOrFail();
+        $environment = $project->environments()
+            ->select('id', 'name', 'project_id')
+            ->where('name', request()->route('environment_name'))
+            ->firstOrFail();
+        $this->service = $environment->services()->whereUuid(request()->route('service_uuid'))->firstOrFail();
+
+        $this->project = $project;
+        $this->environment = $environment;
         $this->applications = $this->service->applications->sort();
         $this->databases = $this->service->databases->sort();
     }
diff --git a/resources/views/livewire/project/application/heading.blade.php b/resources/views/livewire/project/application/heading.blade.php
index 8f3d1d15c..aecab0265 100644
--- a/resources/views/livewire/project/application/heading.blade.php
+++ b/resources/views/livewire/project/application/heading.blade.php
@@ -2,17 +2,21 @@
     <x-resources.breadcrumbs :resource="$application" :parameters="$parameters" :title="$lastDeploymentInfo" :lastDeploymentLink="$lastDeploymentLink" />
     <div class="navbar-main">
         <nav class="flex flex-shrink-0 gap-6 items-center whitespace-nowrap scrollbar min-h-10">
-            <a href="{{ route('project.application.configuration', $parameters) }}">
+            <a class="{{ request()->routeIs('project.application.configuration') ? 'dark:text-white' : '' }}"
+                href="{{ route('project.application.configuration', $parameters) }}">
                 Configuration
             </a>
-            <a href="{{ route('project.application.deployment.index', $parameters) }}">
+            <a class="{{ request()->routeIs('project.application.deployment.index') ? 'dark:text-white' : '' }}"
+                href="{{ route('project.application.deployment.index', $parameters) }}">
                 <button>Deployments</button>
             </a>
-            <a href="{{ route('project.application.logs', $parameters) }}">
+            <a class="{{ request()->routeIs('project.application.logs') ? 'dark:text-white' : '' }}"
+                href="{{ route('project.application.logs', $parameters) }}">
                 <button>Logs</button>
             </a>
             @if (!$application->destination->server->isSwarm())
-                <a href="{{ route('project.application.command', $parameters) }}">
+                <a class="{{ request()->routeIs('project.application.command') ? 'dark:text-white' : '' }}"
+                    href="{{ route('project.application.command', $parameters) }}">
                     <button>Terminal</button>
                 </a>
             @endif
diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.php
index 994ce6790..d52d3c4b6 100644
--- a/resources/views/livewire/project/service/configuration.blade.php
+++ b/resources/views/livewire/project/service/configuration.blade.php
@@ -1,50 +1,42 @@
-<div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }">
+<div>
     <x-slot:title>
         {{ data_get_str($service, 'name')->limit(10) }} > Configuration | Coolify
     </x-slot>
     <livewire:project.service.navbar :service="$service" :parameters="$parameters" :query="$query" />
-    <div class="flex flex-col gap-8 pt-6 h-full sm:flex-row">
-        <div class="flex flex-col gap-2 items-start min-w-fit">
+
+    <div class="flex flex-col h-full gap-8 pt-6 sm:flex-row">
+        <div class="flex flex-col items-start gap-2 min-w-fit">
             <a class="menu-item sm:min-w-fit" target="_blank" href="{{ $service->documentation() }}">Documentation
                 <x-external-link /></a>
-            <a class="menu-item sm:min-w-fit" :class="activeTab === 'service-stack' && 'menu-item-active'"
-                @click.prevent="activeTab = 'service-stack';
-                window.location.hash = 'service-stack'"
-                href="#">Service Stack</a>
-            <a class="menu-item sm:min-w-fit" :class="activeTab === 'environment-variables' && 'menu-item-active'"
-                @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
-                href="#">Environment
-                Variables</a>
-            <a class="menu-item sm:min-w-fit" :class="activeTab === 'storages' && 'menu-item-active'"
-                @click.prevent="activeTab = 'storages';
-                window.location.hash = 'storages'"
-                href="#">Storages</a>
-            <a class="menu-item" :class="activeTab === 'scheduled-tasks' && 'menu-item-active'"
-                @click.prevent="activeTab = 'scheduled-tasks'; window.location.hash = 'scheduled-tasks'"
-                href="#">Scheduled Tasks
-            </a>
-            <a class="menu-item sm:min-w-fit" :class="activeTab === 'logs' && 'menu-item-active'"
-                @click.prevent="activeTab = 'logs';
-                window.location.hash = 'logs'"
-                href="#">Logs</a>
-            <a class="menu-item sm:min-w-fit" :class="activeTab === 'webhooks' && 'menu-item-active'"
-                @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
-            </a>
-            <a class="menu-item sm:min-w-fit" :class="activeTab === 'resource-operations' && 'menu-item-active'"
-                @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
-                href="#">Resource Operations
-            </a>
-            <a class="menu-item sm:min-w-fit" :class="activeTab === 'tags' && 'menu-item-active'"
-                @click.prevent="activeTab = 'tags'; window.location.hash = 'tags'" href="#">Tags
-            </a>
-            <a class="menu-item sm:min-w-fit" :class="activeTab === 'danger' && 'menu-item-active'"
-                @click.prevent="activeTab = 'danger';
-                window.location.hash = 'danger'"
-                href="#">Danger Zone
-            </a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.service.configuration', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                wire:navigate>General</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.service.environment-variables', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                wire:navigate>Environment Variables</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.service.storages', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                wire:navigate>Persistent Storages</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.service.scheduled-tasks.show', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                wire:navigate>Scheduled Tasks</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.service.webhooks', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                wire:navigate>Webhooks</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.service.resource-operations', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                wire:navigate>Resource Operations</a>
+
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.service.tags', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                wire:navigate>Tags</a>
+
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.service.danger', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                wire:navigate>Danger Zone</a>
         </div>
         <div class="w-full">
-            <div x-cloak x-show="activeTab === 'service-stack'">
+            @if (request()->route()->getName() === 'project.service.configuration')
                 <livewire:project.service.stack-form :service="$service" />
                 <h3>Services</h3>
                 <div class="grid grid-cols-1 gap-2 pt-4 xl:grid-cols-1">
@@ -103,7 +95,7 @@
                                 </div>
                                 <div class="flex items-center px-4">
                                     <a class="mx-4 text-xs font-bold hover:underline"
-                                        href="{{ route('project.service.index', [...$parameters, 'stack_service_uuid' => $application->uuid]) }}">
+                                        href="{{ route('project.service.index', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid, 'stack_service_uuid' => $application->uuid]) }}">
                                         Settings
                                     </a>
                                     @if (str($application->status)->contains('running'))
@@ -151,12 +143,12 @@
                                 <div class="flex items-center px-4">
                                     @if ($database->isBackupSolutionAvailable())
                                         <a class="mx-4 text-xs font-bold hover:underline"
-                                            href="{{ route('project.service.index', [...$parameters, 'stack_service_uuid' => $database->uuid]) }}#backups">
+                                            href="{{ route('project.service.index', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid, 'stack_service_uuid' => $database->uuid]) }}#backups">
                                             Backups
                                         </a>
                                     @endif
                                     <a class="mx-4 text-xs font-bold hover:underline"
-                                        href="{{ route('project.service.index', [...$parameters, 'stack_service_uuid' => $database->uuid]) }}">
+                                        href="{{ route('project.service.index', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid, 'stack_service_uuid' => $database->uuid]) }}">
                                         Settings
                                     </a>
                                     @if (str($database->status)->contains('running'))
@@ -173,8 +165,9 @@
                         </div>
                     @endforeach
                 </div>
-            </div>
-            <div x-cloak x-show="activeTab === 'storages'">
+            @elseif (request()->route()->getName() === 'project.service.environment-variables')
+                <livewire:project.shared.environment-variable.all :resource="$service" />
+            @elseif (request()->route()->getName() === 'project.service.storages')
                 <div class="flex gap-2 items-center">
                     <h2>Storages</h2>
                 </div>
@@ -182,35 +175,23 @@
                 <div class="pb-4 dark:text-warning text-coollabs">If you would like to add a volume, you must add it to
                     your compose file (Service Stack tab).</div>
                 @foreach ($applications as $application)
-                    <livewire:project.service.storage wire:key="application-{{ $application->id }}" :resource="$application"
-                        lazy />
+                    <livewire:project.service.storage wire:key="application-{{ $application->id }}"
+                        :resource="$application" />
                 @endforeach
                 @foreach ($databases as $database)
-                    <livewire:project.service.storage wire:key="database-{{ $database->id }}" :resource="$database"
-                        lazy />
+                    <livewire:project.service.storage wire:key="database-{{ $database->id }}" :resource="$database" />
                 @endforeach
-            </div>
-            <div x-cloak x-show="activeTab === 'scheduled-tasks'">
+            @elseif (request()->route()->getName() === 'project.service.scheduled-tasks.show')
                 <livewire:project.shared.scheduled-task.all :resource="$service" />
-            </div>
-            <div x-cloak x-show="activeTab === 'webhooks'">
+            @elseif (request()->route()->getName() === 'project.service.webhooks')
                 <livewire:project.shared.webhooks :resource="$service" />
-            </div>
-            <div x-cloak x-show="activeTab === 'logs'">
-                <livewire:project.shared.logs :resource="$service" />
-            </div>
-            <div x-cloak x-show="activeTab === 'environment-variables'">
-                <livewire:project.shared.environment-variable.all :resource="$service" />
-            </div>
-            <div x-cloak x-show="activeTab === 'resource-operations'">
+            @elseif (request()->route()->getName() === 'project.service.resource-operations')
                 <livewire:project.shared.resource-operations :resource="$service" />
-            </div>
-            <div x-cloak x-show="activeTab === 'tags'">
+            @elseif (request()->route()->getName() === 'project.service.tags')
                 <livewire:project.shared.tags :resource="$service" />
-            </div>
-            <div x-cloak x-show="activeTab === 'danger'">
+            @elseif (request()->route()->getName() === 'project.service.danger')
                 <livewire:project.shared.danger :resource="$service" />
-            </div>
+            @endif
         </div>
     </div>
 </div>
diff --git a/resources/views/livewire/project/service/navbar.blade.php b/resources/views/livewire/project/service/navbar.blade.php
index f268096f8..b90d9e81d 100644
--- a/resources/views/livewire/project/service/navbar.blade.php
+++ b/resources/views/livewire/project/service/navbar.blade.php
@@ -1,4 +1,4 @@
-<div wire:poll.10000ms="check_status_without_notification">
+<div>
     <livewire:project.shared.configuration-checker :resource="$service" />
     <x-slide-over @startservice.window="slideOverOpen = true" closeWithX fullScreen>
         <x-slot:title>Service Startup</x-slot:title>
@@ -14,6 +14,10 @@
                 href="{{ route('project.service.configuration', $parameters) }}">
                 <button>Configuration</button>
             </a>
+            <a class="{{ request()->routeIs('project.service.logs') ? 'dark:text-white' : '' }}"
+                href="{{ route('project.service.logs', $parameters) }}">
+                <button>Logs</button>
+            </a>
             <a class="{{ request()->routeIs('project.service.command') ? 'dark:text-white' : '' }}"
                 href="{{ route('project.service.command', $parameters) }}">
                 <button>Terminal</button>
diff --git a/resources/views/livewire/project/shared/logs.blade.php b/resources/views/livewire/project/shared/logs.blade.php
index 10095df8b..199f755da 100644
--- a/resources/views/livewire/project/shared/logs.blade.php
+++ b/resources/views/livewire/project/shared/logs.blade.php
@@ -7,7 +7,6 @@
         <h1>Logs</h1>
         <livewire:project.application.heading :application="$resource" />
         <div class="pt-4">
-            <h2>Logs</h2>
             <div class="subtitle">Here you can see the logs of the application.</div>
             <div class="pt-2" wire:loading wire:target="loadContainers">
                 Loading containers...
@@ -31,10 +30,8 @@
         <h1>Logs</h1>
         <livewire:project.database.heading :database="$resource" />
         <div class="pt-4">
+            <div class="subtitle">Here you can see the logs of the database.</div>
             @forelse ($containers as $container)
-                @if ($loop->first)
-                    <h2 class="pb-4">Logs</h2>
-                @endif
                 @if (data_get($servers, '0'))
                     <livewire:project.shared.get-logs :server="data_get($servers, '0')" :resource="$resource" :container="$container" />
                 @else
@@ -45,11 +42,10 @@
             @endforelse
         </div>
     @elseif ($type === 'service')
-        <div>
+        <livewire:project.service.navbar :service="$resource" :parameters="$parameters" :query="$query" title="Logs" />
+        <div class="pt-4">
+            <div class="subtitle">Here you can see the logs of the service.</div>
             @forelse ($containers as $container)
-                @if ($loop->first)
-                    <h2 class="pb-4">Logs</h2>
-                @endif
                 @if (data_get($servers, '0'))
                     <livewire:project.shared.get-logs :server="data_get($servers, '0')" :resource="$resource" :container="$container" />
                 @else
diff --git a/routes/web.php b/routes/web.php
index 18adc0467..43012e600 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -215,6 +215,14 @@ Route::middleware(['auth', 'verified'])->group(function () {
     });
     Route::prefix('project/{project_uuid}/{environment_name}/service/{service_uuid}')->group(function () {
         Route::get('/', ServiceConfiguration::class)->name('project.service.configuration');
+        Route::get('/logs', Logs::class)->name('project.service.logs');
+        Route::get('/environment-variables', ServiceConfiguration::class)->name('project.service.environment-variables');
+        Route::get('/storages', ServiceConfiguration::class)->name('project.service.storages');
+        Route::get('/scheduled-tasks', ServiceConfiguration::class)->name('project.service.scheduled-tasks.show');
+        Route::get('/webhooks', ServiceConfiguration::class)->name('project.service.webhooks');
+        Route::get('/resource-operations', ServiceConfiguration::class)->name('project.service.resource-operations');
+        Route::get('/tags', ServiceConfiguration::class)->name('project.service.tags');
+        Route::get('/danger', ServiceConfiguration::class)->name('project.service.danger');
         Route::get('/terminal', ExecuteContainerCommand::class)->name('project.service.command');
         Route::get('/{stack_service_uuid}', ServiceIndex::class)->name('project.service.index');
         Route::get('/tasks/{task_uuid}', ScheduledTaskShow::class)->name('project.service.scheduled-tasks');

From b1759bf25d9c3b8b484ada7cc5ad928bad6ae124 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 17 Dec 2024 11:30:36 +0100
Subject: [PATCH 51/60] use only port 8080 in the new version

---
 docker/coolify-realtime/terminal-server.js | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/docker/coolify-realtime/terminal-server.js b/docker/coolify-realtime/terminal-server.js
index d1d74c89f..6649f866c 100755
--- a/docker/coolify-realtime/terminal-server.js
+++ b/docker/coolify-realtime/terminal-server.js
@@ -33,22 +33,12 @@ const verifyClient = async (info, callback) => {
 
     try {
         // Authenticate with Laravel backend
-        let response;
-        try {
-            response = await axios.post(`http://coolify:8080/terminal/auth`, null, {
-                headers: {
-                    'Cookie': `${sessionCookieName}=${laravelSession}`,
-                    'X-XSRF-TOKEN': xsrfToken
-                },
-            });
-        } catch (error) {
-            response = await axios.post(`http://coolify/terminal/auth`, null, {
-                headers: {
-                    'Cookie': `${sessionCookieName}=${laravelSession}`,
-                    'X-XSRF-TOKEN': xsrfToken
-                },
-            });
-        }
+        const response = await axios.post(`http://coolify:8080/terminal/auth`, null, {
+            headers: {
+                'Cookie': `${sessionCookieName}=${laravelSession}`,
+                'X-XSRF-TOKEN': xsrfToken
+            },
+        });
 
         if (response.status === 200) {
             // Authentication successful

From a5b41746dd9f83f90bba88061f9efea285007383 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 17 Dec 2024 11:30:52 +0100
Subject: [PATCH 52/60] update compose files

---
 docker-compose.dev.yml                | 2 +-
 docker-compose.prod.yml               | 2 +-
 other/nightly/docker-compose.prod.yml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 76f8e9ca6..3fadd914c 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -7,7 +7,7 @@ services:
         - USER_ID=${USERID:-1000}
         - GROUP_ID=${GROUPID:-1000}
     ports:
-      - "${APP_PORT:-8000}:80"
+      - "${APP_PORT:-8000}:8080"
     environment:
       AUTORUN_ENABLED: false
       PUSHER_HOST: "${PUSHER_HOST}"
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index d86b2336b..c7349f7b0 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -54,7 +54,7 @@ services:
       - SSH_MUX_ENABLED
       - SSH_MUX_PERSIST_TIME
     ports:
-      - "${APP_PORT:-8000}:80"
+      - "${APP_PORT:-8000}:8080"
     expose:
       - "${APP_PORT:-8000}"
     healthcheck:
diff --git a/other/nightly/docker-compose.prod.yml b/other/nightly/docker-compose.prod.yml
index d86b2336b..f9cded363 100644
--- a/other/nightly/docker-compose.prod.yml
+++ b/other/nightly/docker-compose.prod.yml
@@ -54,7 +54,7 @@ services:
       - SSH_MUX_ENABLED
       - SSH_MUX_PERSIST_TIME
     ports:
-      - "${APP_PORT:-8000}:80"
+      - "${APP_PORT:-8000}:8080"
     expose:
       - "${APP_PORT:-8000}"
     healthcheck:
@@ -93,7 +93,7 @@ services:
       retries: 10
       timeout: 2s
   soketi:
-    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.4'
+    image: 'ghcr.io/coollabsio/coolify-realtime:next'
     ports:
       - "${SOKETI_PORT:-6001}:6001"
       - "6002:6002"

From 38256af9b31b3bd5351dfd5789c045aeee270e16 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 17 Dec 2024 12:10:55 +0100
Subject: [PATCH 53/60] fix: refactor database view

---
 .../Project/Application/Configuration.php     |  11 +-
 .../Project/Database/Configuration.php        |  35 +++--
 app/Livewire/Project/Shared/Destination.php   |  94 ++++++++------
 .../application/configuration.blade.php       |   2 +-
 .../project/database/configuration.blade.php  | 122 +++++++-----------
 .../project/shared/destination.blade.php      |  14 +-
 routes/web.php                                |  11 ++
 7 files changed, 145 insertions(+), 144 deletions(-)

diff --git a/app/Livewire/Project/Application/Configuration.php b/app/Livewire/Project/Application/Configuration.php
index bf2811075..792e55e45 100644
--- a/app/Livewire/Project/Application/Configuration.php
+++ b/app/Livewire/Project/Application/Configuration.php
@@ -3,7 +3,6 @@
 namespace App\Livewire\Project\Application;
 
 use App\Models\Application;
-use App\Models\Server;
 use Livewire\Component;
 
 class Configuration extends Component
@@ -40,15 +39,7 @@ class Configuration extends Component
         $this->project = $project;
         $this->environment = $environment;
         $this->application = $application;
-        if ($application->destination && $application->destination->server) {
-            $mainServer = $application->destination->server;
-            $this->servers = Server::ownedByCurrentTeam()
-                ->select('id', 'name')
-                ->where('id', '!=', $mainServer->id)
-                ->get();
-        } else {
-            $this->servers = collect();
-        }
+
     }
 
     public function render()
diff --git a/app/Livewire/Project/Database/Configuration.php b/app/Livewire/Project/Database/Configuration.php
index e14b27cf6..4e08f0fee 100644
--- a/app/Livewire/Project/Database/Configuration.php
+++ b/app/Livewire/Project/Database/Configuration.php
@@ -6,23 +6,34 @@ use Livewire\Component;
 
 class Configuration extends Component
 {
+    public $currentRoute;
+
     public $database;
 
+    public $project;
+
+    public $environment;
+
     public function mount()
     {
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (! $project) {
-            return redirect()->route('dashboard');
-        }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
-        if (! $environment) {
-            return redirect()->route('dashboard');
-        }
-        $database = $environment->databases()->where('uuid', request()->route('database_uuid'))->first();
-        if (! $database) {
-            return redirect()->route('dashboard');
-        }
+        $this->currentRoute = request()->route()->getName();
+
+        $project = currentTeam()
+            ->projects()
+            ->select('id', 'uuid', 'team_id')
+            ->where('uuid', request()->route('project_uuid'))
+            ->firstOrFail();
+        $environment = $project->environments()
+            ->select('id', 'name', 'project_id')
+            ->where('name', request()->route('environment_name'))
+            ->firstOrFail();
+        $database = $environment->databases()
+            ->where('uuid', request()->route('database_uuid'))
+            ->firstOrFail();
+
         $this->database = $database;
+        $this->project = $project;
+        $this->environment = $environment;
         if (str($this->database->status)->startsWith('running') && is_null($this->database->config_hash)) {
             $this->database->isConfigurationChanged(true);
             $this->dispatch('configurationChanged');
diff --git a/app/Livewire/Project/Shared/Destination.php b/app/Livewire/Project/Shared/Destination.php
index c305e817c..61dcab196 100644
--- a/app/Livewire/Project/Shared/Destination.php
+++ b/app/Livewire/Project/Shared/Destination.php
@@ -8,6 +8,7 @@ use App\Events\ApplicationStatusChanged;
 use App\Models\InstanceSettings;
 use App\Models\Server;
 use App\Models\StandaloneDocker;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Livewire\Component;
@@ -17,7 +18,7 @@ class Destination extends Component
 {
     public $resource;
 
-    public $networks = [];
+    public Collection $networks;
 
     public function getListeners()
     {
@@ -30,6 +31,7 @@ class Destination extends Component
 
     public function mount()
     {
+        $this->networks = collect([]);
         $this->loadData();
     }
 
@@ -55,38 +57,46 @@ class Destination extends Component
         }
     }
 
-    public function stop(int $server_id)
+    public function stop($serverId)
     {
-        $server = Server::find($server_id);
-        StopApplicationOneServer::run($this->resource, $server);
-        $this->refreshServers();
+        try {
+            $server = Server::ownedByCurrentTeam()->findOrFail($serverId);
+            StopApplicationOneServer::run($this->resource, $server);
+            $this->refreshServers();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function redeploy(int $network_id, int $server_id)
     {
-        if ($this->resource->additional_servers->count() > 0 && str($this->resource->docker_registry_image_name)->isEmpty()) {
-            $this->dispatch('error', 'Failed to deploy.', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/multiple-servers">documentation</a>');
+        try {
+            if ($this->resource->additional_servers->count() > 0 && str($this->resource->docker_registry_image_name)->isEmpty()) {
+                $this->dispatch('error', 'Failed to deploy.', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/multiple-servers">documentation</a>');
 
-            return;
+                return;
+            }
+            $deployment_uuid = new Cuid2;
+            $server = Server::ownedByCurrentTeam()->findOrFail($server_id);
+            $destination = $server->standaloneDockers->where('id', $network_id)->firstOrFail();
+            queue_application_deployment(
+                deployment_uuid: $deployment_uuid,
+                application: $this->resource,
+                server: $server,
+                destination: $destination,
+                only_this_server: true,
+                no_questions_asked: true,
+            );
+
+            return redirect()->route('project.application.deployment.show', [
+                'project_uuid' => data_get($this->resource, 'environment.project.uuid'),
+                'application_uuid' => data_get($this->resource, 'uuid'),
+                'deployment_uuid' => $deployment_uuid,
+                'environment_name' => data_get($this->resource, 'environment.name'),
+            ]);
+        } catch (\Exception $e) {
+            return handleError($e, $this);
         }
-        $deployment_uuid = new Cuid2;
-        $server = Server::find($server_id);
-        $destination = StandaloneDocker::find($network_id);
-        queue_application_deployment(
-            deployment_uuid: $deployment_uuid,
-            application: $this->resource,
-            server: $server,
-            destination: $destination,
-            only_this_server: true,
-            no_questions_asked: true,
-        );
-
-        return redirect()->route('project.application.deployment.show', [
-            'project_uuid' => data_get($this->resource, 'environment.project.uuid'),
-            'application_uuid' => data_get($this->resource, 'uuid'),
-            'deployment_uuid' => $deployment_uuid,
-            'environment_name' => data_get($this->resource, 'environment.name'),
-        ]);
     }
 
     public function promote(int $network_id, int $server_id)
@@ -119,23 +129,27 @@ class Destination extends Component
 
     public function removeServer(int $network_id, int $server_id, $password)
     {
-        if (! data_get(InstanceSettings::get(), 'disable_two_step_confirmation')) {
-            if (! Hash::check($password, Auth::user()->password)) {
-                $this->addError('password', 'The provided password is incorrect.');
+        try {
+            if (! data_get(InstanceSettings::get(), 'disable_two_step_confirmation')) {
+                if (! Hash::check($password, Auth::user()->password)) {
+                    $this->addError('password', 'The provided password is incorrect.');
+
+                    return;
+                }
+            }
+
+            if ($this->resource->destination->server->id == $server_id && $this->resource->destination->id == $network_id) {
+                $this->dispatch('error', 'You cannot remove this destination server.', 'You are trying to remove the main server.');
 
                 return;
             }
+            $server = Server::ownedByCurrentTeam()->findOrFail($server_id);
+            StopApplicationOneServer::run($this->resource, $server);
+            $this->resource->additional_networks()->detach($network_id, ['server_id' => $server_id]);
+            $this->loadData();
+            ApplicationStatusChanged::dispatch(data_get($this->resource, 'environment.project.team.id'));
+        } catch (\Exception $e) {
+            return handleError($e, $this);
         }
-
-        if ($this->resource->destination->server->id == $server_id && $this->resource->destination->id == $network_id) {
-            $this->dispatch('error', 'You cannot remove this destination server.', 'You are trying to remove the main server.');
-
-            return;
-        }
-        $server = Server::find($server_id);
-        StopApplicationOneServer::run($this->resource, $server);
-        $this->resource->additional_networks()->detach($network_id, ['server_id' => $server_id]);
-        $this->loadData();
-        ApplicationStatusChanged::dispatch(data_get($this->resource, 'environment.project.team.id'));
     }
 }
diff --git a/resources/views/livewire/project/application/configuration.blade.php b/resources/views/livewire/project/application/configuration.blade.php
index fc2b8c7c0..7827476d8 100644
--- a/resources/views/livewire/project/application/configuration.blade.php
+++ b/resources/views/livewire/project/application/configuration.blade.php
@@ -98,7 +98,7 @@
             @elseif (request()->route()->getName() === 'project.application.source' && $application->git_based())
                 <livewire:project.application.source :application="$application" />
             @elseif (request()->route()->getName() === 'project.application.servers')
-                <livewire:project.shared.destination :resource="$application" :servers="$servers" />
+                <livewire:project.shared.destination :resource="$application" />
             @elseif (request()->route()->getName() === 'project.application.scheduled-tasks.show')
                 <livewire:project.shared.scheduled-task.all :resource="$application" />
             @elseif (request()->route()->getName() === 'project.application.webhooks')
diff --git a/resources/views/livewire/project/database/configuration.blade.php b/resources/views/livewire/project/database/configuration.blade.php
index 652aec3eb..b0702c24a 100644
--- a/resources/views/livewire/project/database/configuration.blade.php
+++ b/resources/views/livewire/project/database/configuration.blade.php
@@ -5,57 +5,45 @@
     <h1>Configuration</h1>
     <livewire:project.shared.configuration-checker :resource="$database" />
     <livewire:project.database.heading :database="$database" />
-    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 pt-6 sm:flex-row">
+    <div class="flex flex-col h-full gap-8 pt-6 sm:flex-row">
         <div class="flex flex-col items-start gap-2 min-w-fit">
-            <a class="menu-item" :class="activeTab === 'general' && 'menu-item-active'"
-                @click.prevent="activeTab = 'general';
-                window.location.hash = 'general'"
-                href="#">General</a>
-            <a class="menu-item" :class="activeTab === 'environment-variables' && 'menu-item-active'"
-                @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
-                href="#">Environment
-                Variables</a>
-            <a class="menu-item" :class="activeTab === 'servers' && 'menu-item-active'"
-                @click.prevent="activeTab = 'servers';
-                window.location.hash = 'servers'"
-                href="#">Servers
-            </a>
-            <a class="menu-item" :class="activeTab === 'storages' && 'menu-item-active'"
-                @click.prevent="activeTab = 'storages';
-                window.location.hash = 'storages'"
-                href="#">Storages
-            </a>
-            <a class="menu-item" :class="activeTab === 'import' && 'menu-item-active'"
-                @click.prevent="activeTab = 'import';
-            window.location.hash = 'import'" href="#">Import
-                Backup
-            </a>
-            <a class="menu-item" :class="activeTab === 'webhooks' && 'menu-item-active'"
-                @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
-            </a>
-            <a class="menu-item" :class="activeTab === 'resource-limits' && 'menu-item-active'"
-                @click.prevent="activeTab = 'resource-limits';
-                window.location.hash = 'resource-limits'"
-                href="#">Resource Limits
-            </a>
-            <a class="menu-item" :class="activeTab === 'resource-operations' && 'menu-item-active'"
-                @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
-                href="#">Resource Operations
-            </a>
-            <a class="menu-item" :class="activeTab === 'metrics' && 'menu-item-active'"
-                @click.prevent="activeTab = 'metrics'; window.location.hash = 'metrics'" href="#">Metrics
-            </a>
-            <a class="menu-item" :class="activeTab === 'tags' && 'menu-item-active'"
-                @click.prevent="activeTab = 'tags'; window.location.hash = 'tags'" href="#">Tags
-            </a>
-            <a class="menu-item" :class="activeTab === 'danger' && 'menu-item-active'"
-                @click.prevent="activeTab = 'danger';
-                window.location.hash = 'danger'"
-                href="#">Danger Zone
-            </a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.database.configuration', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                wire:navigate>General</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.database.environment-variables', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                wire:navigate>Environment Variables</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.database.servers', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                wire:navigate>Servers</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.database.persistent-storage', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                wire:navigate>Persistent Storage</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.database.import-backups', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                wire:navigate>Import Backups</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.database.webhooks', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                wire:navigate>Webhooks</a>
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.database.resource-limits', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                wire:navigate>Resource Limits</a>
+
+            <a class="menu-item" wire:current.exact="menu-item-active"
+                href="{{ route('project.database.resource-operations', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                wire:navigate>Resource Operations</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.database.metrics', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                wire:navigate>Metrics</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.database.tags', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                wire:navigate>Tags</a>
+            <a class='menu-item' wire:current.exact="menu-item-active"
+                href="{{ route('project.database.danger', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                wire:navigate>Danger Zone</a>
         </div>
         <div class="w-full">
-            <div x-cloak x-show="activeTab === 'general'" class="h-full">
+            @if (request()->route()->getName() === 'project.database.configuration')
                 @if ($database->type() === 'standalone-postgresql')
                     <livewire:project.database.postgresql.general :database="$database" />
                 @elseif ($database->type() === 'standalone-redis')
@@ -73,37 +61,27 @@
                 @elseif ($database->type() === 'standalone-clickhouse')
                     <livewire:project.database.clickhouse.general :database="$database" />
                 @endif
-            </div>
-            <div x-cloak x-show="activeTab === 'environment-variables'">
+            @elseif (request()->route()->getName() === 'project.database.environment-variables')
                 <livewire:project.shared.environment-variable.all :resource="$database" />
-            </div>
-            <div x-cloak x-show="activeTab === 'servers'">
+            @elseif (request()->route()->getName() === 'project.database.servers')
                 <livewire:project.shared.destination :resource="$database" />
-            </div>
-            <div x-cloak x-show="activeTab === 'storages'">
+            @elseif (request()->route()->getName() === 'project.database.persistent-storage')
                 <livewire:project.service.storage :resource="$database" />
-            </div>
-            <div x-cloak x-show="activeTab === 'webhooks'">
-                <livewire:project.shared.webhooks :resource="$database" />
-            </div>
-            <div x-cloak x-show="activeTab === 'resource-limits'">
-                <livewire:project.shared.resource-limits :resource="$database" />
-            </div>
-            <div x-cloak x-show="activeTab === 'import'">
+            @elseif (request()->route()->getName() === 'project.database.import-backups')
                 <livewire:project.database.import :resource="$database" />
-            </div>
-            <div x-cloak x-show="activeTab === 'resource-operations'">
+            @elseif (request()->route()->getName() === 'project.database.webhooks')
+                <livewire:project.shared.webhooks :resource="$database" />
+            @elseif (request()->route()->getName() === 'project.database.resource-limits')
+                <livewire:project.shared.resource-limits :resource="$database" />
+            @elseif (request()->route()->getName() === 'project.database.resource-operations')
                 <livewire:project.shared.resource-operations :resource="$database" />
-            </div>
-            <div x-cloak x-show="activeTab === 'metrics'">
+            @elseif (request()->route()->getName() === 'project.database.metrics')
                 <livewire:project.shared.metrics :resource="$database" />
-            </div>
-            <div x-cloak x-show="activeTab === 'tags'">
-                <livewire:project.shared.tags :resource="$database" lazy />
-            </div>
-            <div x-cloak x-show="activeTab === 'danger'">
+            @elseif (request()->route()->getName() === 'project.database.tags')
+                <livewire:project.shared.tags :resource="$database" />
+            @elseif (request()->route()->getName() === 'project.database.danger')
                 <livewire:project.shared.danger :resource="$database" />
-            </div>
+            @endif
         </div>
     </div>
 </div>
diff --git a/resources/views/livewire/project/shared/destination.blade.php b/resources/views/livewire/project/shared/destination.blade.php
index 52429c37c..f0ae90830 100644
--- a/resources/views/livewire/project/shared/destination.blade.php
+++ b/resources/views/livewire/project/shared/destination.blade.php
@@ -62,17 +62,13 @@
                             <x-forms.button isError
                                 wire:click="stop('{{ data_get($destination, 'server.id') }}')">Stop</x-forms.button>
                         @endif
-                        <x-modal-confirmation
-                            title="Confirm server removal?"
-                            isErrorButton
-                            buttonTitle="Remove Server"
+                        <x-modal-confirmation title="Confirm server removal?" isErrorButton buttonTitle="Remove Server"
                             submitAction="removeServer({{ data_get($destination, 'id') }},{{ data_get($destination, 'server.id') }})"
-                            :actions="['This will stop the all running applications on this server and remove it as a deployment destination.']"
-                            confirmationText="{{ data_get($destination, 'server.name') }}"
+                            :actions="[
+                                'This will stop the all running applications on this server and remove it as a deployment destination.',
+                            ]" confirmationText="{{ data_get($destination, 'server.name') }}"
                             confirmationLabel="Please confirm the execution of the actions by entering the Server Name below"
-                            shortConfirmationLabel="Server Name"
-                            step3ButtonText="Permanently Remove Server"
-                        />
+                            shortConfirmationLabel="Server Name" step3ButtonText="Permanently Remove Server" />
                     </div>
                 </div>
             @endforeach
diff --git a/routes/web.php b/routes/web.php
index 43012e600..6e60da972 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -208,6 +208,17 @@ Route::middleware(['auth', 'verified'])->group(function () {
     });
     Route::prefix('project/{project_uuid}/{environment_name}/database/{database_uuid}')->group(function () {
         Route::get('/', DatabaseConfiguration::class)->name('project.database.configuration');
+        Route::get('/environment-variables', DatabaseConfiguration::class)->name('project.database.environment-variables');
+        Route::get('/servers', DatabaseConfiguration::class)->name('project.database.servers');
+        Route::get('/import-backups', DatabaseConfiguration::class)->name('project.database.import-backups');
+        Route::get('/persistent-storage', DatabaseConfiguration::class)->name('project.database.persistent-storage');
+        Route::get('/webhooks', DatabaseConfiguration::class)->name('project.database.webhooks');
+        Route::get('/resource-limits', DatabaseConfiguration::class)->name('project.database.resource-limits');
+        Route::get('/resource-operations', DatabaseConfiguration::class)->name('project.database.resource-operations');
+        Route::get('/metrics', DatabaseConfiguration::class)->name('project.database.metrics');
+        Route::get('/tags', DatabaseConfiguration::class)->name('project.database.tags');
+        Route::get('/danger', DatabaseConfiguration::class)->name('project.database.danger');
+
         Route::get('/logs', Logs::class)->name('project.database.logs');
         Route::get('/terminal', ExecuteContainerCommand::class)->name('project.database.command');
         Route::get('/backups', DatabaseBackupIndex::class)->name('project.database.backup.index');

From 0ce01238d749ec7eea8bbee90917d8d5d9045e89 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 17 Dec 2024 13:40:07 +0100
Subject: [PATCH 54/60] fix: html css

---
 resources/css/app.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/css/app.css b/resources/css/app.css
index 32d476c1a..6e7704eb7 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -6,11 +6,11 @@
 
 html,
 body {
-    @apply h-full bg-neutral-50 text-neutral-800 dark:bg-base dark:text-neutral-400 w-full;
+    @apply min-h-full bg-neutral-50 dark:bg-base dark:text-neutral-400 w-full;
 }
 
 body {
-    @apply text-sm antialiased scrollbar;
+    @apply text-sm antialiased scrollbar min-h-screen;
 }
 
 .apexcharts-tooltip {

From 9e3467578f1435887f7b2d20a1bcf2b06554dad2 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 17 Dec 2024 13:42:16 +0100
Subject: [PATCH 55/60] feat: add environment_uuid support and update API
 documentation

- Introduced `environment_uuid` as a required field in various API endpoints and schemas.
- Updated descriptions to clarify that either `environment_name` or `environment_uuid` must be provided.
- Modified routes and controller methods to accommodate the new UUID parameter.
- Adjusted frontend components to utilize `environment_uuid` for better consistency and clarity.
- Removed deprecated fields related to environment handling.

This change enhances the API's flexibility in identifying environments, improving overall usability.
---
 .../Api/ApplicationsController.php            | 114 ++++---
 .../Controllers/Api/DatabasesController.php   |  73 +++--
 .../Controllers/Api/ProjectController.php     |  17 +-
 .../Controllers/Api/ServicesController.php    |  26 +-
 app/Jobs/ApplicationDeploymentJob.php         |   2 +-
 .../Project/Application/Configuration.php     |   4 +-
 .../Project/Application/Deployment/Show.php   |   8 -
 app/Livewire/Project/Application/Heading.php  |   2 +-
 .../Project/Database/Configuration.php        |   2 +-
 app/Livewire/Project/Resource/Index.php       |  62 ++--
 .../Project/Service/Configuration.php         |   4 +-
 app/Models/Environment.php                    |   3 +-
 .../Application/StatusChanged.php             |   5 +-
 bootstrap/helpers/api.php                     |   1 +
 openapi.json                                  | 300 +++++++-----------
 openapi.yaml                                  | 228 +++++--------
 .../resources/breadcrumbs.blade.php           |   5 +-
 resources/views/livewire/dashboard.blade.php  |   4 +-
 .../application/configuration.blade.php       |  34 +-
 .../project/database/configuration.blade.php  |  23 +-
 .../livewire/project/resource/index.blade.php |   2 +-
 .../project/service/configuration.blade.php   |  22 +-
 .../project/service/storage.blade.php         |   3 +-
 routes/api.php                                |   2 +-
 24 files changed, 421 insertions(+), 525 deletions(-)

diff --git a/app/Http/Controllers/Api/ApplicationsController.php b/app/Http/Controllers/Api/ApplicationsController.php
index 6e7370bb3..1e6a3d246 100644
--- a/app/Http/Controllers/Api/ApplicationsController.php
+++ b/app/Http/Controllers/Api/ApplicationsController.php
@@ -117,11 +117,12 @@ class ApplicationsController extends Controller
                     mediaType: 'application/json',
                     schema: new OA\Schema(
                         type: 'object',
-                        required: ['project_uuid', 'server_uuid', 'environment_name', 'git_repository', 'git_branch', 'build_pack', 'ports_exposes'],
+                        required: ['project_uuid', 'server_uuid', 'environment_name', 'environment_uuid', 'git_repository', 'git_branch', 'build_pack', 'ports_exposes'],
                         properties: [
                             'project_uuid' => ['type' => 'string', 'description' => 'The project UUID.'],
                             'server_uuid' => ['type' => 'string', 'description' => 'The server UUID.'],
-                            'environment_name' => ['type' => 'string', 'description' => 'The environment name.'],
+                            'environment_name' => ['type' => 'string', 'description' => 'The environment name. You need to provide at least one of environment_name or environment_uuid.'],
+                            'environment_uuid' => ['type' => 'string', 'description' => 'The environment UUID. You need to provide at least one of environment_name or environment_uuid.'],
                             'git_repository' => ['type' => 'string', 'description' => 'The git repository URL.'],
                             'git_branch' => ['type' => 'string', 'description' => 'The git branch.'],
                             'build_pack' => ['type' => 'string', 'enum' => ['nixpacks', 'static', 'dockerfile', 'dockercompose'], 'description' => 'The build pack type.'],
@@ -223,11 +224,12 @@ class ApplicationsController extends Controller
                     mediaType: 'application/json',
                     schema: new OA\Schema(
                         type: 'object',
-                        required: ['project_uuid', 'server_uuid', 'environment_name', 'github_app_uuid', 'git_repository', 'git_branch', 'build_pack', 'ports_exposes'],
+                        required: ['project_uuid', 'server_uuid', 'environment_name', 'environment_uuid', 'github_app_uuid', 'git_repository', 'git_branch', 'build_pack', 'ports_exposes'],
                         properties: [
                             'project_uuid' => ['type' => 'string', 'description' => 'The project UUID.'],
                             'server_uuid' => ['type' => 'string', 'description' => 'The server UUID.'],
-                            'environment_name' => ['type' => 'string', 'description' => 'The environment name.'],
+                            'environment_name' => ['type' => 'string', 'description' => 'The environment name. You need to provide at least one of environment_name or environment_uuid.'],
+                            'environment_uuid' => ['type' => 'string', 'description' => 'The environment UUID. You need to provide at least one of environment_name or environment_uuid.'],
                             'github_app_uuid' => ['type' => 'string', 'description' => 'The Github App UUID.'],
                             'git_repository' => ['type' => 'string', 'description' => 'The git repository URL.'],
                             'git_branch' => ['type' => 'string', 'description' => 'The git branch.'],
@@ -329,11 +331,12 @@ class ApplicationsController extends Controller
                     mediaType: 'application/json',
                     schema: new OA\Schema(
                         type: 'object',
-                        required: ['project_uuid', 'server_uuid', 'environment_name', 'private_key_uuid', 'git_repository', 'git_branch', 'build_pack', 'ports_exposes'],
+                        required: ['project_uuid', 'server_uuid', 'environment_name', 'environment_uuid', 'private_key_uuid', 'git_repository', 'git_branch', 'build_pack', 'ports_exposes'],
                         properties: [
                             'project_uuid' => ['type' => 'string', 'description' => 'The project UUID.'],
                             'server_uuid' => ['type' => 'string', 'description' => 'The server UUID.'],
-                            'environment_name' => ['type' => 'string', 'description' => 'The environment name.'],
+                            'environment_name' => ['type' => 'string', 'description' => 'The environment name. You need to provide at least one of environment_name or environment_uuid.'],
+                            'environment_uuid' => ['type' => 'string', 'description' => 'The environment UUID. You need to provide at least one of environment_name or environment_uuid.'],
                             'private_key_uuid' => ['type' => 'string', 'description' => 'The private key UUID.'],
                             'git_repository' => ['type' => 'string', 'description' => 'The git repository URL.'],
                             'git_branch' => ['type' => 'string', 'description' => 'The git branch.'],
@@ -435,11 +438,12 @@ class ApplicationsController extends Controller
                     mediaType: 'application/json',
                     schema: new OA\Schema(
                         type: 'object',
-                        required: ['project_uuid', 'server_uuid', 'environment_name', 'dockerfile'],
+                        required: ['project_uuid', 'server_uuid', 'environment_name', 'environment_uuid', 'dockerfile'],
                         properties: [
                             'project_uuid' => ['type' => 'string', 'description' => 'The project UUID.'],
                             'server_uuid' => ['type' => 'string', 'description' => 'The server UUID.'],
-                            'environment_name' => ['type' => 'string', 'description' => 'The environment name.'],
+                            'environment_name' => ['type' => 'string', 'description' => 'The environment name. You need to provide at least one of environment_name or environment_uuid.'],
+                            'environment_uuid' => ['type' => 'string', 'description' => 'The environment UUID. You need to provide at least one of environment_name or environment_uuid.'],
                             'dockerfile' => ['type' => 'string', 'description' => 'The Dockerfile content.'],
                             'build_pack' => ['type' => 'string', 'enum' => ['nixpacks', 'static', 'dockerfile', 'dockercompose'], 'description' => 'The build pack type.'],
                             'ports_exposes' => ['type' => 'string', 'description' => 'The ports to expose.'],
@@ -525,11 +529,12 @@ class ApplicationsController extends Controller
                     mediaType: 'application/json',
                     schema: new OA\Schema(
                         type: 'object',
-                        required: ['project_uuid', 'server_uuid', 'environment_name', 'docker_registry_image_name', 'ports_exposes'],
+                        required: ['project_uuid', 'server_uuid', 'environment_name', 'environment_uuid', 'docker_registry_image_name', 'ports_exposes'],
                         properties: [
                             'project_uuid' => ['type' => 'string', 'description' => 'The project UUID.'],
                             'server_uuid' => ['type' => 'string', 'description' => 'The server UUID.'],
-                            'environment_name' => ['type' => 'string', 'description' => 'The environment name.'],
+                            'environment_name' => ['type' => 'string', 'description' => 'The environment name. You need to provide at least one of environment_name or environment_uuid.'],
+                            'environment_uuid' => ['type' => 'string', 'description' => 'The environment UUID. You need to provide at least one of environment_name or environment_uuid.'],
                             'docker_registry_image_name' => ['type' => 'string', 'description' => 'The docker registry image name.'],
                             'docker_registry_image_tag' => ['type' => 'string', 'description' => 'The docker registry image tag.'],
                             'ports_exposes' => ['type' => 'string', 'description' => 'The ports to expose.'],
@@ -612,11 +617,12 @@ class ApplicationsController extends Controller
                     mediaType: 'application/json',
                     schema: new OA\Schema(
                         type: 'object',
-                        required: ['project_uuid', 'server_uuid', 'environment_name', 'docker_compose_raw'],
+                        required: ['project_uuid', 'server_uuid', 'environment_name', 'environment_uuid', 'docker_compose_raw'],
                         properties: [
                             'project_uuid' => ['type' => 'string', 'description' => 'The project UUID.'],
                             'server_uuid' => ['type' => 'string', 'description' => 'The server UUID.'],
-                            'environment_name' => ['type' => 'string', 'description' => 'The environment name.'],
+                            'environment_name' => ['type' => 'string', 'description' => 'The environment name. You need to provide at least one of environment_name or environment_uuid.'],
+                            'environment_uuid' => ['type' => 'string', 'description' => 'The environment UUID. You need to provide at least one of environment_name or environment_uuid.'],
                             'docker_compose_raw' => ['type' => 'string', 'description' => 'The Docker Compose raw content.'],
                             'destination_uuid' => ['type' => 'string', 'description' => 'The destination UUID if the server has more than one destinations.'],
                             'name' => ['type' => 'string', 'description' => 'The application name.'],
@@ -650,7 +656,7 @@ class ApplicationsController extends Controller
 
     private function create_application(Request $request, $type)
     {
-        $allowedFields = ['project_uuid', 'environment_name', 'server_uuid', 'destination_uuid', 'type', 'name', 'description', 'is_static', 'domains', 'git_repository', 'git_branch', 'git_commit_sha', 'private_key_uuid', 'docker_registry_image_name', 'docker_registry_image_tag', 'build_pack', 'install_command', 'build_command', 'start_command', 'ports_exposes', 'ports_mappings', 'base_directory', 'publish_directory', 'health_check_enabled', 'health_check_path', 'health_check_port', 'health_check_host', 'health_check_method', 'health_check_return_code', 'health_check_scheme', 'health_check_response_text', 'health_check_interval', 'health_check_timeout', 'health_check_retries', 'health_check_start_period', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'custom_labels', 'custom_docker_run_options', 'post_deployment_command', 'post_deployment_command_container', 'pre_deployment_command', 'pre_deployment_command_container',  'manual_webhook_secret_github', 'manual_webhook_secret_gitlab', 'manual_webhook_secret_bitbucket', 'manual_webhook_secret_gitea', 'redirect', 'github_app_uuid', 'instant_deploy', 'dockerfile', 'docker_compose_location', 'docker_compose_raw', 'docker_compose_custom_start_command', 'docker_compose_custom_build_command', 'docker_compose_domains', 'watch_paths', 'use_build_server', 'static_image', 'custom_nginx_configuration'];
+        $allowedFields = ['project_uuid', 'environment_name', 'environment_uuid', 'server_uuid', 'destination_uuid', 'type', 'name', 'description', 'is_static', 'domains', 'git_repository', 'git_branch', 'git_commit_sha', 'private_key_uuid', 'docker_registry_image_name', 'docker_registry_image_tag', 'build_pack', 'install_command', 'build_command', 'start_command', 'ports_exposes', 'ports_mappings', 'base_directory', 'publish_directory', 'health_check_enabled', 'health_check_path', 'health_check_port', 'health_check_host', 'health_check_method', 'health_check_return_code', 'health_check_scheme', 'health_check_response_text', 'health_check_interval', 'health_check_timeout', 'health_check_retries', 'health_check_start_period', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'custom_labels', 'custom_docker_run_options', 'post_deployment_command', 'post_deployment_command_container', 'pre_deployment_command', 'pre_deployment_command_container',  'manual_webhook_secret_github', 'manual_webhook_secret_gitlab', 'manual_webhook_secret_bitbucket', 'manual_webhook_secret_gitea', 'redirect', 'github_app_uuid', 'instant_deploy', 'dockerfile', 'docker_compose_location', 'docker_compose_raw', 'docker_compose_custom_start_command', 'docker_compose_custom_build_command', 'docker_compose_domains', 'watch_paths', 'use_build_server', 'static_image', 'custom_nginx_configuration'];
         $teamId = getTeamIdFromToken();
         if (is_null($teamId)) {
             return invalidTokenResponse();
@@ -664,7 +670,8 @@ class ApplicationsController extends Controller
             'name' => 'string|max:255',
             'description' => 'string|nullable',
             'project_uuid' => 'string|required',
-            'environment_name' => 'string|required',
+            'environment_name' => 'string|nullable',
+            'environment_uuid' => 'string|nullable',
             'server_uuid' => 'string|required',
             'destination_uuid' => 'string',
         ]);
@@ -684,6 +691,11 @@ class ApplicationsController extends Controller
             ], 422);
         }
 
+        $environmentUuid = $request->environment_uuid;
+        $environmentName = $request->environment_name;
+        if (blank($environmentUuid) && blank($environmentName)) {
+            return response()->json(['message' => 'You need to provide at least one of environment_name or environment_uuid.'], 422);
+        }
         $serverUuid = $request->server_uuid;
         $fqdn = $request->domains;
         $instantDeploy = $request->instant_deploy;
@@ -716,7 +728,10 @@ class ApplicationsController extends Controller
         if (! $project) {
             return response()->json(['message' => 'Project not found.'], 404);
         }
-        $environment = $project->environments()->where('name', $request->environment_name)->first();
+        $environment = $project->environments()->where('name', $environmentName)->first();
+        if (! $environment) {
+            $environment = $project->environments()->where('uuid', $environmentUuid)->first();
+        }
         if (! $environment) {
             return response()->json(['message' => 'Environment not found.'], 404);
         }
@@ -733,12 +748,6 @@ class ApplicationsController extends Controller
         }
         $destination = $destinations->first();
         if ($type === 'public') {
-            if (! $request->has('name')) {
-                $request->offsetSet('name', generate_application_name($request->git_repository, $request->git_branch));
-            }
-            if ($request->build_pack === 'dockercompose') {
-                $request->offsetSet('ports_exposes', '80');
-            }
             $validationRules = [
                 'git_repository' => 'string|required',
                 'git_branch' => 'string|required',
@@ -748,7 +757,7 @@ class ApplicationsController extends Controller
                 'docker_compose_raw' => 'string|nullable',
                 'docker_compose_domains' => 'array|nullable',
             ];
-            $validationRules = array_merge($validationRules, sharedDataApplications());
+            $validationRules = array_merge(sharedDataApplications(), $validationRules);
             $validator = customApiValidator($request->all(), $validationRules);
             if ($validator->fails()) {
                 return response()->json([
@@ -756,6 +765,12 @@ class ApplicationsController extends Controller
                     'errors' => $validator->errors(),
                 ], 422);
             }
+            if (! $request->has('name')) {
+                $request->offsetSet('name', generate_application_name($request->git_repository, $request->git_branch));
+            }
+            if ($request->build_pack === 'dockercompose') {
+                $request->offsetSet('ports_exposes', '80');
+            }
 
             $return = $this->validateDataApplications($request, $server);
             if ($return instanceof \Illuminate\Http\JsonResponse) {
@@ -820,12 +835,6 @@ class ApplicationsController extends Controller
                 'domains' => data_get($application, 'domains'),
             ]));
         } elseif ($type === 'private-gh-app') {
-            if (! $request->has('name')) {
-                $request->offsetSet('name', generate_application_name($request->git_repository, $request->git_branch));
-            }
-            if ($request->build_pack === 'dockercompose') {
-                $request->offsetSet('ports_exposes', '80');
-            }
             $validationRules = [
                 'git_repository' => 'string|required',
                 'git_branch' => 'string|required',
@@ -836,7 +845,7 @@ class ApplicationsController extends Controller
                 'docker_compose_location' => 'string',
                 'docker_compose_raw' => 'string|nullable',
             ];
-            $validationRules = array_merge($validationRules, sharedDataApplications());
+            $validationRules = array_merge(sharedDataApplications(), $validationRules);
 
             $validator = customApiValidator($request->all(), $validationRules);
             if ($validator->fails()) {
@@ -845,6 +854,14 @@ class ApplicationsController extends Controller
                     'errors' => $validator->errors(),
                 ], 422);
             }
+
+            if (! $request->has('name')) {
+                $request->offsetSet('name', generate_application_name($request->git_repository, $request->git_branch));
+            }
+            if ($request->build_pack === 'dockercompose') {
+                $request->offsetSet('ports_exposes', '80');
+            }
+
             $return = $this->validateDataApplications($request, $server);
             if ($return instanceof \Illuminate\Http\JsonResponse) {
                 return $return;
@@ -919,12 +936,6 @@ class ApplicationsController extends Controller
                 'domains' => data_get($application, 'domains'),
             ]));
         } elseif ($type === 'private-deploy-key') {
-            if (! $request->has('name')) {
-                $request->offsetSet('name', generate_application_name($request->git_repository, $request->git_branch));
-            }
-            if ($request->build_pack === 'dockercompose') {
-                $request->offsetSet('ports_exposes', '80');
-            }
 
             $validationRules = [
                 'git_repository' => 'string|required',
@@ -937,7 +948,7 @@ class ApplicationsController extends Controller
                 'docker_compose_raw' => 'string|nullable',
             ];
 
-            $validationRules = array_merge($validationRules, sharedDataApplications());
+            $validationRules = array_merge(sharedDataApplications(), $validationRules);
             $validator = customApiValidator($request->all(), $validationRules);
 
             if ($validator->fails()) {
@@ -946,6 +957,13 @@ class ApplicationsController extends Controller
                     'errors' => $validator->errors(),
                 ], 422);
             }
+            if (! $request->has('name')) {
+                $request->offsetSet('name', generate_application_name($request->git_repository, $request->git_branch));
+            }
+            if ($request->build_pack === 'dockercompose') {
+                $request->offsetSet('ports_exposes', '80');
+            }
+
             $return = $this->validateDataApplications($request, $server);
             if ($return instanceof \Illuminate\Http\JsonResponse) {
                 return $return;
@@ -1015,14 +1033,10 @@ class ApplicationsController extends Controller
                 'domains' => data_get($application, 'domains'),
             ]));
         } elseif ($type === 'dockerfile') {
-            if (! $request->has('name')) {
-                $request->offsetSet('name', 'dockerfile-'.new Cuid2);
-            }
-
             $validationRules = [
                 'dockerfile' => 'string|required',
             ];
-            $validationRules = array_merge($validationRules, sharedDataApplications());
+            $validationRules = array_merge(sharedDataApplications(), $validationRules);
             $validator = customApiValidator($request->all(), $validationRules);
 
             if ($validator->fails()) {
@@ -1031,6 +1045,10 @@ class ApplicationsController extends Controller
                     'errors' => $validator->errors(),
                 ], 422);
             }
+            if (! $request->has('name')) {
+                $request->offsetSet('name', 'dockerfile-'.new Cuid2);
+            }
+
             $return = $this->validateDataApplications($request, $server);
             if ($return instanceof \Illuminate\Http\JsonResponse) {
                 return $return;
@@ -1100,15 +1118,12 @@ class ApplicationsController extends Controller
                 'domains' => data_get($application, 'domains'),
             ]));
         } elseif ($type === 'dockerimage') {
-            if (! $request->has('name')) {
-                $request->offsetSet('name', 'docker-image-'.new Cuid2);
-            }
             $validationRules = [
                 'docker_registry_image_name' => 'string|required',
                 'docker_registry_image_tag' => 'string',
                 'ports_exposes' => 'string|regex:/^(\d+)(,\d+)*$/|required',
             ];
-            $validationRules = array_merge($validationRules, sharedDataApplications());
+            $validationRules = array_merge(sharedDataApplications(), $validationRules);
             $validator = customApiValidator($request->all(), $validationRules);
 
             if ($validator->fails()) {
@@ -1117,6 +1132,9 @@ class ApplicationsController extends Controller
                     'errors' => $validator->errors(),
                 ], 422);
             }
+            if (! $request->has('name')) {
+                $request->offsetSet('name', 'docker-image-'.new Cuid2);
+            }
             $return = $this->validateDataApplications($request, $server);
             if ($return instanceof \Illuminate\Http\JsonResponse) {
                 return $return;
@@ -1164,7 +1182,7 @@ class ApplicationsController extends Controller
                 'domains' => data_get($application, 'domains'),
             ]));
         } elseif ($type === 'dockercompose') {
-            $allowedFields = ['project_uuid', 'environment_name', 'server_uuid', 'destination_uuid', 'type', 'name', 'description', 'instant_deploy', 'docker_compose_raw'];
+            $allowedFields = ['project_uuid', 'environment_name', 'environment_uuid', 'server_uuid', 'destination_uuid', 'type', 'name', 'description', 'instant_deploy', 'docker_compose_raw'];
 
             $extraFields = array_diff(array_keys($request->all()), $allowedFields);
             if ($validator->fails() || ! empty($extraFields)) {
@@ -1186,7 +1204,7 @@ class ApplicationsController extends Controller
             $validationRules = [
                 'docker_compose_raw' => 'string|required',
             ];
-            $validationRules = array_merge($validationRules, sharedDataApplications());
+            $validationRules = array_merge(sharedDataApplications(), $validationRules);
             $validator = customApiValidator($request->all(), $validationRules);
 
             if ($validator->fails()) {
@@ -1554,7 +1572,7 @@ class ApplicationsController extends Controller
             'docker_compose_custom_build_command' => 'string|nullable',
             'custom_nginx_configuration' => 'string|nullable',
         ];
-        $validationRules = array_merge($validationRules, sharedDataApplications());
+        $validationRules = array_merge(sharedDataApplications(), $validationRules);
         $validator = customApiValidator($request->all(), $validationRules);
 
         // Validate ports_exposes
diff --git a/app/Http/Controllers/Api/DatabasesController.php b/app/Http/Controllers/Api/DatabasesController.php
index 917171e5c..504665f6a 100644
--- a/app/Http/Controllers/Api/DatabasesController.php
+++ b/app/Http/Controllers/Api/DatabasesController.php
@@ -523,11 +523,12 @@ class DatabasesController extends Controller
                 mediaType: 'application/json',
                 schema: new OA\Schema(
                     type: 'object',
-                    required: ['server_uuid', 'project_uuid', 'environment_name'],
+                    required: ['server_uuid', 'project_uuid', 'environment_name', 'environment_uuid'],
                     properties: [
                         'server_uuid' => ['type' => 'string', 'description' => 'UUID of the server'],
                         'project_uuid' => ['type' => 'string', 'description' => 'UUID of the project'],
-                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment'],
+                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'],
+                        'environment_uuid' => ['type' => 'string', 'description' => 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'],
                         'postgres_user' => ['type' => 'string', 'description' => 'PostgreSQL user'],
                         'postgres_password' => ['type' => 'string', 'description' => 'PostgreSQL password'],
                         'postgres_db' => ['type' => 'string', 'description' => 'PostgreSQL database'],
@@ -589,11 +590,12 @@ class DatabasesController extends Controller
                 mediaType: 'application/json',
                 schema: new OA\Schema(
                     type: 'object',
-                    required: ['server_uuid', 'project_uuid', 'environment_name'],
+                    required: ['server_uuid', 'project_uuid', 'environment_name', 'environment_uuid'],
                     properties: [
                         'server_uuid' => ['type' => 'string', 'description' => 'UUID of the server'],
                         'project_uuid' => ['type' => 'string', 'description' => 'UUID of the project'],
-                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment'],
+                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'],
+                        'environment_uuid' => ['type' => 'string', 'description' => 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'],
                         'destination_uuid' => ['type' => 'string',  'description' => 'UUID of the destination if the server has multiple destinations'],
                         'clickhouse_admin_user' => ['type' => 'string', 'description' => 'Clickhouse admin user'],
                         'clickhouse_admin_password' => ['type' => 'string', 'description' => 'Clickhouse admin password'],
@@ -651,11 +653,12 @@ class DatabasesController extends Controller
                 mediaType: 'application/json',
                 schema: new OA\Schema(
                     type: 'object',
-                    required: ['server_uuid', 'project_uuid', 'environment_name'],
+                    required: ['server_uuid', 'project_uuid', 'environment_name', 'environment_uuid'],
                     properties: [
                         'server_uuid' => ['type' => 'string', 'description' => 'UUID of the server'],
                         'project_uuid' => ['type' => 'string', 'description' => 'UUID of the project'],
-                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment'],
+                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'],
+                        'environment_uuid' => ['type' => 'string', 'description' => 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'],
                         'destination_uuid' => ['type' => 'string', 'description' => 'UUID of the destination if the server has multiple destinations'],
                         'dragonfly_password' => ['type' => 'string', 'description' => 'DragonFly password'],
                         'name' => ['type' => 'string', 'description' => 'Name of the database'],
@@ -712,11 +715,12 @@ class DatabasesController extends Controller
                 mediaType: 'application/json',
                 schema: new OA\Schema(
                     type: 'object',
-                    required: ['server_uuid', 'project_uuid', 'environment_name'],
+                    required: ['server_uuid', 'project_uuid', 'environment_name', 'environment_uuid'],
                     properties: [
                         'server_uuid' => ['type' => 'string', 'description' => 'UUID of the server'],
                         'project_uuid' => ['type' => 'string', 'description' => 'UUID of the project'],
-                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment'],
+                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'],
+                        'environment_uuid' => ['type' => 'string', 'description' => 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'],
                         'destination_uuid' => ['type' => 'string', 'description' => 'UUID of the destination if the server has multiple destinations'],
                         'redis_password' => ['type' => 'string', 'description' => 'Redis password'],
                         'redis_conf' => ['type' => 'string', 'description' => 'Redis conf'],
@@ -774,11 +778,12 @@ class DatabasesController extends Controller
                 mediaType: 'application/json',
                 schema: new OA\Schema(
                     type: 'object',
-                    required: ['server_uuid', 'project_uuid', 'environment_name'],
+                    required: ['server_uuid', 'project_uuid', 'environment_name', 'environment_uuid'],
                     properties: [
                         'server_uuid' => ['type' => 'string', 'description' => 'UUID of the server'],
                         'project_uuid' => ['type' => 'string', 'description' => 'UUID of the project'],
-                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment'],
+                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'],
+                        'environment_uuid' => ['type' => 'string', 'description' => 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'],
                         'destination_uuid' => ['type' => 'string', 'description' => 'UUID of the destination if the server has multiple destinations'],
                         'keydb_password' => ['type' => 'string', 'description' => 'KeyDB password'],
                         'keydb_conf' => ['type' => 'string', 'description' => 'KeyDB conf'],
@@ -836,11 +841,12 @@ class DatabasesController extends Controller
                 mediaType: 'application/json',
                 schema: new OA\Schema(
                     type: 'object',
-                    required: ['server_uuid', 'project_uuid', 'environment_name'],
+                    required: ['server_uuid', 'project_uuid', 'environment_name', 'environment_uuid'],
                     properties: [
                         'server_uuid' => ['type' => 'string', 'description' => 'UUID of the server'],
                         'project_uuid' => ['type' => 'string', 'description' => 'UUID of the project'],
-                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment'],
+                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'],
+                        'environment_uuid' => ['type' => 'string', 'description' => 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'],
                         'destination_uuid' => ['type' => 'string', 'description' => 'UUID of the destination if the server has multiple destinations'],
                         'mariadb_conf' => ['type' => 'string', 'description' => 'MariaDB conf'],
                         'mariadb_root_password' => ['type' => 'string', 'description' => 'MariaDB root password'],
@@ -901,11 +907,12 @@ class DatabasesController extends Controller
                 mediaType: 'application/json',
                 schema: new OA\Schema(
                     type: 'object',
-                    required: ['server_uuid', 'project_uuid', 'environment_name'],
+                    required: ['server_uuid', 'project_uuid', 'environment_name', 'environment_uuid'],
                     properties: [
                         'server_uuid' => ['type' => 'string', 'description' => 'UUID of the server'],
                         'project_uuid' => ['type' => 'string', 'description' => 'UUID of the project'],
-                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment'],
+                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'],
+                        'environment_uuid' => ['type' => 'string', 'description' => 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'],
                         'destination_uuid' => ['type' => 'string', 'description' => 'UUID of the destination if the server has multiple destinations'],
                         'mysql_root_password' => ['type' => 'string', 'description' => 'MySQL root password'],
                         'mysql_password' => ['type' => 'string', 'description' => 'MySQL password'],
@@ -966,11 +973,12 @@ class DatabasesController extends Controller
                 mediaType: 'application/json',
                 schema: new OA\Schema(
                     type: 'object',
-                    required: ['server_uuid', 'project_uuid', 'environment_name'],
+                    required: ['server_uuid', 'project_uuid', 'environment_name', 'environment_uuid'],
                     properties: [
                         'server_uuid' => ['type' => 'string', 'description' => 'UUID of the server'],
                         'project_uuid' => ['type' => 'string', 'description' => 'UUID of the project'],
-                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment'],
+                        'environment_name' => ['type' => 'string', 'description' => 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'],
+                        'environment_uuid' => ['type' => 'string', 'description' => 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'],
                         'destination_uuid' => ['type' => 'string', 'description' => 'UUID of the destination if the server has multiple destinations'],
                         'mongo_conf' => ['type' => 'string', 'description' => 'MongoDB conf'],
                         'mongo_initdb_root_username' => ['type' => 'string', 'description' => 'MongoDB initdb root username'],
@@ -1013,7 +1021,7 @@ class DatabasesController extends Controller
 
     public function create_database(Request $request, NewDatabaseTypes $type)
     {
-        $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'postgres_user', 'postgres_password', 'postgres_db', 'postgres_initdb_args', 'postgres_host_auth_method', 'postgres_conf', 'clickhouse_admin_user', 'clickhouse_admin_password', 'dragonfly_password', 'redis_password', 'redis_conf', 'keydb_password', 'keydb_conf', 'mariadb_conf', 'mariadb_root_password', 'mariadb_user', 'mariadb_password', 'mariadb_database', 'mongo_conf', 'mongo_initdb_root_username', 'mongo_initdb_root_password', 'mongo_initdb_database', 'mysql_root_password', 'mysql_password', 'mysql_user', 'mysql_database', 'mysql_conf'];
+        $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'environment_uuid', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'postgres_user', 'postgres_password', 'postgres_db', 'postgres_initdb_args', 'postgres_host_auth_method', 'postgres_conf', 'clickhouse_admin_user', 'clickhouse_admin_password', 'dragonfly_password', 'redis_password', 'redis_conf', 'keydb_password', 'keydb_conf', 'mariadb_conf', 'mariadb_root_password', 'mariadb_user', 'mariadb_password', 'mariadb_database', 'mongo_conf', 'mongo_initdb_root_username', 'mongo_initdb_root_password', 'mongo_initdb_database', 'mysql_root_password', 'mysql_password', 'mysql_user', 'mysql_database', 'mysql_conf'];
 
         $teamId = getTeamIdFromToken();
         if (is_null($teamId)) {
@@ -1039,6 +1047,11 @@ class DatabasesController extends Controller
                 'errors' => $errors,
             ], 422);
         }
+        $environmentUuid = $request->environment_uuid;
+        $environmentName = $request->environment_name;
+        if (blank($environmentUuid) && blank($environmentName)) {
+            return response()->json(['message' => 'You need to provide at least one of environment_name or environment_uuid.'], 422);
+        }
         $serverUuid = $request->server_uuid;
         $instantDeploy = $request->instant_deploy ?? false;
         if ($request->is_public && ! $request->public_port) {
@@ -1048,9 +1061,12 @@ class DatabasesController extends Controller
         if (! $project) {
             return response()->json(['message' => 'Project not found.'], 404);
         }
-        $environment = $project->environments()->where('name', $request->environment_name)->first();
+        $environment = $project->environments()->where('name', $environmentName)->first();
         if (! $environment) {
-            return response()->json(['message' => 'Environment not found.'], 404);
+            $environment = $project->environments()->where('uuid', $environmentUuid)->first();
+        }
+        if (! $environment) {
+            return response()->json(['message' => 'You need to provide a valid environment_name or environment_uuid.'], 422);
         }
         $server = Server::whereTeamId($teamId)->whereUuid($serverUuid)->first();
         if (! $server) {
@@ -1074,7 +1090,8 @@ class DatabasesController extends Controller
             'description' => 'string|nullable',
             'image' => 'string',
             'project_uuid' => 'string|required',
-            'environment_name' => 'string|required',
+            'environment_name' => 'string|nullable',
+            'environment_uuid' => 'string|nullable',
             'server_uuid' => 'string|required',
             'destination_uuid' => 'string',
             'is_public' => 'boolean',
@@ -1105,7 +1122,7 @@ class DatabasesController extends Controller
             }
         }
         if ($type === NewDatabaseTypes::POSTGRESQL) {
-            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'postgres_user', 'postgres_password', 'postgres_db', 'postgres_initdb_args', 'postgres_host_auth_method', 'postgres_conf'];
+            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'environment_uuid', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'postgres_user', 'postgres_password', 'postgres_db', 'postgres_initdb_args', 'postgres_host_auth_method', 'postgres_conf'];
             $validator = customApiValidator($request->all(), [
                 'postgres_user' => 'string',
                 'postgres_password' => 'string',
@@ -1164,7 +1181,7 @@ class DatabasesController extends Controller
 
             return response()->json(serializeApiResponse($payload))->setStatusCode(201);
         } elseif ($type === NewDatabaseTypes::MARIADB) {
-            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'mariadb_conf', 'mariadb_root_password', 'mariadb_user', 'mariadb_password', 'mariadb_database'];
+            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'environment_uuid', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'mariadb_conf', 'mariadb_root_password', 'mariadb_user', 'mariadb_password', 'mariadb_database'];
             $validator = customApiValidator($request->all(), [
                 'clickhouse_admin_user' => 'string',
                 'clickhouse_admin_password' => 'string',
@@ -1220,7 +1237,7 @@ class DatabasesController extends Controller
 
             return response()->json(serializeApiResponse($payload))->setStatusCode(201);
         } elseif ($type === NewDatabaseTypes::MYSQL) {
-            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'mysql_root_password', 'mysql_password', 'mysql_user', 'mysql_database', 'mysql_conf'];
+            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'environment_uuid', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'mysql_root_password', 'mysql_password', 'mysql_user', 'mysql_database', 'mysql_conf'];
             $validator = customApiValidator($request->all(), [
                 'mysql_root_password' => 'string',
                 'mysql_password' => 'string',
@@ -1279,7 +1296,7 @@ class DatabasesController extends Controller
 
             return response()->json(serializeApiResponse($payload))->setStatusCode(201);
         } elseif ($type === NewDatabaseTypes::REDIS) {
-            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'redis_password', 'redis_conf'];
+            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'environment_uuid', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'redis_password', 'redis_conf'];
             $validator = customApiValidator($request->all(), [
                 'redis_password' => 'string',
                 'redis_conf' => 'string',
@@ -1335,7 +1352,7 @@ class DatabasesController extends Controller
 
             return response()->json(serializeApiResponse($payload))->setStatusCode(201);
         } elseif ($type === NewDatabaseTypes::DRAGONFLY) {
-            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares',  'dragonfly_password'];
+            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'environment_uuid', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares',  'dragonfly_password'];
             $validator = customApiValidator($request->all(), [
                 'dragonfly_password' => 'string',
             ]);
@@ -1365,7 +1382,7 @@ class DatabasesController extends Controller
                 'uuid' => $database->uuid,
             ]))->setStatusCode(201);
         } elseif ($type === NewDatabaseTypes::KEYDB) {
-            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'keydb_password', 'keydb_conf'];
+            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'environment_uuid', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'keydb_password', 'keydb_conf'];
             $validator = customApiValidator($request->all(), [
                 'keydb_password' => 'string',
                 'keydb_conf' => 'string',
@@ -1421,7 +1438,7 @@ class DatabasesController extends Controller
 
             return response()->json(serializeApiResponse($payload))->setStatusCode(201);
         } elseif ($type === NewDatabaseTypes::CLICKHOUSE) {
-            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares',  'clickhouse_admin_user', 'clickhouse_admin_password'];
+            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'environment_uuid', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares',  'clickhouse_admin_user', 'clickhouse_admin_password'];
             $validator = customApiValidator($request->all(), [
                 'clickhouse_admin_user' => 'string',
                 'clickhouse_admin_password' => 'string',
@@ -1457,7 +1474,7 @@ class DatabasesController extends Controller
 
             return response()->json(serializeApiResponse($payload))->setStatusCode(201);
         } elseif ($type === NewDatabaseTypes::MONGODB) {
-            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'mongo_conf', 'mongo_initdb_root_username', 'mongo_initdb_root_password', 'mongo_initdb_database'];
+            $allowedFields = ['name', 'description', 'image', 'public_port', 'is_public', 'project_uuid', 'environment_name', 'environment_uuid', 'server_uuid', 'destination_uuid', 'instant_deploy', 'limits_memory', 'limits_memory_swap', 'limits_memory_swappiness', 'limits_memory_reservation', 'limits_cpus', 'limits_cpuset', 'limits_cpu_shares', 'mongo_conf', 'mongo_initdb_root_username', 'mongo_initdb_root_password', 'mongo_initdb_database'];
             $validator = customApiValidator($request->all(), [
                 'mongo_conf' => 'string',
                 'mongo_initdb_root_username' => 'string',
diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index 1d89c82ed..15795e241 100644
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -102,16 +102,16 @@ class ProjectController extends Controller
 
     #[OA\Get(
         summary: 'Environment',
-        description: 'Get environment by name.',
-        path: '/projects/{uuid}/{environment_name}',
-        operationId: 'get-environment-by-name',
+        description: 'Get environment by name or UUID.',
+        path: '/projects/{uuid}/{environment_name_or_uuid}',
+        operationId: 'get-environment-by-name-or-uuid',
         security: [
             ['bearerAuth' => []],
         ],
         tags: ['Projects'],
         parameters: [
             new OA\Parameter(name: 'uuid', in: 'path', required: true, description: 'Project UUID', schema: new OA\Schema(type: 'string')),
-            new OA\Parameter(name: 'environment_name', in: 'path', required: true, description: 'Environment name', schema: new OA\Schema(type: 'string')),
+            new OA\Parameter(name: 'environment_name_or_uuid', in: 'path', required: true, description: 'Environment name or UUID', schema: new OA\Schema(type: 'string')),
         ],
         responses: [
             new OA\Response(
@@ -141,14 +141,17 @@ class ProjectController extends Controller
         if (! $request->uuid) {
             return response()->json(['message' => 'UUID is required.'], 422);
         }
-        if (! $request->environment_name) {
-            return response()->json(['message' => 'Environment name is required.'], 422);
+        if (! $request->environment_name_or_uuid) {
+            return response()->json(['message' => 'Environment name or UUID is required.'], 422);
         }
         $project = Project::whereTeamId($teamId)->whereUuid($request->uuid)->first();
         if (! $project) {
             return response()->json(['message' => 'Project not found.'], 404);
         }
-        $environment = $project->environments()->whereName($request->environment_name)->first();
+        $environment = $project->environments()->whereName($request->environment_name_or_uuid)->first();
+        if (! $environment) {
+            $environment = $project->environments()->whereUuid($request->environment_name_or_uuid)->first();
+        }
         if (! $environment) {
             return response()->json(['message' => 'Environment not found.'], 404);
         }
diff --git a/app/Http/Controllers/Api/ServicesController.php b/app/Http/Controllers/Api/ServicesController.php
index f5ecdcf28..03d9d209c 100644
--- a/app/Http/Controllers/Api/ServicesController.php
+++ b/app/Http/Controllers/Api/ServicesController.php
@@ -102,7 +102,7 @@ class ServicesController extends Controller
                 mediaType: 'application/json',
                 schema: new OA\Schema(
                     type: 'object',
-                    required: ['server_uuid', 'project_uuid', 'environment_name', 'type'],
+                    required: ['server_uuid', 'project_uuid', 'environment_name', 'environment_uuid', 'type'],
                     properties: [
                         'type' => [
                             'description' => 'The one-click service type',
@@ -199,7 +199,8 @@ class ServicesController extends Controller
                         'name' => ['type' => 'string', 'maxLength' => 255, 'description' => 'Name of the service.'],
                         'description' => ['type' => 'string', 'nullable' => true, 'description' => 'Description of the service.'],
                         'project_uuid' => ['type' => 'string', 'description' => 'Project UUID.'],
-                        'environment_name' => ['type' => 'string', 'description' => 'Environment name.'],
+                        'environment_name' => ['type' => 'string', 'description' => 'Environment name. You need to provide at least one of environment_name or environment_uuid.'],
+                        'environment_uuid' => ['type' => 'string', 'description' => 'Environment UUID. You need to provide at least one of environment_name or environment_uuid.'],
                         'server_uuid' => ['type' => 'string', 'description' => 'Server UUID.'],
                         'destination_uuid' => ['type' => 'string', 'description' => 'Destination UUID. Required if server has multiple destinations.'],
                         'instant_deploy' => ['type' => 'boolean', 'default' => false, 'description' => 'Start the service immediately after creation.'],
@@ -236,7 +237,7 @@ class ServicesController extends Controller
     )]
     public function create_service(Request $request)
     {
-        $allowedFields = ['type', 'name', 'description', 'project_uuid', 'environment_name', 'server_uuid', 'destination_uuid', 'instant_deploy'];
+        $allowedFields = ['type', 'name', 'description', 'project_uuid', 'environment_name', 'environment_uuid', 'server_uuid', 'destination_uuid', 'instant_deploy'];
 
         $teamId = getTeamIdFromToken();
         if (is_null($teamId)) {
@@ -250,7 +251,8 @@ class ServicesController extends Controller
         $validator = customApiValidator($request->all(), [
             'type' => 'string|required',
             'project_uuid' => 'string|required',
-            'environment_name' => 'string|required',
+            'environment_name' => 'string|nullable',
+            'environment_uuid' => 'string|nullable',
             'server_uuid' => 'string|required',
             'destination_uuid' => 'string',
             'name' => 'string|max:255',
@@ -272,6 +274,11 @@ class ServicesController extends Controller
                 'errors' => $errors,
             ], 422);
         }
+        $environmentUuid = $request->environment_uuid;
+        $environmentName = $request->environment_name;
+        if (blank($environmentUuid) && blank($environmentName)) {
+            return response()->json(['message' => 'You need to provide at least one of environment_name or environment_uuid.'], 422);
+        }
         $serverUuid = $request->server_uuid;
         $instantDeploy = $request->instant_deploy ?? false;
         if ($request->is_public && ! $request->public_port) {
@@ -281,7 +288,10 @@ class ServicesController extends Controller
         if (! $project) {
             return response()->json(['message' => 'Project not found.'], 404);
         }
-        $environment = $project->environments()->where('name', $request->environment_name)->first();
+        $environment = $project->environments()->where('name', $environmentName)->first();
+        if (! $environment) {
+            $environment = $project->environments()->where('uuid', $environmentUuid)->first();
+        }
         if (! $environment) {
             return response()->json(['message' => 'Environment not found.'], 404);
         }
@@ -349,7 +359,11 @@ class ServicesController extends Controller
                 }
                 $domains = $service->applications()->get()->pluck('fqdn')->sort();
                 $domains = $domains->map(function ($domain) {
-                    return str($domain)->beforeLast(':')->value();
+                    if (count(explode(':', $domain)) > 2) {
+                        return str($domain)->beforeLast(':')->value();
+                    }
+
+                    return $domain;
                 });
 
                 return response()->json([
diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 6b677fa0e..7e4155338 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -1405,7 +1405,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
                 'project_uuid' => data_get($this->application, 'environment.project.uuid'),
                 'application_uuid' => data_get($this->application, 'uuid'),
                 'deployment_uuid' => $deployment_uuid,
-                'environment_name' => data_get($this->application, 'environment.name'),
+                'environment_uuid' => data_get($this->application, 'environment.uuid'),
             ]));
         }
     }
diff --git a/app/Livewire/Project/Application/Configuration.php b/app/Livewire/Project/Application/Configuration.php
index 514fe3326..56e0caf75 100644
--- a/app/Livewire/Project/Application/Configuration.php
+++ b/app/Livewire/Project/Application/Configuration.php
@@ -21,7 +21,6 @@ class Configuration extends Component
 
     public function mount()
     {
-
         $this->currentRoute = request()->route()->getName();
         $project = currentTeam()
             ->projects()
@@ -29,7 +28,7 @@ class Configuration extends Component
             ->where('uuid', request()->route('project_uuid'))
             ->firstOrFail();
         $environment = $project->environments()
-            ->select('id', 'name', 'project_id')
+            ->select('id', 'uuid', 'name', 'project_id')
             ->where('uuid', request()->route('environment_uuid'))
             ->firstOrFail();
         $application = $environment->applications()
@@ -40,7 +39,6 @@ class Configuration extends Component
         $this->project = $project;
         $this->environment = $environment;
         $this->application = $application;
-
     }
 
     public function render()
diff --git a/app/Livewire/Project/Application/Deployment/Show.php b/app/Livewire/Project/Application/Deployment/Show.php
index dba0d8ae5..4e86b5c7e 100644
--- a/app/Livewire/Project/Application/Deployment/Show.php
+++ b/app/Livewire/Project/Application/Deployment/Show.php
@@ -34,14 +34,6 @@ class Show extends Component
         if (! $application) {
             return redirect()->route('dashboard');
         }
-        // $activity = Activity::where('properties->type_uuid', '=', $deploymentUuid)->first();
-        // if (!$activity) {
-        //     return redirect()->route('project.application.deployment.index', [
-        //         'project_uuid' => $project->uuid,
-        //         'environment_name' => $environment->name,
-        //         'application_uuid' => $application->uuid,
-        //     ]);
-        // }
         $application_deployment_queue = ApplicationDeploymentQueue::where('deployment_uuid', $deploymentUuid)->first();
         if (! $application_deployment_queue) {
             return redirect()->route('project.application.deployment.index', [
diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php
index c48b676f1..0afc9123a 100644
--- a/app/Livewire/Project/Application/Heading.php
+++ b/app/Livewire/Project/Application/Heading.php
@@ -38,7 +38,7 @@ class Heading extends Component
     {
         $this->parameters = [
             'project_uuid' => $this->application->project()->uuid,
-            'environment_name' => $this->application->environment->name,
+            'environment_uuid' => $this->application->environment->uuid,
             'application_uuid' => $this->application->uuid,
         ];
         $lastDeployment = $this->application->get_last_successful_deployment();
diff --git a/app/Livewire/Project/Database/Configuration.php b/app/Livewire/Project/Database/Configuration.php
index 96dbec769..938abba54 100644
--- a/app/Livewire/Project/Database/Configuration.php
+++ b/app/Livewire/Project/Database/Configuration.php
@@ -24,7 +24,7 @@ class Configuration extends Component
             ->where('uuid', request()->route('project_uuid'))
             ->firstOrFail();
         $environment = $project->environments()
-            ->select('id', 'name', 'project_id')
+            ->select('id', 'name', 'project_id', 'uuid')
             ->where('uuid', request()->route('environment_uuid'))
             ->firstOrFail();
         $database = $environment->databases()
diff --git a/app/Livewire/Project/Resource/Index.php b/app/Livewire/Project/Resource/Index.php
index 9146c65ed..2b199dcfd 100644
--- a/app/Livewire/Project/Resource/Index.php
+++ b/app/Livewire/Project/Resource/Index.php
@@ -4,6 +4,7 @@ namespace App\Livewire\Project\Resource;
 
 use App\Models\Environment;
 use App\Models\Project;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class Index extends Component
@@ -12,39 +13,42 @@ class Index extends Component
 
     public Environment $environment;
 
-    public $applications = [];
+    public Collection $applications;
 
-    public $postgresqls = [];
+    public Collection $postgresqls;
 
-    public $redis = [];
+    public Collection $redis;
 
-    public $mongodbs = [];
+    public Collection $mongodbs;
 
-    public $mysqls = [];
+    public Collection $mysqls;
 
-    public $mariadbs = [];
+    public Collection $mariadbs;
 
-    public $keydbs = [];
+    public Collection $keydbs;
 
-    public $dragonflies = [];
+    public Collection $dragonflies;
 
-    public $clickhouses = [];
+    public Collection $clickhouses;
 
-    public $services = [];
+    public Collection $services;
 
     public array $parameters;
 
     public function mount()
     {
+        $this->applications = $this->postgresqls = $this->redis = $this->mongodbs = $this->mysqls = $this->mariadbs = $this->keydbs = $this->dragonflies = $this->clickhouses = $this->services = collect();
         $this->parameters = get_route_parameters();
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (! $project) {
-            return redirect()->route('dashboard');
-        }
-        $environment = $project->load(['environments'])->environments->where('uuid', request()->route('environment_uuid'))->first();
-        if (! $environment) {
-            return redirect()->route('dashboard');
-        }
+        $project = currentTeam()
+            ->projects()
+            ->select('id', 'uuid', 'team_id', 'name')
+            ->where('uuid', request()->route('project_uuid'))
+            ->firstOrFail();
+        $environment = $project->environments()
+            ->select('id', 'uuid', 'name', 'project_id')
+            ->where('uuid', request()->route('environment_uuid'))
+            ->firstOrFail();
+
         $this->project = $project;
         $this->environment = $environment->loadCount([
             'applications',
@@ -69,9 +73,9 @@ class Index extends Component
         ])->get()->sortBy('name');
         $this->applications = $this->applications->map(function ($application) {
             $application->hrefLink = route('project.application.configuration', [
-                    'project_uuid' => data_get($application, 'environment.project.uuid'),
-                    'environment_uuid' => data_get($application, 'environment.uuid'),
-                    'application_uuid' => data_get($application, 'uuid'),
+                'project_uuid' => data_get($application, 'environment.project.uuid'),
+                'environment_uuid' => data_get($application, 'environment.uuid'),
+                'application_uuid' => data_get($application, 'uuid'),
             ]);
 
             return $application;
@@ -89,14 +93,6 @@ class Index extends Component
             'clickhouses' => 'clickhouses',
         ];
 
-        // Load all server-related data first to prevent duplicate queries
-        $serverData = $this->environment->applications()
-            ->with(['destination.server.settings'])
-            ->get()
-            ->pluck('destination.server')
-            ->filter()
-            ->unique('id');
-
         foreach ($databaseTypes as $property => $relation) {
             $this->{$property} = $this->environment->{$relation}()->with([
                 'tags',
@@ -108,6 +104,7 @@ class Index extends Component
                     'database_uuid' => $db->uuid,
                     'environment_uuid' => data_get($this->environment, 'uuid'),
                 ]);
+
                 return $db;
             });
         }
@@ -119,10 +116,11 @@ class Index extends Component
         ])->get()->sortBy('name');
         $this->services = $this->services->map(function ($service) {
             $service->hrefLink = route('project.service.configuration', [
-                    'project_uuid' => data_get($service, 'environment.project.uuid'),
-                    'environment_uuid' => data_get($service, 'environment.uuid'),
-                    'service_uuid' => data_get($service, 'uuid'),
+                'project_uuid' => data_get($service, 'environment.project.uuid'),
+                'environment_uuid' => data_get($service, 'environment.uuid'),
+                'service_uuid' => data_get($service, 'uuid'),
             ]);
+
             return $service;
         });
     }
diff --git a/app/Livewire/Project/Service/Configuration.php b/app/Livewire/Project/Service/Configuration.php
index 99a0dea7f..4a5e8627f 100644
--- a/app/Livewire/Project/Service/Configuration.php
+++ b/app/Livewire/Project/Service/Configuration.php
@@ -52,8 +52,8 @@ class Configuration extends Component
             ->where('uuid', request()->route('project_uuid'))
             ->firstOrFail();
         $environment = $project->environments()
-            ->select('id', 'name', 'project_id')
-            ->where('name', request()->route('environment_name'))
+            ->select('id', 'uuid', 'name', 'project_id')
+            ->where('uuid', request()->route('environment_uuid'))
             ->firstOrFail();
         $this->service = $environment->services()->whereUuid(request()->route('service_uuid'))->firstOrFail();
 
diff --git a/app/Models/Environment.php b/app/Models/Environment.php
index 71e8bbd21..b8f1090d8 100644
--- a/app/Models/Environment.php
+++ b/app/Models/Environment.php
@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Casts\Attribute;
-use Illuminate\Database\Eloquent\Model;
 use OpenApi\Attributes as OA;
 
 #[OA\Schema(
@@ -18,7 +17,7 @@ use OpenApi\Attributes as OA;
         'description' => ['type' => 'string'],
     ]
 )]
-class Environment extends Model
+class Environment extends BaseModel
 {
     protected $guarded = [];
 
diff --git a/app/Notifications/Application/StatusChanged.php b/app/Notifications/Application/StatusChanged.php
index 98cdc7ee6..669f6e584 100644
--- a/app/Notifications/Application/StatusChanged.php
+++ b/app/Notifications/Application/StatusChanged.php
@@ -17,6 +17,8 @@ class StatusChanged extends CustomEmailNotification
 
     public string $environment_uuid;
 
+    public string $environment_name;
+
     public ?string $resource_url = null;
 
     public ?string $fqdn;
@@ -27,6 +29,7 @@ class StatusChanged extends CustomEmailNotification
         $this->resource_name = data_get($resource, 'name');
         $this->project_uuid = data_get($resource, 'environment.project.uuid');
         $this->environment_uuid = data_get($resource, 'environment.uuid');
+        $this->environment_name = data_get($resource, 'environment.name');
         $this->fqdn = data_get($resource, 'fqdn', null);
         if (str($this->fqdn)->explode(',')->count() > 1) {
             $this->fqdn = str($this->fqdn)->explode(',')->first();
@@ -80,7 +83,7 @@ class StatusChanged extends CustomEmailNotification
 
     public function toPushover(): PushoverMessage
     {
-        $message = $this->resource_name . ' has been stopped.';
+        $message = $this->resource_name.' has been stopped.';
 
         return new PushoverMessage(
             title: 'Application stopped',
diff --git a/bootstrap/helpers/api.php b/bootstrap/helpers/api.php
index 875866e2f..307c7ed1b 100644
--- a/bootstrap/helpers/api.php
+++ b/bootstrap/helpers/api.php
@@ -166,6 +166,7 @@ function removeUnnecessaryFieldsFromRequest(Request $request)
 {
     $request->offsetUnset('project_uuid');
     $request->offsetUnset('environment_name');
+    $request->offsetUnset('environment_uuid');
     $request->offsetUnset('destination_uuid');
     $request->offsetUnset('server_uuid');
     $request->offsetUnset('type');
diff --git a/openapi.json b/openapi.json
index 5d35331ec..2834e0c8b 100644
--- a/openapi.json
+++ b/openapi.json
@@ -65,6 +65,7 @@
                                     "project_uuid",
                                     "server_uuid",
                                     "environment_name",
+                                    "environment_uuid",
                                     "git_repository",
                                     "git_branch",
                                     "build_pack",
@@ -81,7 +82,11 @@
                                     },
                                     "environment_name": {
                                         "type": "string",
-                                        "description": "The environment name."
+                                        "description": "The environment name. You need to provide at least one of environment_name or environment_uuid."
+                                    },
+                                    "environment_uuid": {
+                                        "type": "string",
+                                        "description": "The environment UUID. You need to provide at least one of environment_name or environment_uuid."
                                     },
                                     "git_repository": {
                                         "type": "string",
@@ -377,6 +382,7 @@
                                     "project_uuid",
                                     "server_uuid",
                                     "environment_name",
+                                    "environment_uuid",
                                     "github_app_uuid",
                                     "git_repository",
                                     "git_branch",
@@ -394,7 +400,11 @@
                                     },
                                     "environment_name": {
                                         "type": "string",
-                                        "description": "The environment name."
+                                        "description": "The environment name. You need to provide at least one of environment_name or environment_uuid."
+                                    },
+                                    "environment_uuid": {
+                                        "type": "string",
+                                        "description": "The environment UUID. You need to provide at least one of environment_name or environment_uuid."
                                     },
                                     "github_app_uuid": {
                                         "type": "string",
@@ -694,6 +704,7 @@
                                     "project_uuid",
                                     "server_uuid",
                                     "environment_name",
+                                    "environment_uuid",
                                     "private_key_uuid",
                                     "git_repository",
                                     "git_branch",
@@ -711,7 +722,11 @@
                                     },
                                     "environment_name": {
                                         "type": "string",
-                                        "description": "The environment name."
+                                        "description": "The environment name. You need to provide at least one of environment_name or environment_uuid."
+                                    },
+                                    "environment_uuid": {
+                                        "type": "string",
+                                        "description": "The environment UUID. You need to provide at least one of environment_name or environment_uuid."
                                     },
                                     "private_key_uuid": {
                                         "type": "string",
@@ -1011,6 +1026,7 @@
                                     "project_uuid",
                                     "server_uuid",
                                     "environment_name",
+                                    "environment_uuid",
                                     "dockerfile"
                                 ],
                                 "properties": {
@@ -1024,7 +1040,11 @@
                                     },
                                     "environment_name": {
                                         "type": "string",
-                                        "description": "The environment name."
+                                        "description": "The environment name. You need to provide at least one of environment_name or environment_uuid."
+                                    },
+                                    "environment_uuid": {
+                                        "type": "string",
+                                        "description": "The environment UUID. You need to provide at least one of environment_name or environment_uuid."
                                     },
                                     "dockerfile": {
                                         "type": "string",
@@ -1257,6 +1277,7 @@
                                     "project_uuid",
                                     "server_uuid",
                                     "environment_name",
+                                    "environment_uuid",
                                     "docker_registry_image_name",
                                     "ports_exposes"
                                 ],
@@ -1271,7 +1292,11 @@
                                     },
                                     "environment_name": {
                                         "type": "string",
-                                        "description": "The environment name."
+                                        "description": "The environment name. You need to provide at least one of environment_name or environment_uuid."
+                                    },
+                                    "environment_uuid": {
+                                        "type": "string",
+                                        "description": "The environment UUID. You need to provide at least one of environment_name or environment_uuid."
                                     },
                                     "docker_registry_image_name": {
                                         "type": "string",
@@ -1486,6 +1511,7 @@
                                     "project_uuid",
                                     "server_uuid",
                                     "environment_name",
+                                    "environment_uuid",
                                     "docker_compose_raw"
                                 ],
                                 "properties": {
@@ -1499,7 +1525,11 @@
                                     },
                                     "environment_name": {
                                         "type": "string",
-                                        "description": "The environment name."
+                                        "description": "The environment name. You need to provide at least one of environment_name or environment_uuid."
+                                    },
+                                    "environment_uuid": {
+                                        "type": "string",
+                                        "description": "The environment UUID. You need to provide at least one of environment_name or environment_uuid."
                                     },
                                     "docker_compose_raw": {
                                         "type": "string",
@@ -3079,7 +3109,8 @@
                                 "required": [
                                     "server_uuid",
                                     "project_uuid",
-                                    "environment_name"
+                                    "environment_name",
+                                    "environment_uuid"
                                 ],
                                 "properties": {
                                     "server_uuid": {
@@ -3092,7 +3123,11 @@
                                     },
                                     "environment_name": {
                                         "type": "string",
-                                        "description": "Name of the environment"
+                                        "description": "Name of the environment. You need to provide at least one of environment_name or environment_uuid."
+                                    },
+                                    "environment_uuid": {
+                                        "type": "string",
+                                        "description": "UUID of the environment. You need to provide at least one of environment_name or environment_uuid."
                                     },
                                     "postgres_user": {
                                         "type": "string",
@@ -3215,7 +3250,8 @@
                                 "required": [
                                     "server_uuid",
                                     "project_uuid",
-                                    "environment_name"
+                                    "environment_name",
+                                    "environment_uuid"
                                 ],
                                 "properties": {
                                     "server_uuid": {
@@ -3228,7 +3264,11 @@
                                     },
                                     "environment_name": {
                                         "type": "string",
-                                        "description": "Name of the environment"
+                                        "description": "Name of the environment. You need to provide at least one of environment_name or environment_uuid."
+                                    },
+                                    "environment_uuid": {
+                                        "type": "string",
+                                        "description": "UUID of the environment. You need to provide at least one of environment_name or environment_uuid."
                                     },
                                     "destination_uuid": {
                                         "type": "string",
@@ -3335,7 +3375,8 @@
                                 "required": [
                                     "server_uuid",
                                     "project_uuid",
-                                    "environment_name"
+                                    "environment_name",
+                                    "environment_uuid"
                                 ],
                                 "properties": {
                                     "server_uuid": {
@@ -3348,7 +3389,11 @@
                                     },
                                     "environment_name": {
                                         "type": "string",
-                                        "description": "Name of the environment"
+                                        "description": "Name of the environment. You need to provide at least one of environment_name or environment_uuid."
+                                    },
+                                    "environment_uuid": {
+                                        "type": "string",
+                                        "description": "UUID of the environment. You need to provide at least one of environment_name or environment_uuid."
                                     },
                                     "destination_uuid": {
                                         "type": "string",
@@ -3451,7 +3496,8 @@
                                 "required": [
                                     "server_uuid",
                                     "project_uuid",
-                                    "environment_name"
+                                    "environment_name",
+                                    "environment_uuid"
                                 ],
                                 "properties": {
                                     "server_uuid": {
@@ -3464,7 +3510,11 @@
                                     },
                                     "environment_name": {
                                         "type": "string",
-                                        "description": "Name of the environment"
+                                        "description": "Name of the environment. You need to provide at least one of environment_name or environment_uuid."
+                                    },
+                                    "environment_uuid": {
+                                        "type": "string",
+                                        "description": "UUID of the environment. You need to provide at least one of environment_name or environment_uuid."
                                     },
                                     "destination_uuid": {
                                         "type": "string",
@@ -3571,7 +3621,8 @@
                                 "required": [
                                     "server_uuid",
                                     "project_uuid",
-                                    "environment_name"
+                                    "environment_name",
+                                    "environment_uuid"
                                 ],
                                 "properties": {
                                     "server_uuid": {
@@ -3584,7 +3635,11 @@
                                     },
                                     "environment_name": {
                                         "type": "string",
-                                        "description": "Name of the environment"
+                                        "description": "Name of the environment. You need to provide at least one of environment_name or environment_uuid."
+                                    },
+                                    "environment_uuid": {
+                                        "type": "string",
+                                        "description": "UUID of the environment. You need to provide at least one of environment_name or environment_uuid."
                                     },
                                     "destination_uuid": {
                                         "type": "string",
@@ -3691,7 +3746,8 @@
                                 "required": [
                                     "server_uuid",
                                     "project_uuid",
-                                    "environment_name"
+                                    "environment_name",
+                                    "environment_uuid"
                                 ],
                                 "properties": {
                                     "server_uuid": {
@@ -3704,7 +3760,11 @@
                                     },
                                     "environment_name": {
                                         "type": "string",
-                                        "description": "Name of the environment"
+                                        "description": "Name of the environment. You need to provide at least one of environment_name or environment_uuid."
+                                    },
+                                    "environment_uuid": {
+                                        "type": "string",
+                                        "description": "UUID of the environment. You need to provide at least one of environment_name or environment_uuid."
                                     },
                                     "destination_uuid": {
                                         "type": "string",
@@ -3823,7 +3883,8 @@
                                 "required": [
                                     "server_uuid",
                                     "project_uuid",
-                                    "environment_name"
+                                    "environment_name",
+                                    "environment_uuid"
                                 ],
                                 "properties": {
                                     "server_uuid": {
@@ -3836,7 +3897,11 @@
                                     },
                                     "environment_name": {
                                         "type": "string",
-                                        "description": "Name of the environment"
+                                        "description": "Name of the environment. You need to provide at least one of environment_name or environment_uuid."
+                                    },
+                                    "environment_uuid": {
+                                        "type": "string",
+                                        "description": "UUID of the environment. You need to provide at least one of environment_name or environment_uuid."
                                     },
                                     "destination_uuid": {
                                         "type": "string",
@@ -3955,7 +4020,8 @@
                                 "required": [
                                     "server_uuid",
                                     "project_uuid",
-                                    "environment_name"
+                                    "environment_name",
+                                    "environment_uuid"
                                 ],
                                 "properties": {
                                     "server_uuid": {
@@ -3968,7 +4034,11 @@
                                     },
                                     "environment_name": {
                                         "type": "string",
-                                        "description": "Name of the environment"
+                                        "description": "Name of the environment. You need to provide at least one of environment_name or environment_uuid."
+                                    },
+                                    "environment_uuid": {
+                                        "type": "string",
+                                        "description": "UUID of the environment. You need to provide at least one of environment_name or environment_uuid."
                                     },
                                     "destination_uuid": {
                                         "type": "string",
@@ -4808,14 +4878,14 @@
                 ]
             }
         },
-        "\/projects\/{uuid}\/{environment_name}": {
+        "\/projects\/{uuid}\/{environment_name_or_uuid}": {
             "get": {
                 "tags": [
                     "Projects"
                 ],
                 "summary": "Environment",
-                "description": "Get environment by name.",
-                "operationId": "get-environment-by-name",
+                "description": "Get environment by name or UUID.",
+                "operationId": "get-environment-by-name-or-uuid",
                 "parameters": [
                     {
                         "name": "uuid",
@@ -4827,9 +4897,9 @@
                         }
                     },
                     {
-                        "name": "environment_name",
+                        "name": "environment_name_or_uuid",
                         "in": "path",
-                        "description": "Environment name",
+                        "description": "Environment name or UUID",
                         "required": true,
                         "schema": {
                             "type": "string"
@@ -5724,6 +5794,7 @@
                                     "server_uuid",
                                     "project_uuid",
                                     "environment_name",
+                                    "environment_uuid",
                                     "type"
                                 ],
                                 "properties": {
@@ -5835,7 +5906,11 @@
                                     },
                                     "environment_name": {
                                         "type": "string",
-                                        "description": "Environment name."
+                                        "description": "Environment name. You need to provide at least one of environment_name or environment_uuid."
+                                    },
+                                    "environment_uuid": {
+                                        "type": "string",
+                                        "description": "Environment UUID. You need to provide at least one of environment_name or environment_uuid."
                                     },
                                     "server_uuid": {
                                         "type": "string",
@@ -7282,13 +7357,10 @@
                     "uuid": {
                         "type": "string"
                     },
-                    "application_id": {
-                        "type": "integer"
+                    "resourceable_type": {
+                        "type": "string"
                     },
-                    "service_id": {
-                        "type": "integer"
-                    },
-                    "database_id": {
+                    "resourceable_id": {
                         "type": "integer"
                     },
                     "is_build_time": {
@@ -7684,174 +7756,14 @@
                         "type": "string",
                         "description": "The date and time the team was last updated."
                     },
-                    "smtp_enabled": {
-                        "type": "boolean",
-                        "description": "Whether SMTP is enabled or not."
-                    },
-                    "smtp_from_address": {
-                        "type": "string",
-                        "description": "The email address to send emails from."
-                    },
-                    "smtp_from_name": {
-                        "type": "string",
-                        "description": "The name to send emails from."
-                    },
-                    "smtp_recipients": {
-                        "type": "string",
-                        "description": "The email addresses to send emails to."
-                    },
-                    "smtp_host": {
-                        "type": "string",
-                        "description": "The SMTP host."
-                    },
-                    "smtp_port": {
-                        "type": "string",
-                        "description": "The SMTP port."
-                    },
-                    "smtp_encryption": {
-                        "type": "string",
-                        "description": "The SMTP encryption."
-                    },
-                    "smtp_username": {
-                        "type": "string",
-                        "description": "The SMTP username."
-                    },
-                    "smtp_password": {
-                        "type": "string",
-                        "description": "The SMTP password."
-                    },
-                    "smtp_timeout": {
-                        "type": "string",
-                        "description": "The SMTP timeout."
-                    },
-                    "smtp_notifications_test": {
-                        "type": "boolean",
-                        "description": "Whether to send test notifications via SMTP."
-                    },
-                    "smtp_notifications_deployments": {
-                        "type": "boolean",
-                        "description": "Whether to send deployment notifications via SMTP."
-                    },
-                    "smtp_notifications_status_changes": {
-                        "type": "boolean",
-                        "description": "Whether to send status change notifications via SMTP."
-                    },
-                    "smtp_notifications_scheduled_tasks": {
-                        "type": "boolean",
-                        "description": "Whether to send scheduled task notifications via SMTP."
-                    },
-                    "smtp_notifications_database_backups": {
-                        "type": "boolean",
-                        "description": "Whether to send database backup notifications via SMTP."
-                    },
-                    "smtp_notifications_server_disk_usage": {
-                        "type": "boolean",
-                        "description": "Whether to send server disk usage notifications via SMTP."
-                    },
-                    "discord_enabled": {
-                        "type": "boolean",
-                        "description": "Whether Discord is enabled or not."
-                    },
-                    "discord_webhook_url": {
-                        "type": "string",
-                        "description": "The Discord webhook URL."
-                    },
-                    "discord_notifications_test": {
-                        "type": "boolean",
-                        "description": "Whether to send test notifications via Discord."
-                    },
-                    "discord_notifications_deployments": {
-                        "type": "boolean",
-                        "description": "Whether to send deployment notifications via Discord."
-                    },
-                    "discord_notifications_status_changes": {
-                        "type": "boolean",
-                        "description": "Whether to send status change notifications via Discord."
-                    },
-                    "discord_notifications_database_backups": {
-                        "type": "boolean",
-                        "description": "Whether to send database backup notifications via Discord."
-                    },
-                    "discord_notifications_scheduled_tasks": {
-                        "type": "boolean",
-                        "description": "Whether to send scheduled task notifications via Discord."
-                    },
-                    "discord_notifications_server_disk_usage": {
-                        "type": "boolean",
-                        "description": "Whether to send server disk usage notifications via Discord."
-                    },
                     "show_boarding": {
                         "type": "boolean",
                         "description": "Whether to show the boarding screen or not."
                     },
-                    "resend_enabled": {
-                        "type": "boolean",
-                        "description": "Whether to enable resending or not."
-                    },
-                    "resend_api_key": {
-                        "type": "string",
-                        "description": "The resending API key."
-                    },
-                    "use_instance_email_settings": {
-                        "type": "boolean",
-                        "description": "Whether to use instance email settings or not."
-                    },
-                    "telegram_enabled": {
-                        "type": "boolean",
-                        "description": "Whether Telegram is enabled or not."
-                    },
-                    "telegram_token": {
-                        "type": "string",
-                        "description": "The Telegram token."
-                    },
-                    "telegram_chat_id": {
-                        "type": "string",
-                        "description": "The Telegram chat ID."
-                    },
-                    "telegram_notifications_test": {
-                        "type": "boolean",
-                        "description": "Whether to send test notifications via Telegram."
-                    },
-                    "telegram_notifications_deployments": {
-                        "type": "boolean",
-                        "description": "Whether to send deployment notifications via Telegram."
-                    },
-                    "telegram_notifications_status_changes": {
-                        "type": "boolean",
-                        "description": "Whether to send status change notifications via Telegram."
-                    },
-                    "telegram_notifications_database_backups": {
-                        "type": "boolean",
-                        "description": "Whether to send database backup notifications via Telegram."
-                    },
-                    "telegram_notifications_test_message_thread_id": {
-                        "type": "string",
-                        "description": "The Telegram test message thread ID."
-                    },
-                    "telegram_notifications_deployments_message_thread_id": {
-                        "type": "string",
-                        "description": "The Telegram deployment message thread ID."
-                    },
-                    "telegram_notifications_status_changes_message_thread_id": {
-                        "type": "string",
-                        "description": "The Telegram status change message thread ID."
-                    },
-                    "telegram_notifications_database_backups_message_thread_id": {
-                        "type": "string",
-                        "description": "The Telegram database backup message thread ID."
-                    },
                     "custom_server_limit": {
                         "type": "string",
                         "description": "The custom server limit."
                     },
-                    "telegram_notifications_scheduled_tasks": {
-                        "type": "boolean",
-                        "description": "Whether to send scheduled task notifications via Telegram."
-                    },
-                    "telegram_notifications_scheduled_tasks_thread_id": {
-                        "type": "string",
-                        "description": "The Telegram scheduled task message thread ID."
-                    },
                     "members": {
                         "description": "The members of the team.",
                         "type": "array",
diff --git a/openapi.yaml b/openapi.yaml
index 20bf34873..6be1b76f6 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -47,6 +47,7 @@ paths:
                 - project_uuid
                 - server_uuid
                 - environment_name
+                - environment_uuid
                 - git_repository
                 - git_branch
                 - build_pack
@@ -60,7 +61,10 @@ paths:
                   description: 'The server UUID.'
                 environment_name:
                   type: string
-                  description: 'The environment name.'
+                  description: 'The environment name. You need to provide at least one of environment_name or environment_uuid.'
+                environment_uuid:
+                  type: string
+                  description: 'The environment UUID. You need to provide at least one of environment_name or environment_uuid.'
                 git_repository:
                   type: string
                   description: 'The git repository URL.'
@@ -272,6 +276,7 @@ paths:
                 - project_uuid
                 - server_uuid
                 - environment_name
+                - environment_uuid
                 - github_app_uuid
                 - git_repository
                 - git_branch
@@ -286,7 +291,10 @@ paths:
                   description: 'The server UUID.'
                 environment_name:
                   type: string
-                  description: 'The environment name.'
+                  description: 'The environment name. You need to provide at least one of environment_name or environment_uuid.'
+                environment_uuid:
+                  type: string
+                  description: 'The environment UUID. You need to provide at least one of environment_name or environment_uuid.'
                 github_app_uuid:
                   type: string
                   description: 'The Github App UUID.'
@@ -501,6 +509,7 @@ paths:
                 - project_uuid
                 - server_uuid
                 - environment_name
+                - environment_uuid
                 - private_key_uuid
                 - git_repository
                 - git_branch
@@ -515,7 +524,10 @@ paths:
                   description: 'The server UUID.'
                 environment_name:
                   type: string
-                  description: 'The environment name.'
+                  description: 'The environment name. You need to provide at least one of environment_name or environment_uuid.'
+                environment_uuid:
+                  type: string
+                  description: 'The environment UUID. You need to provide at least one of environment_name or environment_uuid.'
                 private_key_uuid:
                   type: string
                   description: 'The private key UUID.'
@@ -730,6 +742,7 @@ paths:
                 - project_uuid
                 - server_uuid
                 - environment_name
+                - environment_uuid
                 - dockerfile
               properties:
                 project_uuid:
@@ -740,7 +753,10 @@ paths:
                   description: 'The server UUID.'
                 environment_name:
                   type: string
-                  description: 'The environment name.'
+                  description: 'The environment name. You need to provide at least one of environment_name or environment_uuid.'
+                environment_uuid:
+                  type: string
+                  description: 'The environment UUID. You need to provide at least one of environment_name or environment_uuid.'
                 dockerfile:
                   type: string
                   description: 'The Dockerfile content.'
@@ -906,6 +922,7 @@ paths:
                 - project_uuid
                 - server_uuid
                 - environment_name
+                - environment_uuid
                 - docker_registry_image_name
                 - ports_exposes
               properties:
@@ -917,7 +934,10 @@ paths:
                   description: 'The server UUID.'
                 environment_name:
                   type: string
-                  description: 'The environment name.'
+                  description: 'The environment name. You need to provide at least one of environment_name or environment_uuid.'
+                environment_uuid:
+                  type: string
+                  description: 'The environment UUID. You need to provide at least one of environment_name or environment_uuid.'
                 docker_registry_image_name:
                   type: string
                   description: 'The docker registry image name.'
@@ -1073,6 +1093,7 @@ paths:
                 - project_uuid
                 - server_uuid
                 - environment_name
+                - environment_uuid
                 - docker_compose_raw
               properties:
                 project_uuid:
@@ -1083,7 +1104,10 @@ paths:
                   description: 'The server UUID.'
                 environment_name:
                   type: string
-                  description: 'The environment name.'
+                  description: 'The environment name. You need to provide at least one of environment_name or environment_uuid.'
+                environment_uuid:
+                  type: string
+                  description: 'The environment UUID. You need to provide at least one of environment_name or environment_uuid.'
                 docker_compose_raw:
                   type: string
                   description: 'The Docker Compose raw content.'
@@ -2137,6 +2161,7 @@ paths:
                 - server_uuid
                 - project_uuid
                 - environment_name
+                - environment_uuid
               properties:
                 server_uuid:
                   type: string
@@ -2146,7 +2171,10 @@ paths:
                   description: 'UUID of the project'
                 environment_name:
                   type: string
-                  description: 'Name of the environment'
+                  description: 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'
+                environment_uuid:
+                  type: string
+                  description: 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'
                 postgres_user:
                   type: string
                   description: 'PostgreSQL user'
@@ -2235,6 +2263,7 @@ paths:
                 - server_uuid
                 - project_uuid
                 - environment_name
+                - environment_uuid
               properties:
                 server_uuid:
                   type: string
@@ -2244,7 +2273,10 @@ paths:
                   description: 'UUID of the project'
                 environment_name:
                   type: string
-                  description: 'Name of the environment'
+                  description: 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'
+                environment_uuid:
+                  type: string
+                  description: 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'
                 destination_uuid:
                   type: string
                   description: 'UUID of the destination if the server has multiple destinations'
@@ -2321,6 +2353,7 @@ paths:
                 - server_uuid
                 - project_uuid
                 - environment_name
+                - environment_uuid
               properties:
                 server_uuid:
                   type: string
@@ -2330,7 +2363,10 @@ paths:
                   description: 'UUID of the project'
                 environment_name:
                   type: string
-                  description: 'Name of the environment'
+                  description: 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'
+                environment_uuid:
+                  type: string
+                  description: 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'
                 destination_uuid:
                   type: string
                   description: 'UUID of the destination if the server has multiple destinations'
@@ -2404,6 +2440,7 @@ paths:
                 - server_uuid
                 - project_uuid
                 - environment_name
+                - environment_uuid
               properties:
                 server_uuid:
                   type: string
@@ -2413,7 +2450,10 @@ paths:
                   description: 'UUID of the project'
                 environment_name:
                   type: string
-                  description: 'Name of the environment'
+                  description: 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'
+                environment_uuid:
+                  type: string
+                  description: 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'
                 destination_uuid:
                   type: string
                   description: 'UUID of the destination if the server has multiple destinations'
@@ -2490,6 +2530,7 @@ paths:
                 - server_uuid
                 - project_uuid
                 - environment_name
+                - environment_uuid
               properties:
                 server_uuid:
                   type: string
@@ -2499,7 +2540,10 @@ paths:
                   description: 'UUID of the project'
                 environment_name:
                   type: string
-                  description: 'Name of the environment'
+                  description: 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'
+                environment_uuid:
+                  type: string
+                  description: 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'
                 destination_uuid:
                   type: string
                   description: 'UUID of the destination if the server has multiple destinations'
@@ -2576,6 +2620,7 @@ paths:
                 - server_uuid
                 - project_uuid
                 - environment_name
+                - environment_uuid
               properties:
                 server_uuid:
                   type: string
@@ -2585,7 +2630,10 @@ paths:
                   description: 'UUID of the project'
                 environment_name:
                   type: string
-                  description: 'Name of the environment'
+                  description: 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'
+                environment_uuid:
+                  type: string
+                  description: 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'
                 destination_uuid:
                   type: string
                   description: 'UUID of the destination if the server has multiple destinations'
@@ -2671,6 +2719,7 @@ paths:
                 - server_uuid
                 - project_uuid
                 - environment_name
+                - environment_uuid
               properties:
                 server_uuid:
                   type: string
@@ -2680,7 +2729,10 @@ paths:
                   description: 'UUID of the project'
                 environment_name:
                   type: string
-                  description: 'Name of the environment'
+                  description: 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'
+                environment_uuid:
+                  type: string
+                  description: 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'
                 destination_uuid:
                   type: string
                   description: 'UUID of the destination if the server has multiple destinations'
@@ -2766,6 +2818,7 @@ paths:
                 - server_uuid
                 - project_uuid
                 - environment_name
+                - environment_uuid
               properties:
                 server_uuid:
                   type: string
@@ -2775,7 +2828,10 @@ paths:
                   description: 'UUID of the project'
                 environment_name:
                   type: string
-                  description: 'Name of the environment'
+                  description: 'Name of the environment. You need to provide at least one of environment_name or environment_uuid.'
+                environment_uuid:
+                  type: string
+                  description: 'UUID of the environment. You need to provide at least one of environment_name or environment_uuid.'
                 destination_uuid:
                   type: string
                   description: 'UUID of the destination if the server has multiple destinations'
@@ -3293,13 +3349,13 @@ paths:
       security:
         -
           bearerAuth: []
-  '/projects/{uuid}/{environment_name}':
+  '/projects/{uuid}/{environment_name_or_uuid}':
     get:
       tags:
         - Projects
       summary: Environment
-      description: 'Get environment by name.'
-      operationId: get-environment-by-name
+      description: 'Get environment by name or UUID.'
+      operationId: get-environment-by-name-or-uuid
       parameters:
         -
           name: uuid
@@ -3309,9 +3365,9 @@ paths:
           schema:
             type: string
         -
-          name: environment_name
+          name: environment_name_or_uuid
           in: path
-          description: 'Environment name'
+          description: 'Environment name or UUID'
           required: true
           schema:
             type: string
@@ -3872,6 +3928,7 @@ paths:
                 - server_uuid
                 - project_uuid
                 - environment_name
+                - environment_uuid
                 - type
               properties:
                 type:
@@ -3891,7 +3948,10 @@ paths:
                   description: 'Project UUID.'
                 environment_name:
                   type: string
-                  description: 'Environment name.'
+                  description: 'Environment name. You need to provide at least one of environment_name or environment_uuid.'
+                environment_uuid:
+                  type: string
+                  description: 'Environment UUID. You need to provide at least one of environment_name or environment_uuid.'
                 server_uuid:
                   type: string
                   description: 'Server UUID.'
@@ -4856,11 +4916,9 @@ components:
           type: integer
         uuid:
           type: string
-        application_id:
-          type: integer
-        service_id:
-          type: integer
-        database_id:
+        resourceable_type:
+          type: string
+        resourceable_id:
           type: integer
         is_build_time:
           type: boolean
@@ -5139,132 +5197,12 @@ components:
         updated_at:
           type: string
           description: 'The date and time the team was last updated.'
-        smtp_enabled:
-          type: boolean
-          description: 'Whether SMTP is enabled or not.'
-        smtp_from_address:
-          type: string
-          description: 'The email address to send emails from.'
-        smtp_from_name:
-          type: string
-          description: 'The name to send emails from.'
-        smtp_recipients:
-          type: string
-          description: 'The email addresses to send emails to.'
-        smtp_host:
-          type: string
-          description: 'The SMTP host.'
-        smtp_port:
-          type: string
-          description: 'The SMTP port.'
-        smtp_encryption:
-          type: string
-          description: 'The SMTP encryption.'
-        smtp_username:
-          type: string
-          description: 'The SMTP username.'
-        smtp_password:
-          type: string
-          description: 'The SMTP password.'
-        smtp_timeout:
-          type: string
-          description: 'The SMTP timeout.'
-        smtp_notifications_test:
-          type: boolean
-          description: 'Whether to send test notifications via SMTP.'
-        smtp_notifications_deployments:
-          type: boolean
-          description: 'Whether to send deployment notifications via SMTP.'
-        smtp_notifications_status_changes:
-          type: boolean
-          description: 'Whether to send status change notifications via SMTP.'
-        smtp_notifications_scheduled_tasks:
-          type: boolean
-          description: 'Whether to send scheduled task notifications via SMTP.'
-        smtp_notifications_database_backups:
-          type: boolean
-          description: 'Whether to send database backup notifications via SMTP.'
-        smtp_notifications_server_disk_usage:
-          type: boolean
-          description: 'Whether to send server disk usage notifications via SMTP.'
-        discord_enabled:
-          type: boolean
-          description: 'Whether Discord is enabled or not.'
-        discord_webhook_url:
-          type: string
-          description: 'The Discord webhook URL.'
-        discord_notifications_test:
-          type: boolean
-          description: 'Whether to send test notifications via Discord.'
-        discord_notifications_deployments:
-          type: boolean
-          description: 'Whether to send deployment notifications via Discord.'
-        discord_notifications_status_changes:
-          type: boolean
-          description: 'Whether to send status change notifications via Discord.'
-        discord_notifications_database_backups:
-          type: boolean
-          description: 'Whether to send database backup notifications via Discord.'
-        discord_notifications_scheduled_tasks:
-          type: boolean
-          description: 'Whether to send scheduled task notifications via Discord.'
-        discord_notifications_server_disk_usage:
-          type: boolean
-          description: 'Whether to send server disk usage notifications via Discord.'
         show_boarding:
           type: boolean
           description: 'Whether to show the boarding screen or not.'
-        resend_enabled:
-          type: boolean
-          description: 'Whether to enable resending or not.'
-        resend_api_key:
-          type: string
-          description: 'The resending API key.'
-        use_instance_email_settings:
-          type: boolean
-          description: 'Whether to use instance email settings or not.'
-        telegram_enabled:
-          type: boolean
-          description: 'Whether Telegram is enabled or not.'
-        telegram_token:
-          type: string
-          description: 'The Telegram token.'
-        telegram_chat_id:
-          type: string
-          description: 'The Telegram chat ID.'
-        telegram_notifications_test:
-          type: boolean
-          description: 'Whether to send test notifications via Telegram.'
-        telegram_notifications_deployments:
-          type: boolean
-          description: 'Whether to send deployment notifications via Telegram.'
-        telegram_notifications_status_changes:
-          type: boolean
-          description: 'Whether to send status change notifications via Telegram.'
-        telegram_notifications_database_backups:
-          type: boolean
-          description: 'Whether to send database backup notifications via Telegram.'
-        telegram_notifications_test_message_thread_id:
-          type: string
-          description: 'The Telegram test message thread ID.'
-        telegram_notifications_deployments_message_thread_id:
-          type: string
-          description: 'The Telegram deployment message thread ID.'
-        telegram_notifications_status_changes_message_thread_id:
-          type: string
-          description: 'The Telegram status change message thread ID.'
-        telegram_notifications_database_backups_message_thread_id:
-          type: string
-          description: 'The Telegram database backup message thread ID.'
         custom_server_limit:
           type: string
           description: 'The custom server limit.'
-        telegram_notifications_scheduled_tasks:
-          type: boolean
-          description: 'Whether to send scheduled task notifications via Telegram.'
-        telegram_notifications_scheduled_tasks_thread_id:
-          type: string
-          description: 'The Telegram scheduled task message thread ID.'
         members:
           description: 'The members of the team.'
           type: array
diff --git a/resources/views/components/resources/breadcrumbs.blade.php b/resources/views/components/resources/breadcrumbs.blade.php
index 940975755..5f7029fd0 100644
--- a/resources/views/components/resources/breadcrumbs.blade.php
+++ b/resources/views/components/resources/breadcrumbs.blade.php
@@ -21,7 +21,10 @@
         <li>
             <div class="flex items-center">
                 <a class="text-xs truncate lg:text-sm"
-                    href="{{ route('project.resource.index', ['environment_uuid' => $this->parameters['environment_uuid', 'project_uuid' => data_get($resource, 'environment.project.uuid')]) }}">{{ data_get($resource, 'environment.name') }}</a>
+                    href="{{ route('project.resource.index', [
+                        'environment_uuid' => data_get($resource, 'environment.uuid'),
+                        'project_uuid' => data_get($resource, 'environment.project.uuid'),
+                    ]) }}">{{ data_get($resource, 'environment.name') }}</a>
                 <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold dark:text-warning" fill="currentColor"
                     viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
                     <path fill-rule="evenodd"
diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index 50a5e020f..decebbac8 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -34,11 +34,11 @@
                                 </div>
                             </div>
                             <div class="flex items-center justify-center gap-2 text-xs font-bold">
-                                @if($project->environments->first())
+                                @if ($project->environments->first())
                                     <a class="hover:underline"
                                         href="{{ route('project.resource.create', [
                                             'project_uuid' => $project->uuid,
-                                            'environment_uuid' => $project->environments->first()->uuid
+                                            'environment_uuid' => $project->environments->first()->uuid,
                                         ]) }}">
                                         <span class="p-2 font-bold">+ Add Resource</span>
                                     </a>
diff --git a/resources/views/livewire/project/application/configuration.blade.php b/resources/views/livewire/project/application/configuration.blade.php
index 7827476d8..b8f4b96f6 100644
--- a/resources/views/livewire/project/application/configuration.blade.php
+++ b/resources/views/livewire/project/application/configuration.blade.php
@@ -9,31 +9,31 @@
     <div class="flex flex-col h-full gap-8 pt-6 sm:flex-row">
         <div class="flex flex-col items-start gap-2 min-w-fit">
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.application.configuration', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                href="{{ route('project.application.configuration', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                 wire:navigate>General</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.application.advanced', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                href="{{ route('project.application.advanced', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                 wire:navigate>Advanced</a>
             @if ($application->destination->server->isSwarm())
                 <a class="menu-item"
                     wire:current.exact="menu-item-active
-                    href="{{ route('project.application.swarm', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                    href="{{ route('project.application.swarm', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                     wire:navigate>Swarm
                     Configuration</a>
             @endif
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.application.environment-variables', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                href="{{ route('project.application.environment-variables', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                 wire:navigate>Environment Variables</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.application.persistent-storage', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                href="{{ route('project.application.persistent-storage', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                 wire:navigate>Persistent Storage</a>
             @if ($application->git_based())
                 <a class='menu-item' wire:current.exact="menu-item-active"
-                    href="{{ route('project.application.source', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                    href="{{ route('project.application.source', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                     wire:navigate>Git Source</a>
             @endif
             <a class="menu-item flex items-center gap-2" wire:current.exact="menu-item-active"
-                href="{{ route('project.application.servers', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                href="{{ route('project.application.servers', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                 wire:navigate>Servers
                 @if (str($application->status)->contains('degraded'))
                     <span title="Some servers are unavailable">
@@ -53,35 +53,35 @@
                 @endif
             </a>
             <a class="menu-item" wire:current.exact="menu-item-active"
-                href="{{ route('project.application.scheduled-tasks.show', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                href="{{ route('project.application.scheduled-tasks.show', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                 wire:navigate>Scheduled Tasks</a>
             <a class="menu-item" wire:current.exact="menu-item-active"
-                href="{{ route('project.application.webhooks', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                href="{{ route('project.application.webhooks', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                 wire:navigate>Webhooks</a>
             <a class="menu-item" wire:current.exact="menu-item-active"
-                href="{{ route('project.application.preview-deployments', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                href="{{ route('project.application.preview-deployments', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                 wire:navigate>Preview Deployments</a>
             <a class="menu-item" wire:current.exact="menu-item-active"
-                href="{{ route('project.application.healthcheck', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                href="{{ route('project.application.healthcheck', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                 wire:navigate>Healthcheck</a>
             <a class="menu-item" wire:current.exact="menu-item-active"
-                href="{{ route('project.application.rollback', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                href="{{ route('project.application.rollback', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                 wire:navigate>Rollback</a>
             <a class="menu-item" wire:current.exact="menu-item-active"
-                href="{{ route('project.application.resource-limits', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                href="{{ route('project.application.resource-limits', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                 wire:navigate>Resource Limits</a>
 
             <a class="menu-item" wire:current.exact="menu-item-active"
-                href="{{ route('project.application.resource-operations', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                href="{{ route('project.application.resource-operations', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                 wire:navigate>Resource Operations</a>
             <a class="menu-item" wire:current.exact="menu-item-active"
-                href="{{ route('project.application.metrics', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                href="{{ route('project.application.metrics', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                 wire:navigate>Metrics</a>
             <a class="menu-item" wire:current.exact="menu-item-active"
-                href="{{ route('project.application.tags', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                href="{{ route('project.application.tags', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                 wire:navigate>Tags</a>
             <a class="menu-item" wire:current.exact="menu-item-active"
-                href="{{ route('project.application.danger', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'application_uuid' => $application->uuid]) }}"
+                href="{{ route('project.application.danger', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'application_uuid' => $application->uuid]) }}"
                 wire:navigate>Danger Zone</a>
         </div>
         <div class="w-full">
diff --git a/resources/views/livewire/project/database/configuration.blade.php b/resources/views/livewire/project/database/configuration.blade.php
index b0702c24a..8575f34b6 100644
--- a/resources/views/livewire/project/database/configuration.blade.php
+++ b/resources/views/livewire/project/database/configuration.blade.php
@@ -8,38 +8,37 @@
     <div class="flex flex-col h-full gap-8 pt-6 sm:flex-row">
         <div class="flex flex-col items-start gap-2 min-w-fit">
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.database.configuration', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                href="{{ route('project.database.configuration', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
                 wire:navigate>General</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.database.environment-variables', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                href="{{ route('project.database.environment-variables', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
                 wire:navigate>Environment Variables</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.database.servers', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                href="{{ route('project.database.servers', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
                 wire:navigate>Servers</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.database.persistent-storage', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                href="{{ route('project.database.persistent-storage', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
                 wire:navigate>Persistent Storage</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.database.import-backups', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                href="{{ route('project.database.import-backups', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
                 wire:navigate>Import Backups</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.database.webhooks', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                href="{{ route('project.database.webhooks', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
                 wire:navigate>Webhooks</a>
             <a class="menu-item" wire:current.exact="menu-item-active"
-                href="{{ route('project.database.resource-limits', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                href="{{ route('project.database.resource-limits', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
                 wire:navigate>Resource Limits</a>
-
             <a class="menu-item" wire:current.exact="menu-item-active"
-                href="{{ route('project.database.resource-operations', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                href="{{ route('project.database.resource-operations', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
                 wire:navigate>Resource Operations</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.database.metrics', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                href="{{ route('project.database.metrics', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
                 wire:navigate>Metrics</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.database.tags', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                href="{{ route('project.database.tags', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
                 wire:navigate>Tags</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.database.danger', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'database_uuid' => $database->uuid]) }}"
+                href="{{ route('project.database.danger', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'database_uuid' => $database->uuid]) }}"
                 wire:navigate>Danger Zone</a>
         </div>
         <div class="w-full">
diff --git a/resources/views/livewire/project/resource/index.blade.php b/resources/views/livewire/project/resource/index.blade.php
index 8973177f8..7e2647e34 100644
--- a/resources/views/livewire/project/resource/index.blade.php
+++ b/resources/views/livewire/project/resource/index.blade.php
@@ -211,7 +211,7 @@
             },
             goto(item) {
                 const hrefLink = item.hrefLink;
-                window.location.href = `${hrefLink}#tags`;
+                window.location.href = `${hrefLink}/tags`;
             },
             filterAndSort(items) {
                 if (this.search === '') {
diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.php
index d52d3c4b6..196e7f2fd 100644
--- a/resources/views/livewire/project/service/configuration.blade.php
+++ b/resources/views/livewire/project/service/configuration.blade.php
@@ -9,30 +9,30 @@
             <a class="menu-item sm:min-w-fit" target="_blank" href="{{ $service->documentation() }}">Documentation
                 <x-external-link /></a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.service.configuration', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                href="{{ route('project.service.configuration', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"
                 wire:navigate>General</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.service.environment-variables', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                href="{{ route('project.service.environment-variables', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"
                 wire:navigate>Environment Variables</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.service.storages', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                href="{{ route('project.service.storages', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"
                 wire:navigate>Persistent Storages</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.service.scheduled-tasks.show', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                href="{{ route('project.service.scheduled-tasks.show', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"
                 wire:navigate>Scheduled Tasks</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.service.webhooks', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                href="{{ route('project.service.webhooks', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"
                 wire:navigate>Webhooks</a>
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.service.resource-operations', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                href="{{ route('project.service.resource-operations', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"
                 wire:navigate>Resource Operations</a>
 
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.service.tags', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                href="{{ route('project.service.tags', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"
                 wire:navigate>Tags</a>
 
             <a class='menu-item' wire:current.exact="menu-item-active"
-                href="{{ route('project.service.danger', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid]) }}"
+                href="{{ route('project.service.danger', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid]) }}"
                 wire:navigate>Danger Zone</a>
         </div>
         <div class="w-full">
@@ -95,7 +95,7 @@
                                 </div>
                                 <div class="flex items-center px-4">
                                     <a class="mx-4 text-xs font-bold hover:underline"
-                                        href="{{ route('project.service.index', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid, 'stack_service_uuid' => $application->uuid]) }}">
+                                        href="{{ route('project.service.index', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid, 'stack_service_uuid' => $application->uuid]) }}">
                                         Settings
                                     </a>
                                     @if (str($application->status)->contains('running'))
@@ -143,12 +143,12 @@
                                 <div class="flex items-center px-4">
                                     @if ($database->isBackupSolutionAvailable())
                                         <a class="mx-4 text-xs font-bold hover:underline"
-                                            href="{{ route('project.service.index', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid, 'stack_service_uuid' => $database->uuid]) }}#backups">
+                                            href="{{ route('project.service.index', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid, 'stack_service_uuid' => $database->uuid]) }}#backups">
                                             Backups
                                         </a>
                                     @endif
                                     <a class="mx-4 text-xs font-bold hover:underline"
-                                        href="{{ route('project.service.index', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name, 'service_uuid' => $service->uuid, 'stack_service_uuid' => $database->uuid]) }}">
+                                        href="{{ route('project.service.index', ['project_uuid' => $project->uuid, 'environment_uuid' => $environment->uuid, 'service_uuid' => $service->uuid, 'stack_service_uuid' => $database->uuid]) }}">
                                         Settings
                                     </a>
                                     @if (str($database->status)->contains('running'))
diff --git a/resources/views/livewire/project/service/storage.blade.php b/resources/views/livewire/project/service/storage.blade.php
index 7c1291dc5..a51684708 100644
--- a/resources/views/livewire/project/service/storage.blade.php
+++ b/resources/views/livewire/project/service/storage.blade.php
@@ -7,7 +7,8 @@
             $resource->getMorphClass() == 'App\Models\StandaloneKeydb' ||
             $resource->getMorphClass() == 'App\Models\StandaloneDragonfly' ||
             $resource->getMorphClass() == 'App\Models\StandaloneClickhouse' ||
-            $resource->getMorphClass() == 'App\Models\StandaloneMongodb')
+            $resource->getMorphClass() == 'App\Models\StandaloneMongodb' ||
+            $resource->getMorphClass() == 'App\Models\StandaloneMysql')
         <div class="flex items-center gap-2">
             <h2>Storages</h2>
             <x-helper
diff --git a/routes/api.php b/routes/api.php
index df5e54af9..c3f7a8f26 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -40,7 +40,7 @@ Route::group([
 
     Route::get('/projects', [ProjectController::class, 'projects'])->middleware(['api.ability:read']);
     Route::get('/projects/{uuid}', [ProjectController::class, 'project_by_uuid'])->middleware(['api.ability:read']);
-    Route::get('/projects/{uuid}/{environment_uuid}', [ProjectController::class, 'environment_details'])->middleware(['api.ability:read']);
+    Route::get('/projects/{uuid}/{environment_name_or_uuid}', [ProjectController::class, 'environment_details'])->middleware(['api.ability:read']);
 
     Route::post('/projects', [ProjectController::class, 'create_project'])->middleware(['api.ability:read']);
     Route::patch('/projects/{uuid}', [ProjectController::class, 'update_project'])->middleware(['api.ability:write']);

From f2d0f46248449637db197fee8b8a18c4a0bd325b Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Tue, 17 Dec 2024 15:20:06 +0100
Subject: [PATCH 56/60] fix: always use docker cleanup frequency

---
 app/Console/Kernel.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 2ed3ee454..c58ef2187 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -133,14 +133,14 @@ class Kernel extends ConsoleKernel
 
         foreach ($servers as $server) {
             $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);
+            if (validate_timezone($serverTimezone) === false) {
+                $serverTimezone = config('app.timezone');
+            }
 
             // Sentinel check
             $lastSentinelUpdate = $server->sentinel_updated_at;
             if (Carbon::parse($lastSentinelUpdate)->isBefore(now()->subSeconds($server->waitBeforeDoingSshCheck()))) {
                 // Check container status every minute if Sentinel does not activated
-                if (validate_timezone($serverTimezone) === false) {
-                    $serverTimezone = config('app.timezone');
-                }
                 if (isCloud()) {
                     $this->scheduleInstance->job(new ServerCheckJob($server))->timezone($serverTimezone)->everyFiveMinutes()->onOneServer();
                 } else {
@@ -148,15 +148,11 @@ class Kernel extends ConsoleKernel
                 }
                 // $this->scheduleInstance->job(new \App\Jobs\ServerCheckNewJob($server))->everyFiveMinutes()->onOneServer();
 
-                // Check storage usage every 10 minutes if Sentinel does not activated
-                $this->scheduleInstance->job(new ServerStorageCheckJob($server))->everyTenMinutes()->onOneServer();
-            }
-            if ($server->settings->force_docker_cleanup) {
-                $this->scheduleInstance->job(new DockerCleanupJob($server))->cron($server->settings->docker_cleanup_frequency)->timezone($serverTimezone)->onOneServer();
-            } else {
-                $this->scheduleInstance->job(new DockerCleanupJob($server))->everyTenMinutes()->timezone($serverTimezone)->onOneServer();
+                $this->scheduleInstance->job(new ServerStorageCheckJob($server))->cron($server->settings->server_disk_usage_check_frequency)->timezone($serverTimezone)->onOneServer();
             }
 
+            $this->scheduleInstance->job(new DockerCleanupJob($server))->cron($server->settings->docker_cleanup_frequency)->timezone($serverTimezone)->onOneServer();
+
             // Cleanup multiplexed connections every hour
             // $this->scheduleInstance->job(new ServerCleanupMux($server))->hourly()->onOneServer();
 

From 5fa636dd43eaae692d6a87ba7ecd66e258a52923 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Tue, 17 Dec 2024 15:20:28 +0100
Subject: [PATCH 57/60] feat: add server disk usage check frequency

---
 ...eck_frequency_to_server_settings_table.php | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 database/migrations/2024_12_17_140637_add_server_disk_usage_check_frequency_to_server_settings_table.php

diff --git a/database/migrations/2024_12_17_140637_add_server_disk_usage_check_frequency_to_server_settings_table.php b/database/migrations/2024_12_17_140637_add_server_disk_usage_check_frequency_to_server_settings_table.php
new file mode 100644
index 000000000..be0f4bc0f
--- /dev/null
+++ b/database/migrations/2024_12_17_140637_add_server_disk_usage_check_frequency_to_server_settings_table.php
@@ -0,0 +1,28 @@
+<?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('server_settings', function (Blueprint $table) {
+            $table->string('server_disk_usage_check_frequency')->default('0 23 * * *');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('server_settings', function (Blueprint $table) {
+            $table->dropColumn('server_disk_usage_check_frequency');
+        });
+    }
+};

From ed2ccaf8aff2496864a2aa0b080066dec7b67d8c Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Tue, 17 Dec 2024 15:22:10 +0100
Subject: [PATCH 58/60] fix: Advanced server UI

---
 app/Livewire/Server/Advanced.php              | 27 ++++++++----
 .../views/livewire/server/advanced.blade.php  | 44 ++++++++++---------
 2 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/app/Livewire/Server/Advanced.php b/app/Livewire/Server/Advanced.php
index 0650de9a0..577730f24 100644
--- a/app/Livewire/Server/Advanced.php
+++ b/app/Livewire/Server/Advanced.php
@@ -13,14 +13,11 @@ class Advanced extends Component
 
     public array $parameters = [];
 
-    #[Validate(['integer', 'min:1'])]
-    public int $concurrentBuilds = 1;
+    #[Validate(['string'])]
+    public string $serverDiskUsageCheckFrequency = '0 23 * * *';
 
-    #[Validate(['integer', 'min:1'])]
-    public int $dynamicTimeout = 1;
-
-    #[Validate('boolean')]
-    public bool $forceDockerCleanup = false;
+    #[Validate(['integer', 'min:1', 'max:99'])]
+    public int $serverDiskUsageNotificationThreshold = 50;
 
     #[Validate(['string', 'required'])]
     public string $dockerCleanupFrequency = '*/10 * * * *';
@@ -28,8 +25,8 @@ class Advanced extends Component
     #[Validate(['integer', 'min:1', 'max:99'])]
     public int $dockerCleanupThreshold = 10;
 
-    #[Validate(['integer', 'min:1', 'max:99'])]
-    public int $serverDiskUsageNotificationThreshold = 50;
+    #[Validate('boolean')]
+    public bool $forceDockerCleanup = false;
 
     #[Validate('boolean')]
     public bool $deleteUnusedVolumes = false;
@@ -37,6 +34,12 @@ class Advanced extends Component
     #[Validate('boolean')]
     public bool $deleteUnusedNetworks = false;
 
+    #[Validate(['integer', 'min:1'])]
+    public int $concurrentBuilds = 1;
+
+    #[Validate(['integer', 'min:1'])]
+    public int $dynamicTimeout = 1;
+
     public function mount(string $server_uuid)
     {
         try {
@@ -60,6 +63,7 @@ class Advanced extends Component
             $this->server->settings->server_disk_usage_notification_threshold = $this->serverDiskUsageNotificationThreshold;
             $this->server->settings->delete_unused_volumes = $this->deleteUnusedVolumes;
             $this->server->settings->delete_unused_networks = $this->deleteUnusedNetworks;
+            $this->server->settings->server_disk_usage_check_frequency = $this->serverDiskUsageCheckFrequency;
             $this->server->settings->save();
         } else {
             $this->concurrentBuilds = $this->server->settings->concurrent_builds;
@@ -70,6 +74,7 @@ class Advanced extends Component
             $this->serverDiskUsageNotificationThreshold = $this->server->settings->server_disk_usage_notification_threshold;
             $this->deleteUnusedVolumes = $this->server->settings->delete_unused_volumes;
             $this->deleteUnusedNetworks = $this->server->settings->delete_unused_networks;
+            $this->serverDiskUsageCheckFrequency = $this->server->settings->server_disk_usage_check_frequency;
         }
     }
 
@@ -100,6 +105,10 @@ class Advanced extends Component
                 $this->dockerCleanupFrequency = $this->server->settings->getOriginal('docker_cleanup_frequency');
                 throw new \Exception('Invalid Cron / Human expression for Docker Cleanup Frequency.');
             }
+            if (! validate_cron_expression($this->serverDiskUsageCheckFrequency)) {
+                $this->serverDiskUsageCheckFrequency = $this->server->settings->getOriginal('server_disk_usage_check_frequency');
+                throw new \Exception('Invalid Cron / Human expression for Disk Usage Check Frequency.');
+            }
             $this->syncData(true);
             $this->dispatch('success', 'Server updated.');
         } catch (\Throwable $e) {
diff --git a/resources/views/livewire/server/advanced.blade.php b/resources/views/livewire/server/advanced.blade.php
index 4d32d711c..40ff6c8b5 100644
--- a/resources/views/livewire/server/advanced.blade.php
+++ b/resources/views/livewire/server/advanced.blade.php
@@ -10,40 +10,44 @@
                 <div class="flex items-center gap-2">
                     <h2>Advanced</h2>
                     <x-forms.button type="submit">Save</x-forms.button>
-                    <x-modal-confirmation title="Confirm Docker Cleanup?" buttonTitle="Trigger Manual Cleanup"
-                        isHighlightedButton submitAction="manualCleanup" :actions="[
-                            'Permanently deletes all stopped containers managed by Coolify (as containers are non-persistent, no data will be lost)',
-                            'Permanently deletes all unused images',
-                            'Clears build cache',
-                            'Removes old versions of the Coolify helper image',
-                            'Optionally permanently deletes all unused volumes (if enabled in advanced options).',
-                            'Optionally permanently deletes all unused networks (if enabled in advanced options).',
-                        ]" :confirmWithText="false"
-                        :confirmWithPassword="false" step2ButtonText="Trigger Docker Cleanup" />
                 </div>
-                <div>Advanced configuration for your server.</div>
+                <div class="mt-3 mb-4">Advanced configuration for your server.</div>
             </div>
 
-            <div class="flex flex-col gap-4">
+            <h3>Disk Usage</h3>
+            <div class="flex flex-col gap-6">
                 <div class="flex flex-col">
                     <div class="flex flex-wrap gap-2 sm:flex-nowrap pt-4">
+                        <x-forms.input placeholder="0 23 * * *" id="serverDiskUsageCheckFrequency"
+                            label="Disk usage check frequency" required
+                            helper="Cron expression for disk usage check frequency.<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every night at 11:00 PM." />
                         <x-forms.input id="serverDiskUsageNotificationThreshold"
                             label="Server disk usage notification threshold (%)" required
                             helper="If the server disk usage exceeds this threshold, Coolify will send a notification to the team members." />
                     </div>
                 </div>
+
                 <div class="flex flex-col gap-2">
-                    <div class="flex items-center gap-2">
+                    <div class="flex gap-4">
                         <h3>Docker Cleanup</h3>
+                        <x-modal-confirmation title="Confirm Docker Cleanup?" buttonTitle="Trigger Manual Cleanup"
+                            isHighlightedButton submitAction="manualCleanup" :actions="[
+                                'Permanently deletes all stopped containers managed by Coolify (as containers are non-persistent, no data will be lost)',
+                                'Permanently deletes all unused images',
+                                'Clears build cache',
+                                'Removes old versions of the Coolify helper image',
+                                'Optionally permanently deletes all unused volumes (if enabled in advanced options).',
+                                'Optionally permanently deletes all unused networks (if enabled in advanced options).',
+                            ]" :confirmWithText="false"
+                            :confirmWithPassword="false" step2ButtonText="Trigger Docker Cleanup" />
                     </div>
                     <div class="flex flex-wrap items-center gap-4">
-                        @if ($forceDockerCleanup)
-                            <x-forms.input placeholder="*/10 * * * *" id="dockerCleanupFrequency"
-                                label="Docker cleanup frequency" required
-                                helper="Cron expression for Docker Cleanup.<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every night at midnight." />
-                        @else
-                            <x-forms.input id="dockerCleanupThreshold" label="Docker cleanup threshold (%)" required
-                                helper="The Docker cleanup tasks will run when the disk usage exceeds this threshold." />
+                        <x-forms.input placeholder="*/10 * * * *" id="dockerCleanupFrequency"
+                            label="Docker cleanup frequency" required
+                            helper="Cron expression for Docker Cleanup.<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every night at midnight." />
+                        @if (!$forceDockerCleanup)
+                        <x-forms.input id="dockerCleanupThreshold" label="Docker cleanup threshold (%)" required
+                            helper="The Docker cleanup tasks will run when the disk usage exceeds this threshold." />
                         @endif
                         <div class="w-96">
                             <x-forms.checkbox

From a8401182afbcdd4dd7ebd5488956ac0d6ed5923c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 17 Dec 2024 23:18:40 +0100
Subject: [PATCH 59/60] add debug logs to debug the logs - lol

---
 app/Models/Server.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/app/Models/Server.php b/app/Models/Server.php
index 6abc7cb43..767327b8e 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -1026,11 +1026,21 @@ $schema://$host {
         $unreachableNotificationSent = (bool) $this->unreachable_notification_sent;
         $isReachable = (bool) $this->settings->is_reachable;
 
+        \Log::debug('Server reachability check', [
+            'server_id' => $this->id,
+            'is_reachable' => $isReachable,
+            'notification_sent' => $unreachableNotificationSent,
+            'unreachable_count' => $this->unreachable_count,
+        ]);
+
         if ($isReachable === true) {
             $this->unreachable_count = 0;
             $this->save();
 
             if ($unreachableNotificationSent === true) {
+                \Log::debug('Server is now reachable, sending notification', [
+                    'server_id' => $this->id,
+                ]);
                 $this->sendReachableNotification();
             }
 
@@ -1038,9 +1048,17 @@ $schema://$host {
         }
 
         $this->increment('unreachable_count');
+        \Log::debug('Incremented unreachable count', [
+            'server_id' => $this->id,
+            'new_count' => $this->unreachable_count,
+        ]);
+
         if ($this->unreachable_count === 1) {
             $this->settings->is_reachable = true;
             $this->settings->save();
+            \Log::debug('First unreachable attempt, marking as reachable', [
+                'server_id' => $this->id,
+            ]);
 
             return;
         }
@@ -1049,6 +1067,11 @@ $schema://$host {
             $failedChecks = 0;
             for ($i = 0; $i < 3; $i++) {
                 $status = $this->serverStatus();
+                \Log::debug('Additional reachability check', [
+                    'server_id' => $this->id,
+                    'attempt' => $i + 1,
+                    'status' => $status,
+                ]);
                 sleep(5);
                 if (! $status) {
                     $failedChecks++;
@@ -1056,6 +1079,9 @@ $schema://$host {
             }
 
             if ($failedChecks === 3 && ! $unreachableNotificationSent) {
+                \Log::debug('Server confirmed unreachable after 3 attempts, sending notification', [
+                    'server_id' => $this->id,
+                ]);
                 $this->sendUnreachableNotification();
             }
         }

From 33ae10a6dcef0e0c937c3211dd999ae24a3ea88d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 18 Dec 2024 10:44:56 +0100
Subject: [PATCH 60/60] fix

---
 app/Actions/Database/StartPostgresql.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Actions/Database/StartPostgresql.php b/app/Actions/Database/StartPostgresql.php
index adf0623f3..ebfe61f82 100644
--- a/app/Actions/Database/StartPostgresql.php
+++ b/app/Actions/Database/StartPostgresql.php
@@ -23,6 +23,9 @@ class StartPostgresql
         $this->database = $database;
         $container_name = $this->database->uuid;
         $this->configuration_dir = database_configuration_dir().'/'.$container_name;
+        if (isDev()) {
+            $this->configuration_dir = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/databases/'.$container_name;
+        }
 
         $this->commands = [
             "echo 'Starting database.'",
@@ -78,7 +81,7 @@ class StartPostgresql
                 ],
             ],
         ];
-        if (! is_null($this->database->limits_cpuset)) {
+        if (filled($this->database->limits_cpuset)) {
             data_set($docker_compose, "services.{$container_name}.cpuset", $this->database->limits_cpuset);
         }
         if ($this->database->destination->server->isLogDrainEnabled() && $this->database->isLogDrainEnabled()) {
@@ -108,7 +111,7 @@ class StartPostgresql
                 ];
             }
         }
-        if (! is_null($this->database->postgres_conf) && ! empty($this->database->postgres_conf)) {
+        if (filled($this->database->postgres_conf)) {
             $docker_compose['services'][$container_name]['volumes'][] = [
                 'type' => 'bind',
                 'source' => $this->configuration_dir.'/custom-postgres.conf',
@@ -201,7 +204,7 @@ class StartPostgresql
     {
         $this->commands[] = "rm -rf $this->configuration_dir/docker-entrypoint-initdb.d/*";
 
-        if (is_null($this->database->init_scripts) || count($this->database->init_scripts) === 0) {
+        if (blank($this->database->init_scripts) || count($this->database->init_scripts) === 0) {
             return;
         }
 
@@ -219,7 +222,7 @@ class StartPostgresql
         $filename = 'custom-postgres.conf';
         $config_file_path = "$this->configuration_dir/$filename";
 
-        if (is_null($this->database->postgres_conf) || empty($this->database->postgres_conf)) {
+        if (blank($this->database->postgres_conf)) {
             $this->commands[] = "rm -f $config_file_path";
 
             return;