diff --git a/app/Models/PrivateKey.php b/app/Models/PrivateKey.php
index 7c242dbb6..82858ff22 100644
--- a/app/Models/PrivateKey.php
+++ b/app/Models/PrivateKey.php
@@ -15,7 +15,7 @@ class PrivateKey extends BaseModel
     static public function ownedByCurrentTeam(array $select = ['*'])
     {
         $selectArray = collect($select)->concat(['id']);
-        return PrivateKey::whereTeamId(session('currentTeam')->id)->where('id', '>', 0)->select($selectArray->all());
+        return PrivateKey::whereTeamId(session('currentTeam')->id)->select($selectArray->all());
     }
     public function applications()
     {
diff --git a/config/version.php b/config/version.php
index d7596da3e..14b1389a5 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.2';
+return '4.0.0-beta.3';
diff --git a/resources/css/app.css b/resources/css/app.css
index 5fddb72aa..8602c69a5 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -25,7 +25,7 @@ input[type="checkbox"] {
 }
 
 textarea {
-    @apply textarea placeholder:text-neutral-700 text-white rounded scrollbar bg-coolgray-200 leading-5 text-xs;
+    @apply textarea read-only:bg-coolgray-200/50 disabled:border-none read-only:text-opacity-25 placeholder:text-neutral-700 text-white rounded scrollbar bg-coolgray-200 leading-5 text-xs;
 }
 select {
     @apply h-7 select select-xs disabled:bg-coolgray-200 border-none disabled:opacity-50 font-normal placeholder:text-neutral-700 text-white rounded bg-coolgray-200;
diff --git a/resources/views/livewire/private-key/change.blade.php b/resources/views/livewire/private-key/change.blade.php
index c24bf5930..2ab499fb8 100644
--- a/resources/views/livewire/private-key/change.blade.php
+++ b/resources/views/livewire/private-key/change.blade.php
@@ -4,12 +4,14 @@
     <form class="flex flex-col gap-2" wire:submit.prevent='changePrivateKey'>
         <div class="flex items-end gap-2">
             <h1>Private Key</h1>
-            <x-forms.button type="submit">
-                Save
-            </x-forms.button>
-            <x-forms.button x-on:click.prevent="deletePrivateKey = true">
-                Delete
-            </x-forms.button>
+            @if ($private_key->id > 0)
+                <x-forms.button type="submit">
+                    Save
+                </x-forms.button>
+                <x-forms.button x-on:click.prevent="deletePrivateKey = true">
+                    Delete
+                </x-forms.button>
+            @endif
         </div>
         <div class="pb-8">Private Key used for SSH connection</div>
         <x-forms.input id="private_key.name" label="Name" required />
@@ -36,7 +38,11 @@
                     disabled />
             </div>
             <div x-cloak x-show="showPrivateKey">
-                <x-forms.textarea rows="10" id="private_key.private_key" required />
+                @if ($private_key->id > 0)
+                    <x-forms.textarea rows="10" id="private_key.private_key" disabled />
+                @else
+                    <x-forms.textarea rows="10" id="private_key.private_key" required />
+                @endif
             </div>
         </div>
     </form>
diff --git a/versions.json b/versions.json
index b354910c0..2d3740098 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.32"
         },
         "v4": {
-            "version": "4.0.0-beta.2"
+            "version": "4.0.0-beta.3"
         }
     }
-}
\ No newline at end of file
+}