diff --git a/app/Http/Controllers/Webhook/Github.php b/app/Http/Controllers/Webhook/Github.php
index 3683adaa8..ac1d4ded2 100644
--- a/app/Http/Controllers/Webhook/Github.php
+++ b/app/Http/Controllers/Webhook/Github.php
@@ -463,7 +463,7 @@ class Github extends Controller
             $private_key = data_get($data, 'pem');
             $webhook_secret = data_get($data, 'webhook_secret');
             $private_key = PrivateKey::create([
-                'name' => $slug,
+                'name' => "github-app-{$slug}",
                 'private_key' => $private_key,
                 'team_id' => $github_app->team_id,
                 'is_git_related' => true,
diff --git a/app/Livewire/Source/Github/Change.php b/app/Livewire/Source/Github/Change.php
index 4968a549d..7f9200891 100644
--- a/app/Livewire/Source/Github/Change.php
+++ b/app/Livewire/Source/Github/Change.php
@@ -198,8 +198,10 @@ class Change extends Component
                 if ($app_slug) {
                     $this->github_app->name = $app_slug;
                     $this->name = str($app_slug)->kebab();
+                    $privateKey->name = "github-app-{$app_slug}";
+                    $privateKey->save();
                     $this->github_app->save();
-                    $this->dispatch('success', 'Github App name synchronized successfully.');
+                    $this->dispatch('success', 'Github App name and SSH key name synchronized successfully.');
                 } else {
                     $this->dispatch('info', 'Could not find app slug in GitHub response.');
                 }