diff --git a/app/Livewire/Boarding/Index.php b/app/Livewire/Boarding/Index.php
index ac2b9213b..7912c4b85 100644
--- a/app/Livewire/Boarding/Index.php
+++ b/app/Livewire/Boarding/Index.php
@@ -107,7 +107,7 @@ public function mount()
 
         if ($this->selectedServerType === 'remote') {
             if ($this->privateKeys->isEmpty()) {
-                $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+                $this->privateKeys = PrivateKey::ownedAndOnlySShKeys(['name'])->where('id', '!=', 0)->get();
             }
             if ($this->servers->isEmpty()) {
                 $this->servers = Server::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
@@ -186,7 +186,7 @@ public function setServerType(string $type)
 
             return $this->validateServer('localhost');
         } elseif ($this->selectedServerType === 'remote') {
-            $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+            $this->privateKeys = PrivateKey::ownedAndOnlySShKeys(['name'])->where('id', '!=', 0)->get();
             // Auto-select first key if available for better UX
             if ($this->privateKeys->count() > 0) {
                 $this->selectedExistingPrivateKey = $this->privateKeys->first()->id;
diff --git a/app/Models/PrivateKey.php b/app/Models/PrivateKey.php
index c5cbc6338..46531ed34 100644
--- a/app/Models/PrivateKey.php
+++ b/app/Models/PrivateKey.php
@@ -88,6 +88,16 @@ public static function ownedByCurrentTeam(array $select = ['*'])
         return self::whereTeamId($teamId)->select($selectArray->all());
     }
 
+    public static function ownedAndOnlySShKeys(array $select = ['*'])
+    {
+        $teamId = currentTeam()->id;
+        $selectArray = collect($select)->concat(['id']);
+
+        return self::whereTeamId($teamId)
+            ->where('is_git_related', false)
+            ->select($selectArray->all());
+    }
+
     public static function validatePrivateKey($privateKey)
     {
         try {
diff --git a/resources/views/components/forms/datalist.blade.php b/resources/views/components/forms/datalist.blade.php
index 5bb12aa8d..79a14d16f 100644
--- a/resources/views/components/forms/datalist.blade.php
+++ b/resources/views/components/forms/datalist.blade.php
@@ -14,14 +14,156 @@
     @if ($multiple)
         {{-- Multiple Selection Mode with Alpine.js --}}
         <div x-data="{
+                open: false,
+                search: '',
+                selected: @entangle($modelBinding).live,
+                options: [],
+                filteredOptions: [],
+
+                init() {
+                    this.options = Array.from(this.$refs.datalist.querySelectorAll('option')).map(opt => {
+                        // Try to parse as integer, fallback to string
+                        let value = opt.value;
+                        const intValue = parseInt(value, 10);
+                        if (!isNaN(intValue) && intValue.toString() === value) {
+                            value = intValue;
+                        }
+                        return {
+                            value: value,
+                            text: opt.textContent.trim()
+                        };
+                    });
+                    this.filteredOptions = this.options;
+                    // Ensure selected is always an array
+                    if (!Array.isArray(this.selected)) {
+                        this.selected = [];
+                    }
+                },
+
+                filterOptions() {
+                    if (!this.search) {
+                        this.filteredOptions = this.options;
+                        return;
+                    }
+                    const searchLower = this.search.toLowerCase();
+                    this.filteredOptions = this.options.filter(opt =>
+                        opt.text.toLowerCase().includes(searchLower)
+                    );
+                },
+
+                toggleOption(value) {
+                    // Ensure selected is an array
+                    if (!Array.isArray(this.selected)) {
+                        this.selected = [];
+                    }
+                    const index = this.selected.indexOf(value);
+                    if (index > -1) {
+                        this.selected.splice(index, 1);
+                    } else {
+                        this.selected.push(value);
+                    }
+                    this.search = '';
+                    this.filterOptions();
+                    // Focus input after selection
+                    this.$refs.searchInput.focus();
+                },
+
+                removeOption(value, event) {
+                    // Ensure selected is an array
+                    if (!Array.isArray(this.selected)) {
+                        this.selected = [];
+                        return;
+                    }
+                    // Prevent triggering container click
+                    event.stopPropagation();
+                    const index = this.selected.indexOf(value);
+                    if (index > -1) {
+                        this.selected.splice(index, 1);
+                    }
+                },
+
+                isSelected(value) {
+                    // Ensure selected is an array
+                    if (!Array.isArray(this.selected)) {
+                        return false;
+                    }
+                    return this.selected.includes(value);
+                },
+
+                getSelectedText(value) {
+                    const option = this.options.find(opt => opt.value == value);
+                    return option ? option.text : value;
+                }
+            }" @click.outside="open = false" class="relative">
+
+            {{-- Unified Input Container with Tags Inside --}}
+            <div @click="$refs.searchInput.focus()"
+                class="flex flex-wrap gap-1.5 max-h-40 overflow-y-auto scrollbar py-1.5  px-2 w-full text-sm rounded-sm border-0 ring-2 ring-inset ring-neutral-200 dark:ring-coolgray-300 bg-white dark:bg-coolgray-100 cursor-text px-1 focus-within:border-l-4 focus-within:border-l-coollabs dark:focus-within:border-l-warning text-black dark:text-white"
+                :class="{
+                        'opacity-50': {{ $disabled ? 'true' : 'false' }}
+                    }" wire:loading.class="opacity-50"
+                wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4">
+
+                {{-- Selected Tags Inside Input --}}
+                <template x-for="value in selected" :key="value">
+                    <button type="button" @click.stop="removeOption(value, $event)"
+                        :disabled="{{ $disabled ? 'true' : 'false' }}"
+                        class="inline-flex items-center gap-1.5 px-2 py-0.5 text-xs bg-coolgray-200 dark:bg-coolgray-700 rounded whitespace-nowrap {{ $disabled ? 'cursor-not-allowed opacity-50' : 'cursor-pointer hover:bg-red-100 dark:hover:bg-red-900/20 hover:text-red-600 dark:hover:text-red-400' }}"
+                        aria-label="Remove">
+                        <span x-text="getSelectedText(value)" class="max-w-[200px] truncate"></span>
+                    </button>
+                </template>
+
+                {{-- Search Input (Borderless, Inside Container) --}}
+                <input type="text" x-model="search" x-ref="searchInput" @input="filterOptions()" @focus="open = true"
+                    @keydown.escape="open = false" :placeholder="(Array.isArray(selected) && selected.length > 0) ? '' :
+                        {{ json_encode($placeholder ?: 'Search...') }}" @required($required) @readonly($readonly)
+                    @disabled($disabled) @if ($autofocus) autofocus @endif
+                    class="flex-1 min-w-[120px] text-sm border-0 outline-none bg-transparent p-0 focus:ring-0 placeholder:text-neutral-400 dark:placeholder:text-neutral-600 text-black dark:text-white" />
+            </div>
+
+            {{-- Dropdown Options --}}
+            <div x-show="open && !{{ $disabled ? 'true' : 'false' }}" x-transition
+                class="absolute z-50 w-full mt-1 bg-white dark:bg-coolgray-100 border border-neutral-300 dark:border-coolgray-400 rounded shadow-lg max-h-60 overflow-auto scrollbar">
+
+                <template x-if="filteredOptions.length === 0">
+                    <div class="px-3 py-2 text-sm text-neutral-500 dark:text-neutral-400">
+                        No options found
+                    </div>
+                </template>
+
+                <template x-for="option in filteredOptions" :key="option.value">
+                    <div @click="toggleOption(option.value)"
+                        class="px-3 py-2 cursor-pointer hover:bg-neutral-100 dark:hover:bg-coolgray-200 flex items-center gap-3"
+                        :class="{ 'bg-neutral-50 dark:bg-coolgray-300': isSelected(option.value) }">
+                        <input type="checkbox" :checked="isSelected(option.value)"
+                            class="w-4 h-4 rounded border-neutral-300 dark:border-neutral-600 bg-white dark:bg-coolgray-100 text-black dark:text-white checked:bg-white dark:checked:bg-coolgray-100 focus:ring-coollabs dark:focus:ring-warning pointer-events-none"
+                            tabindex="-1">
+                        <span class="text-sm flex-1" x-text="option.text"></span>
+                    </div>
+                </template>
+            </div>
+
+            {{-- Hidden datalist for options --}}
+            <datalist x-ref="datalist" style="display: none;">
+                {{ $slot }}
+            </datalist>
+        </div>
+    @else
+            {{-- Single Selection Mode with Alpine.js --}}
+            <div x-data="{
             open: false,
             search: '',
-            selected: @entangle($modelBinding).live,
+            selected: @entangle(($attributes->whereStartsWith('wire:model')->first() ? $attributes->wire('model')->value() : $modelBinding)).live,
             options: [],
             filteredOptions: [],
-        
+
             init() {
                 this.options = Array.from(this.$refs.datalist.querySelectorAll('option')).map(opt => {
+                    // Skip disabled options
+                    if (opt.disabled) {
+                        return null;
+                    }
                     // Try to parse as integer, fallback to string
                     let value = opt.value;
                     const intValue = parseInt(value, 10);
@@ -32,14 +174,10 @@
                         value: value,
                         text: opt.textContent.trim()
                     };
-                });
+                }).filter(opt => opt !== null);
                 this.filteredOptions = this.options;
