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>