diff --git a/app/Livewire/Project/New/Select.php b/app/Livewire/Project/New/Select.php
index b8d186dab..b25290f71 100644
--- a/app/Livewire/Project/New/Select.php
+++ b/app/Livewire/Project/New/Select.php
@@ -176,10 +176,12 @@ class Select extends Component
 
             return;
         }
-        // if (count($this->servers) === 1) {
-        //     $server = $this->servers->first();
-        //     $this->setServer($server);
-        // }
+        if (count($this->servers) === 1) {
+            $server = $this->servers->first();
+            if ($server instanceof Server) {
+                $this->setServer($server);
+            }
+        }
         if (! is_null($this->server)) {
             $foundServer = $this->servers->where('id', $this->server->id)->first();
             if ($foundServer) {
@@ -195,6 +197,13 @@ class Select extends Component
         $this->server = $server;
         $this->standaloneDockers = $server->standaloneDockers;
         $this->swarmDockers = $server->swarmDockers;
+        $count = count($this->standaloneDockers) + count($this->swarmDockers);
+        if ($count === 1) {
+            $docker = $this->standaloneDockers->first() ?? $this->swarmDockers->first();
+            if ($docker) {
+                $this->setDestination($docker->uuid);
+            }
+        }
         $this->current_step = 'destinations';
     }
 
diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php
index b126d823b..758df6508 100644
--- a/resources/views/livewire/project/new/select.blade.php
+++ b/resources/views/livewire/project/new/select.blade.php
@@ -2,7 +2,7 @@
     <div class="flex flex-col gap-4 lg:flex-row ">
         <h1>New Resource</h1>
         <div class="w-full pb-4 lg:w-96 lg:pb-0">
-            <x-forms.select wire:model="selectedEnvironment">
+            <x-forms.select wire:model.live="selectedEnvironment">
                 @foreach ($environments as $environment)
                     <option value="{{ $environment->name }}">Environment: {{ $environment->name }}</option>
                 @endforeach
@@ -533,7 +533,6 @@
                                     @if (file_exists(public_path(data_get($service, 'logo'))))
                                         <img class="w-[4.5rem] aspect-square h-[4.5rem] p-2 transition-all duration-200 opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100 bg-neutral-300 dark:bg-transparent hover:bg-neutral-800"
                                             src="{{ asset(data_get($service, 'logo')) }}">
-
                                     @endif
                                 </x-slot:logo>
                                 <x-slot:documentation>