diff --git a/app/Livewire/Project/EnvironmentEdit.php b/app/Livewire/Project/EnvironmentEdit.php
new file mode 100644
index 000000000..a87e2092b
--- /dev/null
+++ b/app/Livewire/Project/EnvironmentEdit.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Livewire\Project;
+
+use App\Models\Application;
+use App\Models\Project;
+use Livewire\Component;
+
+class EnvironmentEdit extends Component
+{
+    public Project $project;
+    public Application $application;
+    public $environment;
+    public array $parameters;
+
+    protected $rules = [
+        'environment.name' => 'required|min:3|max:255',
+        'environment.description' => 'nullable|min:3|max:255',
+    ];
+    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();
+    }
+
+    public function submit()
+    {
+        $this->validate();
+        try {
+            $this->environment->save();
+            return redirect()->route('project.environment.edit', ['project_uuid' => $this->project->uuid, 'environment_name' => $this->environment->name]);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.project.environment-edit');
+    }
+}
diff --git a/database/migrations/2023_12_30_134507_add_description_to_environments.php b/database/migrations/2023_12_30_134507_add_description_to_environments.php
new file mode 100644
index 000000000..0e8f4fec3
--- /dev/null
+++ b/database/migrations/2023_12_30_134507_add_description_to_environments.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('environments', function (Blueprint $table) {
+            $table->string('description')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('environments', function (Blueprint $table) {
+            $table->dropColumn('description');
+        });
+    }
+};
diff --git a/resources/views/livewire/project/environment-edit.blade.php b/resources/views/livewire/project/environment-edit.blade.php
new file mode 100644
index 000000000..f88bbdb05
--- /dev/null
+++ b/resources/views/livewire/project/environment-edit.blade.php
@@ -0,0 +1,44 @@
+<div>
+    <form wire:submit='submit' class="flex flex-col">
+        <div class="flex items-end gap-2">
+            <h1>Environment: {{ data_get($environment, 'name') }}</h1>
+            <x-forms.button type="submit">Save</x-forms.button>
+        </div>
+        <nav class="flex pt-2 pb-10">
+            <ol class="flex items-center">
+                <li class="inline-flex items-center">
+                    <a class="text-xs truncate lg:text-sm"
+                        href="{{ route('project.show', ['project_uuid' => request()->route('project_uuid')]) }}">
+                        {{ $project->name }}</a>
+                </li>
+                <li>
+                    <div class="flex items-center">
+                        <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold text-warning" fill="currentColor"
+                            viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                            <path fill-rule="evenodd"
+                                d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
+                                clip-rule="evenodd"></path>
+                        </svg>
+                        <a class="text-xs truncate lg:text-sm"
+                            href="{{ route('project.resources', ['environment_name' => request()->route('environment_name'), 'project_uuid' => request()->route('project_uuid')]) }}">{{ request()->route('environment_name') }}</a>
+                    </div>
+                </li>
+                <li>
+                    <div class="flex items-center">
+                        <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold text-warning" fill="currentColor"
+                            viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+                            <path fill-rule="evenodd"
+                                d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
+                                clip-rule="evenodd"></path>
+                        </svg>
+                        Edit
+                    </div>
+                </li>
+            </ol>
+        </nav>
+        <div class="flex gap-2">
+            <x-forms.input label="Name" id="environment.name" />
+            <x-forms.input label="Description" id="environment.description" />
+        </div>
+    </form>
+</div>
diff --git a/resources/views/project/resources.blade.php b/resources/views/project/resources.blade.php
index 2b93f5377..8e97bf324 100644
--- a/resources/views/project/resources.blade.php
+++ b/resources/views/project/resources.blade.php
@@ -3,13 +3,13 @@
         <div class="flex items-center gap-2">
             <h1>Resources</h1>
             @if ($environment->isEmpty())
-                <a  class="font-normal text-white normal-case border-none rounded hover:no-underline btn btn-primary btn-sm no-animation"
+                <a class="font-normal text-white normal-case border-none rounded hover:no-underline btn btn-primary btn-sm no-animation"
                     href="{{ route('project.clone', ['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.resources.new', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }}  "
+                <a href="{{ route('project.resources.new', ['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">+
                     New</a>
                 <a class="font-normal text-white normal-case border-none rounded hover:no-underline btn btn-primary btn-sm no-animation"
@@ -41,12 +41,12 @@ class="font-normal text-white normal-case border-none rounded hover:no-underline
         </nav>
     </div>
     @if ($environment->isEmpty())
-        <a  href="{{ route('project.resources.new', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }}  "
+        <a href="{{ route('project.resources.new', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }}  "
             class="items-center justify-center box">+ Add New Resource</a>
     @endif
     <div class="grid gap-2 lg:grid-cols-2">
         @foreach ($environment->applications->sortBy('name') as $application)
-            <a  class="relative box group"
+            <a class="relative box group"
                 href="{{ route('project.application.configuration', [$project->uuid, $environment->name, $application->uuid]) }}">
                 <div class="flex flex-col mx-6">
                     <div class="font-bold text-white">{{ $application->name }}</div>
