diff --git a/app/Filament/Pages/Installer/PanelInstaller.php b/app/Filament/Pages/Installer/PanelInstaller.php
index 10bb32ccf..fba27eade 100644
--- a/app/Filament/Pages/Installer/PanelInstaller.php
+++ b/app/Filament/Pages/Installer/PanelInstaller.php
@@ -25,6 +25,7 @@ use Filament\Pages\SimplePage;
 use Filament\Support\Enums\MaxWidth;
 use Filament\Support\Exceptions\Halt;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Routing\Redirector;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
@@ -94,7 +95,7 @@ class PanelInstaller extends SimplePage implements HasForms
         return 'data';
     }
 
-    public function submit(): RedirectResponse
+    public function submit(): Redirector|RedirectResponse
     {
         // Disable installer
         $this->writeToEnvironment(['APP_INSTALLED' => 'true']);
diff --git a/app/Filament/Pages/Installer/Steps/DatabaseStep.php b/app/Filament/Pages/Installer/Steps/DatabaseStep.php
index 04803352d..3a4449777 100644
--- a/app/Filament/Pages/Installer/Steps/DatabaseStep.php
+++ b/app/Filament/Pages/Installer/Steps/DatabaseStep.php
@@ -72,7 +72,7 @@ class DatabaseStep
             });
     }
 
-    private static function testConnection(string $driver, string $host, string $port, string $database, string $username, string $password): bool
+    private static function testConnection(string $driver, ?string $host, null|string|int $port, ?string $database, ?string $username, ?string $password): bool
     {
         if ($driver === 'sqlite') {
             return true;
diff --git a/app/Filament/Pages/Installer/Steps/RedisStep.php b/app/Filament/Pages/Installer/Steps/RedisStep.php
index d160e0b70..2f257c401 100644
--- a/app/Filament/Pages/Installer/Steps/RedisStep.php
+++ b/app/Filament/Pages/Installer/Steps/RedisStep.php
@@ -56,7 +56,7 @@ class RedisStep
             });
     }
 
-    private static function testConnection(string $host, string $port, string $username, string $password): bool
+    private static function testConnection(string $host, null|string|int $port, ?string $username, ?string $password): bool
     {
         try {
             config()->set('database.redis._panel_install_test', [