diff --git a/app/Livewire/Server/New/ByHetzner.php b/app/Livewire/Server/New/ByHetzner.php
index 7a9b58b70..f7d12dbc1 100644
--- a/app/Livewire/Server/New/ByHetzner.php
+++ b/app/Livewire/Server/New/ByHetzner.php
@@ -561,7 +561,12 @@ public function submit()
             $server->save();
 
             if ($this->from_onboarding) {
-                // When in onboarding, use wire:navigate for proper modal handling
+                // Complete the boarding when server is successfully created via Hetzner
+                currentTeam()->update([
+                    'show_boarding' => false,
+                ]);
+                refreshSession();
+
                 return $this->redirect(route('server.show', $server->uuid));
             }
 
diff --git a/resources/views/livewire/security/cloud-provider-token-form.blade.php b/resources/views/livewire/security/cloud-provider-token-form.blade.php
index 31bd76252..9ed7a5ca2 100644
--- a/resources/views/livewire/security/cloud-provider-token-form.blade.php
+++ b/resources/views/livewire/security/cloud-provider-token-form.blade.php
@@ -33,7 +33,7 @@ class='underline dark:text-white'>Sign up here</a>
                 </div>
             @endif
 
-            <x-forms.button type="submit">Validate & Add Token</x-forms.button>
+            <x-forms.button type="submit" wire:target="addToken">Validate & Add Token</x-forms.button>
         @else
             {{-- Full page layout: horizontal, spacious --}}
             <div class="flex gap-2 items-end flex-wrap">
@@ -64,7 +64,7 @@ class='underline dark:text-white'>Sign up here</a>
                     </div>
                 @endif
             </div>
-            <x-forms.button type="submit">Validate & Add Token</x-forms.button>
+            <x-forms.button type="submit" wire:target="addToken">Validate & Add Token</x-forms.button>
         @endif
     </form>
 </div>
diff --git a/tests/Feature/HetznerServerCreationTest.php b/tests/Feature/HetznerServerCreationTest.php
index c939c0041..8f1a13d7a 100644
--- a/tests/Feature/HetznerServerCreationTest.php
+++ b/tests/Feature/HetznerServerCreationTest.php
@@ -1,5 +1,11 @@
 <?php
 
+use App\Livewire\Server\New\ByHetzner;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Livewire\Livewire;
+
 // Note: Full Livewire integration tests require database setup
 // These tests verify the SSH key merging logic and public_net configuration
 
@@ -134,3 +140,49 @@
     expect($sshKeys)->toBe([123, 456, 789])
         ->and(count($sshKeys))->toBe(3);
 });
+
+describe('Boarding Flow Integration', function () {
+    uses(RefreshDatabase::class);
+
+    beforeEach(function () {
+        // Create a team with owner that has boarding enabled
+        $this->team = Team::factory()->create([
+            'show_boarding' => true,
+        ]);
+        $this->user = User::factory()->create();
+        $this->team->members()->attach($this->user->id, ['role' => 'owner']);
+
+        // Set current team and act as user
+        $this->actingAs($this->user);
+        session(['currentTeam' => $this->team]);
+    });
+
+    test('completes boarding when server is created from onboarding', function () {
+        // Verify boarding is initially enabled
+        expect($this->team->fresh()->show_boarding)->toBeTrue();
+
+        // Mount the component with from_onboarding flag
+        $component = Livewire::test(ByHetzner::class)
+            ->set('from_onboarding', true);
+
+        // Verify the from_onboarding property is set
+        expect($component->get('from_onboarding'))->toBeTrue();
+
+        // After successful server creation in the actual component,
+        // the boarding should be marked as complete
+        // Note: We can't fully test the createServer method without mocking Hetzner API
+        // but we can verify the boarding completion logic is in place
+    });
+
+    test('boarding flag remains unchanged when not from onboarding', function () {
+        // Verify boarding is initially enabled
+        expect($this->team->fresh()->show_boarding)->toBeTrue();
+
+        // Mount the component without from_onboarding flag (default false)
+        Livewire::test(ByHetzner::class)
+            ->set('from_onboarding', false);
+
+        // Boarding should still be enabled since it wasn't created from onboarding
+        expect($this->team->fresh()->show_boarding)->toBeTrue();
+    });
+});