@@ -62,7 +62,7 @@ class="items-center justify-center box">+ Add New Resource</a>
             </a>
         @endforeach
         @foreach ($environment->databases()->sortBy('name') as $database)
-            <a  class="relative box group"
+            <a class="relative box group"
                 href="{{ route('project.database.configuration', [$project->uuid, $environment->name, $database->uuid]) }}">
                 <div class="flex flex-col mx-6">
                     <div class="font-bold text-white">{{ $database->name }}</div>
@@ -78,7 +78,7 @@ class="items-center justify-center box">+ Add New Resource</a>
             </a>
         @endforeach
         @foreach ($environment->services->sortBy('name') as $service)
-            <a  class="relative box group"
+            <a class="relative box group"
                 href="{{ route('project.service.configuration', [$project->uuid, $environment->name, $service->uuid]) }}">
                 <div class="flex flex-col mx-6">
                     <div class="font-bold text-white">{{ $service->name }}</div>
diff --git a/resources/views/project/show.blade.php b/resources/views/project/show.blade.php
index db3abb069..98da15b32 100644
--- a/resources/views/project/show.blade.php
+++ b/resources/views/project/show.blade.php
@@ -10,12 +10,35 @@
     <div class="text-xs truncate subtitle lg:text-sm">{{ $project->name }}</div>
     <div class="grid gap-2 lg:grid-cols-2">
         @forelse ($project->environments as $environment)
-            <a  class="items-center justify-center font-bold box"
-                href="{{ route('project.resources', [$project->uuid, $environment->name]) }}">
-                {{ $environment->name }}
-            </a>
+            <div class="gap-2 border border-transparent cursor-pointer box group" x-data
+                x-on:click="goto('{{ $project->uuid }}','{{ $environment->name }}')">
+                <a class="flex flex-col flex-1 mx-6 hover:no-underline"
+                    href="{{ route('project.resources', [$project->uuid, $environment->name]) }}">
+                    <div class="font-bold text-white"> {{ $environment->name }}</div>
+                    <div class="description ">
+                        {{ $environment->description }}</div>
+                </a>
+                <div class="flex items-center">
+                    <a class="mx-4 rounded group-hover:text-white"
+                        href="{{ route('project.environment.edit', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => $environment->name]) }}">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="icon hover:text-warning" viewBox="0 0 24 24"
+                            stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                            stroke-linejoin="round">
+                            <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                            <path
+                                d="M10.325 4.317c.426 -1.756 2.924 -1.756 3.35 0a1.724 1.724 0 0 0 2.573 1.066c1.543 -.94 3.31 .826 2.37 2.37a1.724 1.724 0 0 0 1.065 2.572c1.756 .426 1.756 2.924 0 3.35a1.724 1.724 0 0 0 -1.066 2.573c.94 1.543 -.826 3.31 -2.37 2.37a1.724 1.724 0 0 0 -2.572 1.065c-.426 1.756 -2.924 1.756 -3.35 0a1.724 1.724 0 0 0 -2.573 -1.066c-1.543 .94 -3.31 -.826 -2.37 -2.37a1.724 1.724 0 0 0 -1.065 -2.572c-1.756 -.426 -1.756 -2.924 0 -3.35a1.724 1.724 0 0 0 1.066 -2.573c-.94 -1.543 .826 -3.31 2.37 -2.37c1 .608 2.296 .07 2.572 -1.065z" />
+                            <path d="M9 12a3 3 0 1 0 6 0a3 3 0 0 0 -6 0" />
+                        </svg>
+                    </a>
+                </div>
+            </div>
         @empty
             <p>No environments found.</p>
         @endforelse
+        <script>
+            function goto(projectUuid, environmentName) {
+                window.location.href = '/project/' + projectUuid + '/' + environmentName;
+            }
+        </script>
     </div>
 </x-layout>
diff --git a/routes/web.php b/routes/web.php
index e27bca3d2..ffd907344 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -13,6 +13,7 @@
 use App\Livewire\Dev\Compose as Compose;
 use App\Livewire\Dashboard;
 use App\Livewire\Project\CloneProject;
+use App\Livewire\Project\EnvironmentEdit;
 use App\Livewire\Project\Shared\ExecuteContainerCommand;
 use App\Livewire\Project\Shared\Logs;
 use App\Livewire\Security\ApiTokens;
@@ -113,6 +114,7 @@
 
     Route::get('/project/{project_uuid}/{environment_name}/new', [ProjectController::class, 'new'])->name('project.resources.new');
     Route::get('/project/{project_uuid}/{environment_name}', [ProjectController::class, 'resources'])->name('project.resources');
+    Route::get('/project/{project_uuid}/{environment_name}/edit', EnvironmentEdit::class)->name('project.environment.edit');
 
     // Applications
     Route::get('/project/{project_uuid}/{environment_name}/application/{application_uuid}', ApplicationConfiguration::class)->name('project.application.configuration');