diff --git a/app/Notifications/AddedToServer.php b/app/Notifications/AddedToServer.php
index 0979225a7..07af25443 100644
--- a/app/Notifications/AddedToServer.php
+++ b/app/Notifications/AddedToServer.php
@@ -2,6 +2,7 @@
 
 namespace App\Notifications;
 
+use App\Filament\Server\Pages\Console;
 use App\Models\Server;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
@@ -27,6 +28,6 @@ class AddedToServer extends Notification implements ShouldQueue
             ->greeting('Hello ' . $notifiable->username . '!')
             ->line('You have been added as a subuser for the following server, allowing you certain control over the server.')
             ->line('Server Name: ' . $this->server->name)
-            ->action('Visit Server', url('/server/' . $this->server->uuid_short));
+            ->action('Visit Server', Console::getUrl(panel: 'server', tenant: $this->server));
     }
 }
diff --git a/app/Notifications/RemovedFromServer.php b/app/Notifications/RemovedFromServer.php
index aa2717638..bc16d3c9a 100644
--- a/app/Notifications/RemovedFromServer.php
+++ b/app/Notifications/RemovedFromServer.php
@@ -28,6 +28,6 @@ class RemovedFromServer extends Notification implements ShouldQueue
             ->greeting('Hello ' . $notifiable->username . '.')
             ->line('You have been removed as a subuser for the following server.')
             ->line('Server Name: ' . $this->server->name)
-            ->action('Visit Panel', config('app.url'));
+            ->action('Visit Panel', url(''));
     }
 }
diff --git a/app/Notifications/ServerInstalled.php b/app/Notifications/ServerInstalled.php
index 988a15722..162482918 100644
--- a/app/Notifications/ServerInstalled.php
+++ b/app/Notifications/ServerInstalled.php
@@ -2,10 +2,10 @@
 
 namespace App\Notifications;
 
+use App\Filament\Server\Pages\Console;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
 use App\Models\Server;
-use App\Filament\App\Resources\ServerResource\Pages\ListServers;
 use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
@@ -28,6 +28,6 @@ class ServerInstalled extends Notification implements ShouldQueue
             ->greeting('Hello ' . $notifiable->username . '.')
             ->line('Your server has finished installing and is now ready for you to use.')
             ->line('Server Name: ' . $this->server->name)
-            ->action('Login and Begin Using', ListServers::getUrl());
+            ->action('Login and Begin Using', Console::getUrl(panel: 'server', tenant: $this->server));
     }
 }