-                // Ensure selected is always an array
-                if (!Array.isArray(this.selected)) {
-                    this.selected = [];
-                }
             },
-        
+
             filterOptions() {
                 if (!this.search) {
                     this.filteredOptions = this.options;
@@ -50,243 +188,97 @@
                     opt.text.toLowerCase().includes(searchLower)
                 );
             },
-        
-            toggleOption(value) {
-                // Ensure selected is an array
-                if (!Array.isArray(this.selected)) {
-                    this.selected = [];
-                }
-                const index = this.selected.indexOf(value);
-                if (index > -1) {
-                    this.selected.splice(index, 1);
-                } else {
-                    this.selected.push(value);
-                }
+
+            selectOption(value) {
+                this.selected = value;
                 this.search = '';
+                this.open = false;
                 this.filterOptions();
-                // Focus input after selection
-                this.$refs.searchInput.focus();
             },
-        
-            removeOption(value, event) {
-                // Ensure selected is an array
-                if (!Array.isArray(this.selected)) {
-                    this.selected = [];
-                    return;
-                }
-                // Prevent triggering container click
-                event.stopPropagation();
-                const index = this.selected.indexOf(value);
-                if (index > -1) {
-                    this.selected.splice(index, 1);
-                }
+
+            openDropdown() {
+                if ({{ $disabled ? 'true' : 'false' }}) return;
+                this.open = true;
+                this.$nextTick(() => {
+                    if (this.$refs.searchInput) {
+                        this.$refs.searchInput.focus();
+                    }
+                });
             },
-        
-            isSelected(value) {
-                // Ensure selected is an array
-                if (!Array.isArray(this.selected)) {
-                    return false;
-                }
-                return this.selected.includes(value);
+
+            getSelectedText() {
+                if (!this.selected || this.selected === 'default') return '';
+                const option = this.options.find(opt => opt.value == this.selected);
+                return option ? option.text : this.selected;
             },
-        
-            getSelectedText(value) {
-                const option = this.options.find(opt => opt.value == value);
-                return option ? option.text : value;
+
+            isDefaultValue() {
+                return !this.selected || this.selected === 'default' || this.selected === '';
             }
         }" @click.outside="open = false" class="relative">
 
-            {{-- Unified Input Container with Tags Inside --}}
-            <div @click="$refs.searchInput.focus()"
-                class="flex flex-wrap gap-1.5 max-h-40 overflow-y-auto scrollbar py-1.5 w-full text-sm rounded-sm border-0 ring-2 ring-inset ring-neutral-200 dark:ring-coolgray-300 bg-white dark:bg-coolgray-100 cursor-text px-1 focus-within:border-l-4 focus-within:border-l-coollabs dark:focus-within:border-l-warning text-black dark:text-white"
-                :class="{
+                {{-- Hidden input for form validation --}}
+                <input type="hidden" :value="selected" @required($required) />
+
+                {{-- Input Container --}}
+                <div @click="openDropdown()"
+                    class="flex items-center gap-2 py-1.5 w-full text-sm rounded-sm border-0 ring-2 ring-inset ring-neutral-200 dark:ring-coolgray-300 bg-white dark:bg-coolgray-100 cursor-text focus-within:border-l-4 focus-within:border-l-coollabs dark:focus-within:border-l-warning text-black dark:text-white"
+                    :class="{
                     'opacity-50': {{ $disabled ? 'true' : 'false' }}
-                }"
-                wire:loading.class="opacity-50"
-                wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4">
+                }" wire:loading.class="opacity-50" wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4">
 
-                {{-- Selected Tags Inside Input --}}
-                <template x-for="value in selected" :key="value">
-                    <button
-                        type="button"
-                        @click.stop="removeOption(value, $event)"
-                        :disabled="{{ $disabled ? 'true' : 'false' }}"
-                        class="inline-flex items-center gap-1.5 px-2 py-0.5 text-xs bg-coolgray-200 dark:bg-coolgray-700 rounded whitespace-nowrap {{ $disabled ? 'cursor-not-allowed opacity-50' : 'cursor-pointer hover:bg-red-100 dark:hover:bg-red-900/20 hover:text-red-600 dark:hover:text-red-400' }}"
-                        aria-label="Remove">
-                        <span x-text="getSelectedText(value)" class="max-w-[200px] truncate"></span>
+                    {{-- Display Selected Value or Search Input --}}
+                    <div class="flex-1 flex items-center min-w-0 px-1">
+                        <template x-if="!isDefaultValue() && !open">
+                            <span class="text-sm flex-1 truncate text-black dark:text-white px-2"
+                                x-text="getSelectedText()"></span>
+                        </template>
+                        <input type="text" x-show="isDefaultValue() || open" x-model="search" x-ref="searchInput"
+                            @input="filterOptions()" @focus="open = true" @keydown.escape="open = false"
+                            :placeholder="{{ json_encode($placeholder ?: 'Search...') }}" @readonly($readonly)
+                            @disabled($disabled) @if ($autofocus) autofocus @endif
+                            class="flex-1 text-sm border-0 outline-none bg-transparent p-0 focus:ring-0 placeholder:text-neutral-400 dark:placeholder:text-neutral-600 text-black dark:text-white px-2" />
+                    </div>
+
+                    {{-- Dropdown Arrow --}}
+                    <button type="button" @click.stop="open = !open" :disabled="{{ $disabled ? 'true' : 'false' }}"
+                        class="shrink-0 text-neutral-400 px-2 {{ $disabled ? 'cursor-not-allowed' : 'cursor-pointer' }}">
+                        <svg class="w-4 h-4 transition-transform" :class="{ 'rotate-180': open }" fill="none"
+                            stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+                        </svg>
                     </button>
-                </template>
+                </div>
 
-                {{-- Search Input (Borderless, Inside Container) --}}
-                <input type="text" x-model="search" x-ref="searchInput" @input="filterOptions()" @focus="open = true"
-                    @keydown.escape="open = false"
-                    :placeholder="(Array.isArray(selected) && selected.length > 0) ? '' :
-                    {{ json_encode($placeholder ?: 'Search...') }}"
-                    @required($required) @readonly($readonly) @disabled($disabled) @if ($autofocus)
-                autofocus
+                {{-- Dropdown Options --}}
+                <div x-show="open && !{{ $disabled ? 'true' : 'false' }}" x-transition
+                    class="absolute z-50 w-full mt-1 bg-white dark:bg-coolgray-100 border border-neutral-300 dark:border-coolgray-400 rounded shadow-lg max-h-60 overflow-auto scrollbar">
+
+                    <template x-if="filteredOptions.length === 0">
+                        <div class="px-3 py-2 text-sm text-neutral-500 dark:text-neutral-400">
+                            No options found
+                        </div>
+                    </template>
+
+                    <template x-for="option in filteredOptions" :key="option.value">
+                        <div @click="selectOption(option.value)"
+                            class="px-3 py-2 cursor-pointer hover:bg-neutral-100 dark:hover:bg-coolgray-200"
+                            :class="{ 'bg-neutral-50 dark:bg-coolgray-300': selected == option.value }">
+                            <span class="text-sm" x-text="option.text"></span>
+                        </div>
+                    </template>
+                </div>
+
+                {{-- Hidden datalist for options --}}
+                <datalist x-ref="datalist" style="display: none;">
+                    {{ $slot }}
+                </datalist>
+            </div>
     @endif
-    class="flex-1 min-w-[120px] text-sm border-0 outline-none bg-transparent p-0 focus:ring-0 placeholder:text-neutral-400 dark:placeholder:text-neutral-600 text-black dark:text-white"
-    />
-</div>
 
-{{-- Dropdown Options --}}
-<div x-show="open && !{{ $disabled ? 'true' : 'false' }}" x-transition
-    class="absolute z-50 w-full mt-1 bg-white dark:bg-coolgray-100 border border-neutral-300 dark:border-coolgray-400 rounded shadow-lg max-h-60 overflow-auto scrollbar">
-
-    <template x-if="filteredOptions.length === 0">
-        <div class="px-3 py-2 text-sm text-neutral-500 dark:text-neutral-400">
-            No options found
-        </div>
-    </template>
-
-    <template x-for="option in filteredOptions" :key="option.value">
-        <div @click="toggleOption(option.value)"
-            class="px-3 py-2 cursor-pointer hover:bg-neutral-100 dark:hover:bg-coolgray-200 flex items-center gap-3"
-            :class="{ 'bg-neutral-50 dark:bg-coolgray-300': isSelected(option.value) }">
-            <input type="checkbox" :checked="isSelected(option.value)"
-                class="w-4 h-4 rounded border-neutral-300 dark:border-neutral-600 bg-white dark:bg-coolgray-100 text-black dark:text-white checked:bg-white dark:checked:bg-coolgray-100 focus:ring-coollabs dark:focus:ring-warning pointer-events-none"
-                tabindex="-1">
-            <span class="text-sm flex-1" x-text="option.text"></span>
-        </div>
-    </template>
-</div>
-
-{{-- Hidden datalist for options --}}
-<datalist x-ref="datalist" style="display: none;">
-    {{ $slot }}
-</datalist>
-</div>
-@else
-{{-- Single Selection Mode with Alpine.js --}}
-<div x-data="{
-    open: false,
-    search: '',
-    selected: @entangle(($attributes->whereStartsWith('wire:model')->first() ? $attributes->wire('model')->value() : $modelBinding)).live,
-    options: [],
-    filteredOptions: [],
-
-    init() {
-        this.options = Array.from(this.$refs.datalist.querySelectorAll('option')).map(opt => {
-            // Skip disabled options
-            if (opt.disabled) {
-                return null;
-            }
-            // Try to parse as integer, fallback to string
-            let value = opt.value;
-            const intValue = parseInt(value, 10);
-            if (!isNaN(intValue) && intValue.toString() === value) {
-                value = intValue;
-            }
-            return {
-                value: value,
-                text: opt.textContent.trim()
-            };
-        }).filter(opt => opt !== null);
-        this.filteredOptions = this.options;
-    },
-
-    filterOptions() {
-        if (!this.search) {
-            this.filteredOptions = this.options;
-            return;
-        }
-        const searchLower = this.search.toLowerCase();
-        this.filteredOptions = this.options.filter(opt =>
-            opt.text.toLowerCase().includes(searchLower)
-        );
-    },
-
-    selectOption(value) {
-        this.selected = value;
-        this.search = '';
-        this.open = false;
-        this.filterOptions();
-    },
-
-    openDropdown() {
-        if ({{ $disabled ? 'true' : 'false' }}) return;
-        this.open = true;
-        this.$nextTick(() => {
-            if (this.$refs.searchInput) {
-                this.$refs.searchInput.focus();
-            }
-        });
-    },
-
-    getSelectedText() {
-        if (!this.selected || this.selected === 'default') return '';
-        const option = this.options.find(opt => opt.value == this.selected);
-        return option ? option.text : this.selected;
-    },
-
-    isDefaultValue() {
-        return !this.selected || this.selected === 'default' || this.selected === '';
-    }
-}" @click.outside="open = false" class="relative">
-
-    {{-- Hidden input for form validation --}}
-    <input type="hidden" :value="selected" @required($required) />
-
-    {{-- Input Container --}}
-    <div @click="openDropdown()"
-        class="flex items-center gap-2 py-1.5 w-full text-sm rounded-sm border-0 ring-2 ring-inset ring-neutral-200 dark:ring-coolgray-300 bg-white dark:bg-coolgray-100 cursor-text focus-within:border-l-4 focus-within:border-l-coollabs dark:focus-within:border-l-warning text-black dark:text-white"
-        :class="{
-            'opacity-50': {{ $disabled ? 'true' : 'false' }}
-        }"
-        wire:loading.class="opacity-50"
-        wire:dirty.class="dark:border-l-warning border-l-coollabs border-l-4">
-
-        {{-- Display Selected Value or Search Input --}}
-        <div class="flex-1 flex items-center min-w-0 px-1">
-            <template x-if="!isDefaultValue() && !open">
-                <span class="text-sm flex-1 truncate text-black dark:text-white px-2" x-text="getSelectedText()"></span>
-            </template>
-            <input type="text" x-show="isDefaultValue() || open" x-model="search" x-ref="searchInput"
-                @input="filterOptions()" @focus="open = true"
-                @keydown.escape="open = false"
-                :placeholder="{{ json_encode($placeholder ?: 'Search...') }}"
-                @readonly($readonly) @disabled($disabled) @if ($autofocus) autofocus @endif
-                class="flex-1 text-sm border-0 outline-none bg-transparent p-0 focus:ring-0 placeholder:text-neutral-400 dark:placeholder:text-neutral-600 text-black dark:text-white px-2" />
-        </div>
-
-        {{-- Dropdown Arrow --}}
-        <button type="button" @click.stop="open = !open" :disabled="{{ $disabled ? 'true' : 'false' }}"
-            class="shrink-0 text-neutral-400 px-2 {{ $disabled ? 'cursor-not-allowed' : 'cursor-pointer' }}">
-            <svg class="w-4 h-4 transition-transform" :class="{ 'rotate-180': open }" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
-            </svg>
-        </button>
-    </div>
-
-    {{-- Dropdown Options --}}
-    <div x-show="open && !{{ $disabled ? 'true' : 'false' }}" x-transition
-        class="absolute z-50 w-full mt-1 bg-white dark:bg-coolgray-100 border border-neutral-300 dark:border-coolgray-400 rounded shadow-lg max-h-60 overflow-auto scrollbar">
-
-        <template x-if="filteredOptions.length === 0">
-            <div class="px-3 py-2 text-sm text-neutral-500 dark:text-neutral-400">
-                No options found
-            </div>
-        </template>
-
-        <template x-for="option in filteredOptions" :key="option.value">
-            <div @click="selectOption(option.value)"
-                class="px-3 py-2 cursor-pointer hover:bg-neutral-100 dark:hover:bg-coolgray-200"
-                :class="{ 'bg-neutral-50 dark:bg-coolgray-300': selected == option.value }">
-                <span class="text-sm" x-text="option.text"></span>
-            </div>
-        </template>
-    </div>
-
-    {{-- Hidden datalist for options --}}
-    <datalist x-ref="datalist" style="display: none;">
-        {{ $slot }}
-    </datalist>
-</div>
-@endif
-
-@error($modelBinding)
-    <label class="label">
-        <span class="text-red-500 label-text-alt">{{ $message }}</span>
-    </label>
-@enderror
-</div>
+    @error($modelBinding)
+        <label class="label">
+            <span class="text-red-500 label-text-alt">{{ $message }}</span>
+        </label>
+    @enderror
+</div>
\ No newline at end of file