diff --git a/app/Livewire/Project/DeleteEnvironment.php b/app/Livewire/Project/DeleteEnvironment.php
index 0f2b59c93..c64ebd4b2 100644
--- a/app/Livewire/Project/DeleteEnvironment.php
+++ b/app/Livewire/Project/DeleteEnvironment.php
@@ -9,6 +9,7 @@ class DeleteEnvironment extends Component
 {
     public array $parameters;
     public int $environment_id;
+    public bool $disabled = false;
 
     public function mount()
     {
diff --git a/app/Livewire/Project/DeleteProject.php b/app/Livewire/Project/DeleteProject.php
index 7ac4aa281..543b45784 100644
--- a/app/Livewire/Project/DeleteProject.php
+++ b/app/Livewire/Project/DeleteProject.php
@@ -9,6 +9,7 @@ class DeleteProject extends Component
 {
     public array $parameters;
     public int $project_id;
+    public bool $disabled = false;
 
     public function mount()
     {
diff --git a/app/Models/Project.php b/app/Models/Project.php
index d5f1bdd54..b9afc7426 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -64,10 +64,13 @@ class Project extends BaseModel
     }
     public function mysqls()
     {
-        return $this->hasMany(StandaloneMysql::class, Environment::class);
+        return $this->hasManyThrough(StandaloneMysql::class, Environment::class);
     }
     public function mariadbs()
     {
-        return $this->hasMany(StandaloneMariadb::class, Environment::class);
+        return $this->hasManyThrough(StandaloneMariadb::class, Environment::class);
+    }
+    public function resource_count() {
+        return $this->applications()->count() + $this->postgresqls()->count() + $this->redis()->count() + $this->mongodbs()->count() + $this->mysqls()->count() + $this->mariadbs()->count();
     }
 }
diff --git a/resources/views/components/new-modal.blade.php b/resources/views/components/new-modal.blade.php
new file mode 100644
index 000000000..b542d77ac
--- /dev/null
+++ b/resources/views/components/new-modal.blade.php
@@ -0,0 +1,56 @@
+@props([
+    'title' => 'Are you sure?',
+    'buttonTitle' => 'Open Modal',
+    'isErrorButton' => false,
+    'disabled' => false,
+    'action' => 'delete',
+])
+<div x-data="{ modalOpen: false }" @keydown.escape.window="modalOpen = false" :class="{ 'z-40': modalOpen }"
+    class="relative w-auto h-auto">
+    @if ($disabled)
+        <x-forms.button isError disabled>{{ $buttonTitle }}</x-forms.button>
+    @elseif ($isErrorButton)
+        <x-forms.button isError @click="modalOpen=true">{{ $buttonTitle }}</x-forms.button>
+    @else
+        <x-forms.button @click="modalOpen=true">{{ $buttonTitle }}</x-forms.button>
+    @endif
+    <template x-teleport="body">
+        <div x-show="modalOpen" class="fixed top-0 left-0 z-[99] flex items-center justify-center w-screen h-screen"
+            x-cloak>
+            <div x-show="modalOpen" x-transition:enter="ease-out duration-300" x-transition:enter-start="opacity-0"
+                x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-300"
+                x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0" @click="modalOpen=false"
+                class="absolute inset-0 w-full h-full bg-black backdrop-blur-sm bg-opacity-70"></div>
+            <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-300"
+                x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
+                x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
+                x-transition:leave="ease-in duration-200"
+                x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
+                x-transition:leave-end="opacity-0 -translate-y-2 sm:scale-95"
+                class="relative w-full py-6 border shadow-lg bg-coolgray-100 px-7 border-coolgray-300 sm:max-w-lg sm:rounded-lg">
+                <div class="flex items-center justify-between pb-3">
+                    <h3 class="text-lg font-semibold">{{ $title }}</h3>
+                    <button @click="modalOpen=false"
+                        class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 text-white rounded-full hover:bg-coolgray-300">
+                        <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                            stroke-width="1.5" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+                        </svg>
+                    </button>
+                </div>
+                <div class="relative w-auto pb-8">
+                    {{ $slot }}
+                </div>
+                <div class="flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2">
+                    <x-forms.button @click="modalOpen=false" class="w-24 bg-coolgray-200 hover:bg-coolgray-300"
+                        type="button">Cancel
+                    </x-forms.button>
+                    <div class="flex-1"></div>
+                    <x-forms.button @click="modalOpen=false" class="w-24" isError type="button"
+                        wire:click.prevent='{{ $action }}'>Continue
+                    </x-forms.button>
+                </div>
+            </div>
+        </div>
+    </template>
+</div>
diff --git a/resources/views/livewire/project/delete-environment.blade.php b/resources/views/livewire/project/delete-environment.blade.php
index 01e35db2d..6173721a3 100644
--- a/resources/views/livewire/project/delete-environment.blade.php
+++ b/resources/views/livewire/project/delete-environment.blade.php
@@ -1,8 +1,3 @@
-<div>
-    <x-modal yesOrNo modalId="deleteEnvironment" modalTitle="Delete Environment">
-        <x-slot:modalBody>
-            <p>This environment will be deleted. It is not reversible. <br>Please think again.</p>
-        </x-slot:modalBody>
-    </x-modal>
-    <x-forms.button isError isModal modalId="deleteEnvironment"> Delete Environment</x-forms.button>
-</div>
+<x-new-modal isErrorButton buttonTitle="Delete Environment" disabled="{{ $disabled }}">
+    This environment will be deleted. It is not reversible. <br>Please think again.
+</x-new-modal>
diff --git a/resources/views/livewire/project/delete-project.blade.php b/resources/views/livewire/project/delete-project.blade.php
index 59c2b45bd..095c139f4 100644
--- a/resources/views/livewire/project/delete-project.blade.php
+++ b/resources/views/livewire/project/delete-project.blade.php
@@ -1,10 +1,3 @@
-<div>
-    <x-modal yesOrNo modalId="deleteProject" modalTitle="Delete Project">
-        <x-slot:modalBody>
-            <p>This project will be deleted. It is not reversible. <br>Please think again.</p>
-        </x-slot:modalBody>
-    </x-modal>
-    <x-forms.button isError isModal modalId="deleteProject">
-        Delete Project
-    </x-forms.button>
-</div>
+<x-new-modal isErrorButton buttonTitle="Delete Project" disabled="{{ $disabled }}">
+    This project will be deleted. It is not reversible. <br>Please think again.
+</x-new-modal>
diff --git a/resources/views/livewire/project/edit.blade.php b/resources/views/livewire/project/edit.blade.php
index 0328b4ab5..164ba34cd 100644
--- a/resources/views/livewire/project/edit.blade.php
+++ b/resources/views/livewire/project/edit.blade.php
@@ -5,6 +5,7 @@
         <div class="flex items-end gap-2">
             <h2>General</h2>
             <x-forms.button type="submit">Save</x-forms.button>
+            <livewire:project.delete-project :disabled="$project->resource_count() > 0" :project_id="$project->id" />
         </div>
         <div class="flex gap-2">
             <x-forms.input label="Name" id="project.name" />
@@ -23,7 +24,8 @@
                 Add</button>
         </x-slide-over>
     </div>
-    <div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span class="text-warning">@{{project.VARIABLENAME}}</span><x-helper
+    <div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span
+            class="text-warning">@{{ project.VARIABLENAME }}</span><x-helper
             helper="More info <a class='text-white underline' href='https://coolify.io/docs/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
     </div>
     <div class="flex flex-col gap-2">
diff --git a/resources/views/livewire/project/environment-edit.blade.php b/resources/views/livewire/project/environment-edit.blade.php
index a643f197d..758d737d3 100644
--- a/resources/views/livewire/project/environment-edit.blade.php
+++ b/resources/views/livewire/project/environment-edit.blade.php
@@ -3,6 +3,7 @@
         <div class="flex items-end gap-2">
             <h1>Environment: {{ data_get($environment, 'name') }}</h1>
             <x-forms.button type="submit">Save</x-forms.button>
+            <livewire:project.delete-environment :disabled="!$environment->isEmpty()" :environment_id="$environment->id" />
         </div>
         <nav class="flex pt-2 pb-10">
             <ol class="flex items-center">
diff --git a/resources/views/livewire/project/resource/index.blade.php b/resources/views/livewire/project/resource/index.blade.php
index 26965aeef..c91ede1e6 100644
--- a/resources/views/livewire/project/resource/index.blade.php
+++ b/resources/views/livewire/project/resource/index.blade.php
@@ -7,7 +7,6 @@
                     href="{{ route('project.clone-me', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => request()->route('environment_name')]) }}">
                     Clone
                 </a>
-                <livewire:project.delete-environment :environment_id="$environment->id" />
             @else
                 <a href="{{ route('project.resource.create', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }}  "
                     class="font-normal text-white normal-case border-none rounded hover:no-underline btn btn-primary btn-sm no-animation">+
@@ -17,6 +16,7 @@
                     Clone
                 </a>
             @endif
+            <livewire:project.delete-environment :disabled="!$environment->isEmpty()" :environment_id="$environment->id" />
         </div>
         <nav class="flex pt-2 pb-10">
             <ol class="flex items-center">
diff --git a/resources/views/livewire/project/show.blade.php b/resources/views/livewire/project/show.blade.php
index 319da2b71..e2dd7c834 100644
--- a/resources/views/livewire/project/show.blade.php
+++ b/resources/views/livewire/project/show.blade.php
@@ -3,9 +3,7 @@
         <h1>Environments</h1>
         <x-forms.button class="btn" onclick="newEnvironment.showModal()">+ Add</x-forms.button>
         <livewire:project.add-environment :project="$project" />
-        @if ($project->applications->count() === 0)
-            <livewire:project.delete-project :project_id="$project->id" />
-        @endif
+        <livewire:project.delete-project :disabled="$project->resource_count() > 0" :project_id="$project->id" />
     </div>
     <div class="text-xs truncate subtitle lg:text-sm">{{ $project->name }}</div>
     <div class="grid gap-2 lg:grid-cols-2">