diff --git a/app/Actions/Database/CreateDatabase.php b/app/Actions/Database/CreateDatabase.php
index 844b27bd..5e41bce5 100755
--- a/app/Actions/Database/CreateDatabase.php
+++ b/app/Actions/Database/CreateDatabase.php
@@ -29,7 +29,7 @@ public function create(Server $server, array $input): Database
         /** @var Service $service */
         $service = $server->database();
 
-        /** @var \App\SSH\Services\Database\Database $databaseHandler */
+        /** @var \App\Services\Database\Database $databaseHandler */
         $databaseHandler = $service->handler();
         $databaseHandler->create($database->name, $database->charset, $database->collation);
         $database->status = DatabaseStatus::READY;
diff --git a/app/Actions/Database/CreateDatabaseUser.php b/app/Actions/Database/CreateDatabaseUser.php
index c59de47a..d2cf0823 100755
--- a/app/Actions/Database/CreateDatabaseUser.php
+++ b/app/Actions/Database/CreateDatabaseUser.php
@@ -6,7 +6,7 @@
 use App\Models\DatabaseUser;
 use App\Models\Server;
 use App\Models\Service;
-use App\SSH\Services\Database\Database;
+use App\Services\Database\Database;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Actions/Database/DeleteDatabase.php b/app/Actions/Database/DeleteDatabase.php
index b333c904..51a91e1c 100755
--- a/app/Actions/Database/DeleteDatabase.php
+++ b/app/Actions/Database/DeleteDatabase.php
@@ -13,7 +13,7 @@ public function delete(Server $server, Database $database): void
     {
         /** @var Service $service */
         $service = $server->database();
-        /** @var \App\SSH\Services\Database\Database $handler */
+        /** @var \App\Services\Database\Database $handler */
         $handler = $service->handler();
         $handler->delete($database->name);
         $database->delete();
diff --git a/app/Actions/Database/DeleteDatabaseUser.php b/app/Actions/Database/DeleteDatabaseUser.php
index 5993c3b6..02bd2458 100755
--- a/app/Actions/Database/DeleteDatabaseUser.php
+++ b/app/Actions/Database/DeleteDatabaseUser.php
@@ -5,7 +5,7 @@
 use App\Models\DatabaseUser;
 use App\Models\Server;
 use App\Models\Service;
-use App\SSH\Services\Database\Database;
+use App\Services\Database\Database;
 
 class DeleteDatabaseUser
 {
diff --git a/app/Actions/Database/LinkUser.php b/app/Actions/Database/LinkUser.php
index 27362068..3fcbe0a5 100755
--- a/app/Actions/Database/LinkUser.php
+++ b/app/Actions/Database/LinkUser.php
@@ -39,7 +39,7 @@ public function link(DatabaseUser $databaseUser, array $input): DatabaseUser
         /** @var Service $service */
         $service = $databaseUser->server->database();
 
-        /** @var \App\SSH\Services\Database\Database $handler */
+        /** @var \App\Services\Database\Database $handler */
         $handler = $service->handler();
 
         // Unlink the user from all databases
diff --git a/app/Actions/Database/RestoreBackup.php b/app/Actions/Database/RestoreBackup.php
index 0d57ad1f..b12a0176 100644
--- a/app/Actions/Database/RestoreBackup.php
+++ b/app/Actions/Database/RestoreBackup.php
@@ -28,7 +28,7 @@ public function restore(BackupFile $backupFile, array $input): void
         dispatch(function () use ($backupFile, $database): void {
             /** @var Service $service */
             $service = $database->server->database();
-            /** @var \App\SSH\Services\Database\Database $databaseHandler */
+            /** @var \App\Services\Database\Database $databaseHandler */
             $databaseHandler = $service->handler();
             $databaseHandler->restoreBackup($backupFile, $database->name);
             $backupFile->status = BackupFileStatus::RESTORED;
diff --git a/app/Actions/Database/RunBackup.php b/app/Actions/Database/RunBackup.php
index 20935e7d..c9d473ef 100644
--- a/app/Actions/Database/RunBackup.php
+++ b/app/Actions/Database/RunBackup.php
@@ -7,7 +7,7 @@
 use App\Models\Backup;
 use App\Models\BackupFile;
 use App\Models\Service;
-use App\SSH\Services\Database\Database;
+use App\Services\Database\Database;
 use Illuminate\Support\Str;
 
 class RunBackup
diff --git a/app/Actions/Database/SyncDatabaseUsers.php b/app/Actions/Database/SyncDatabaseUsers.php
index 8ddd42b7..aab78f25 100644
--- a/app/Actions/Database/SyncDatabaseUsers.php
+++ b/app/Actions/Database/SyncDatabaseUsers.php
@@ -5,14 +5,15 @@
 use App\Enums\DatabaseUserStatus;
 use App\Models\DatabaseUser;
 use App\Models\Server;
-use App\SSH\Services\Database\Database;
+use App\Models\Service;
+use App\Services\Database\Database;
 
 class SyncDatabaseUsers
 {
     public function sync(Server $server): void
     {
         $service = $server->database();
-        if (! $service instanceof \App\Models\Service) {
+        if (! $service instanceof Service) {
             return;
         }
         /** @var Database $handler */
diff --git a/app/Actions/Database/SyncDatabases.php b/app/Actions/Database/SyncDatabases.php
index 6d477113..e29895e9 100644
--- a/app/Actions/Database/SyncDatabases.php
+++ b/app/Actions/Database/SyncDatabases.php
@@ -5,14 +5,14 @@
 use App\Enums\DatabaseStatus;
 use App\Models\Server;
 use App\Models\Service;
-use App\SSH\Services\Database\Database;
+use App\Services\Database\Database;
 
 class SyncDatabases
 {
     public function sync(Server $server): void
     {
         $service = $server->database();
-        if (! $service instanceof \App\Models\Service) {
+        if (! $service instanceof Service) {
             return;
         }
         /** @var Database $handler */
diff --git a/app/Actions/FirewallRule/ManageRule.php b/app/Actions/FirewallRule/ManageRule.php
index e341c30f..6791915f 100755
--- a/app/Actions/FirewallRule/ManageRule.php
+++ b/app/Actions/FirewallRule/ManageRule.php
@@ -6,7 +6,7 @@
 use App\Models\FirewallRule;
 use App\Models\Server;
 use App\Models\Service;
-use App\SSH\Services\Firewall\Firewall;
+use App\Services\Firewall\Firewall;
 use Exception;
 use Illuminate\Support\Facades\Validator;
 
diff --git a/app/Actions/Monitoring/GetMetrics.php b/app/Actions/Monitoring/GetMetrics.php
index 9ad8a543..168a98e2 100644
--- a/app/Actions/Monitoring/GetMetrics.php
+++ b/app/Actions/Monitoring/GetMetrics.php
@@ -9,6 +9,7 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
+use stdClass;
 
 class GetMetrics
 {
@@ -70,7 +71,7 @@ private function metrics(
             ->groupByRaw('date_interval')
             ->orderBy('date_interval')
             ->get()
-            ->map(function ($item): \stdClass {
+            ->map(function ($item): stdClass {
                 $item->date = Carbon::parse($item->date)->format('Y-m-d H:i');
 
                 return $item;
diff --git a/app/Actions/Monitoring/UpdateMetricSettings.php b/app/Actions/Monitoring/UpdateMetricSettings.php
index b277f718..e09f545f 100644
--- a/app/Actions/Monitoring/UpdateMetricSettings.php
+++ b/app/Actions/Monitoring/UpdateMetricSettings.php
@@ -4,7 +4,7 @@
 
 use App\Models\Server;
 use App\Models\Service;
-use App\SSH\Services\ServiceInterface;
+use App\Services\ServiceInterface;
 use Illuminate\Support\Facades\Validator;
 
 class UpdateMetricSettings
diff --git a/app/Actions/NodeJS/ChangeDefaultCli.php b/app/Actions/NodeJS/ChangeDefaultCli.php
index 121d437e..97933d45 100644
--- a/app/Actions/NodeJS/ChangeDefaultCli.php
+++ b/app/Actions/NodeJS/ChangeDefaultCli.php
@@ -6,7 +6,7 @@
 use App\Exceptions\SSHError;
 use App\Models\Server;
 use App\Models\Service;
-use App\SSH\Services\NodeJS\NodeJS;
+use App\Services\NodeJS\NodeJS;
 use Illuminate\Validation\ValidationException;
 
 class ChangeDefaultCli
diff --git a/app/Actions/NotificationChannels/AddChannel.php b/app/Actions/NotificationChannels/AddChannel.php
index 1a9a1faa..e346b599 100644
--- a/app/Actions/NotificationChannels/AddChannel.php
+++ b/app/Actions/NotificationChannels/AddChannel.php
@@ -4,6 +4,7 @@
 
 use App\Models\NotificationChannel;
 use App\Models\User;
+use App\NotificationChannels\Email;
 use Exception;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
@@ -33,7 +34,7 @@ public function add(User $user, array $input): void
             if (! $channel->provider()->connect()) {
                 $channel->delete();
 
-                if ($channel->provider === \App\Enums\NotificationChannel::EMAIL) {
+                if ($channel->provider === Email::id()) {
                     throw ValidationException::withMessages([
                         'email' => __('Could not connect! Make sure you configured `.env` file correctly.'),
                     ]);
@@ -64,7 +65,7 @@ public static function rules(array $input): array
         $rules = [
             'provider' => [
                 'required',
-                Rule::in(config('core.notification_channels_providers')),
+                Rule::in(array_keys(config('notification-channel.providers'))),
             ],
             'name' => 'required',
         ];
diff --git a/app/Actions/PHP/ChangeDefaultCli.php b/app/Actions/PHP/ChangeDefaultCli.php
index c8f2037e..ba807ebc 100644
--- a/app/Actions/PHP/ChangeDefaultCli.php
+++ b/app/Actions/PHP/ChangeDefaultCli.php
@@ -6,7 +6,7 @@
 use App\Exceptions\SSHError;
 use App\Models\Server;
 use App\Models\Service;
-use App\SSH\Services\PHP\PHP;
+use App\Services\PHP\PHP;
 use Illuminate\Validation\ValidationException;
 
 class ChangeDefaultCli
diff --git a/app/Actions/PHP/GetPHPIni.php b/app/Actions/PHP/GetPHPIni.php
index 4a96768e..248e0416 100644
--- a/app/Actions/PHP/GetPHPIni.php
+++ b/app/Actions/PHP/GetPHPIni.php
@@ -5,7 +5,7 @@
 use App\Enums\PHPIniType;
 use App\Models\Server;
 use App\Models\Service;
-use App\SSH\Services\PHP\PHP;
+use App\Services\PHP\PHP;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Actions/PHP/InstallPHPExtension.php b/app/Actions/PHP/InstallPHPExtension.php
index e7951ae2..958a96d3 100755
--- a/app/Actions/PHP/InstallPHPExtension.php
+++ b/app/Actions/PHP/InstallPHPExtension.php
@@ -4,7 +4,7 @@
 
 use App\Models\Server;
 use App\Models\Service;
-use App\SSH\Services\PHP\PHP;
+use App\Services\PHP\PHP;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
@@ -57,7 +57,7 @@ public static function rules(Server $server): array
         return [
             'extension' => [
                 'required',
-                Rule::in(config('core.php_extensions')),
+                Rule::in(config('service.services.php.data.extensions', []) ?? []),
             ],
             'version' => [
                 'required',
diff --git a/app/Actions/Redirect/CreateRedirect.php b/app/Actions/Redirect/CreateRedirect.php
index b91aa916..fd667721 100644
--- a/app/Actions/Redirect/CreateRedirect.php
+++ b/app/Actions/Redirect/CreateRedirect.php
@@ -6,7 +6,7 @@
 use App\Models\Redirect;
 use App\Models\Service;
 use App\Models\Site;
-use App\SSH\Services\Webserver\Webserver;
+use App\Services\Webserver\Webserver;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 
@@ -33,7 +33,9 @@ public function create(Site $site, array $input): Redirect
             $service = $site->server->webserver();
             /** @var Webserver $webserver */
             $webserver = $service->handler();
-            $webserver->updateVHost($site);
+            $webserver->updateVHost($site, regenerate: [
+                'redirects',
+            ]);
             $redirect->status = RedirectStatus::READY;
             $redirect->save();
         })
diff --git a/app/Actions/Redirect/DeleteRedirect.php b/app/Actions/Redirect/DeleteRedirect.php
index c6ff964d..cf8f6d80 100644
--- a/app/Actions/Redirect/DeleteRedirect.php
+++ b/app/Actions/Redirect/DeleteRedirect.php
@@ -6,7 +6,7 @@
 use App\Models\Redirect;
 use App\Models\Service;
 use App\Models\Site;
-use App\SSH\Services\Webserver\Webserver;
+use App\Services\Webserver\Webserver;
 
 class DeleteRedirect
 {
@@ -20,7 +20,9 @@ public function delete(Site $site, Redirect $redirect): void
             $service = $site->server->webserver();
             /** @var Webserver $webserver */
             $webserver = $service->handler();
-            $webserver->updateVHost($site);
+            $webserver->updateVHost($site, regenerate: [
+                'redirects',
+            ]);
             $redirect->delete();
         })->catch(function () use ($redirect): void {
             $redirect->status = RedirectStatus::FAILED;
diff --git a/app/Actions/SSL/ActivateSSL.php b/app/Actions/SSL/ActivateSSL.php
index 4cf8f64c..3cd39512 100644
--- a/app/Actions/SSL/ActivateSSL.php
+++ b/app/Actions/SSL/ActivateSSL.php
@@ -11,6 +11,8 @@ public function activate(Ssl $ssl): void
         $ssl->site->ssls()->update(['is_active' => false]);
         $ssl->is_active = true;
         $ssl->save();
-        $ssl->site->webserver()->updateVHost($ssl->site);
+        $ssl->site->webserver()->updateVHost($ssl->site, regenerate: [
+            'port',
+        ]);
     }
 }
diff --git a/app/Actions/SSL/CreateSSL.php b/app/Actions/SSL/CreateSSL.php
index c4eb3dc6..6172d1df 100644
--- a/app/Actions/SSL/CreateSSL.php
+++ b/app/Actions/SSL/CreateSSL.php
@@ -8,7 +8,7 @@
 use App\Models\Service;
 use App\Models\Site;
 use App\Models\Ssl;
-use App\SSH\Services\Webserver\Webserver;
+use App\Services\Webserver\Webserver;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
@@ -54,7 +54,9 @@ public function create(Site $site, array $input): void
             $webserver->setupSSL($ssl);
             $ssl->status = SslStatus::CREATED;
             $ssl->save();
-            $webserver->updateVHost($site);
+            $webserver->updateVHost($site, regenerate: [
+                'port',
+            ]);
         })->catch(function () use ($ssl): void {
             $ssl->status = SslStatus::FAILED;
             $ssl->save();
diff --git a/app/Actions/SSL/DeactivateSSL.php b/app/Actions/SSL/DeactivateSSL.php
index 55c00477..219289ea 100644
--- a/app/Actions/SSL/DeactivateSSL.php
+++ b/app/Actions/SSL/DeactivateSSL.php
@@ -10,6 +10,8 @@ public function deactivate(Ssl $ssl): void
     {
         $ssl->is_active = false;
         $ssl->save();
-        $ssl->site->webserver()->updateVHost($ssl->site);
+        $ssl->site->webserver()->updateVHost($ssl->site, regenerate: [
+            'port',
+        ]);
     }
 }
diff --git a/app/Actions/SSL/DeleteSSL.php b/app/Actions/SSL/DeleteSSL.php
index a25c648c..45c7cfa9 100644
--- a/app/Actions/SSL/DeleteSSL.php
+++ b/app/Actions/SSL/DeleteSSL.php
@@ -5,7 +5,7 @@
 use App\Enums\SslStatus;
 use App\Models\Service;
 use App\Models\Ssl;
-use App\SSH\Services\Webserver\Webserver;
+use App\Services\Webserver\Webserver;
 
 class DeleteSSL
 {
diff --git a/app/Actions/Server/CreateServer.php b/app/Actions/Server/CreateServer.php
index 0af7d88f..63c00140 100755
--- a/app/Actions/Server/CreateServer.php
+++ b/app/Actions/Server/CreateServer.php
@@ -3,16 +3,13 @@
 namespace App\Actions\Server;
 
 use App\Enums\FirewallRuleStatus;
-use App\Enums\ServerProvider;
 use App\Enums\ServerStatus;
-use App\Enums\ServerType;
-use App\Exceptions\SSHConnectionError;
 use App\Facades\Notifier;
 use App\Models\Project;
 use App\Models\Server;
 use App\Models\User;
 use App\Notifications\ServerInstallationFailed;
-use App\Notifications\ServerInstallationSucceed;
+use App\ServerProviders\Custom;
 use App\ValidationRules\RestrictedIPAddressesRule;
 use Exception;
 use Illuminate\Database\Query\Builder;
@@ -25,6 +22,8 @@
 
 class CreateServer
 {
+    protected Server $server;
+
     /**
      * @param  array<string, mixed>  $input
      */
@@ -32,15 +31,14 @@ public function create(User $creator, Project $project, array $input): Server
     {
         Validator::make($input, self::rules($project, $input))->validate();
 
-        $server = new Server([
+        $this->server = new Server([
             'project_id' => $project->id,
             'user_id' => $creator->id,
             'name' => $input['name'],
-            'ssh_user' => config('core.server_providers_default_user')[$input['provider']][$input['os']],
+            'ssh_user' => data_get(config('server-provider.providers'), $input['provider'].'.default_user') ?? 'root',
             'ip' => $input['ip'] ?? '',
             'port' => $input['port'] ?? 22,
             'os' => $input['os'],
-            'type' => ServerType::REGULAR,
             'provider' => $input['provider'],
             'authentication' => [
                 'user' => config('core.ssh_user'),
@@ -52,32 +50,42 @@ public function create(User $creator, Project $project, array $input): Server
         ]);
 
         try {
-            if ($server->provider != 'custom') {
-                $server->provider_id = $input['server_provider'];
+            if ($this->server->provider != 'custom') {
+                $this->server->provider_id = $input['server_provider'];
             }
 
-            $server->type_data = $server->type()->data($input);
-
-            $server->provider_data = $server->provider()->data($input);
+            $this->server->provider_data = $this->server->provider()->data($input);
 
             // save
-            $server->save();
+            $this->server->save();
 
             // create firewall rules
-            $this->createFirewallRules($server);
+            $this->createFirewallRules($this->server);
 
             // create instance
-            $server->provider()->create();
+            $this->server->provider()->create();
 
-            // add services
-            $server->type()->createServices($input);
+            // create services
+            $this->createServices();
 
             // install server
-            $this->install($server);
+            dispatch(function (): void {
+                app(InstallServer::class)->run($this->server);
+            })
+                ->catch(function (Throwable $e): void {
+                    $this->server->update([
+                        'status' => ServerStatus::INSTALLATION_FAILED,
+                    ]);
+                    Notifier::send($this->server, new ServerInstallationFailed($this->server));
+                    Log::error('server-installation-error', [
+                        'error' => (string) $e,
+                    ]);
+                })
+                ->onConnection('ssh');
 
-            return $server;
+            return $this->server;
         } catch (Exception $e) {
-            $server->delete();
+            $this->server->delete();
 
             throw ValidationException::withMessages([
                 'provider' => $e->getMessage(),
@@ -85,41 +93,6 @@ public function create(User $creator, Project $project, array $input): Server
         }
     }
 
-    private function install(Server $server): void
-    {
-        dispatch(function () use ($server): void {
-            $maxWait = 180;
-            while ($maxWait > 0) {
-                sleep(10);
-                $maxWait -= 10;
-                if (! $server->provider()->isRunning()) {
-                    continue;
-                }
-                try {
-                    $server->ssh()->connect();
-                    break;
-                } catch (SSHConnectionError) {
-                    // ignore
-                }
-            }
-            $server->type()->install();
-            $server->update([
-                'status' => ServerStatus::READY,
-            ]);
-            Notifier::send($server, new ServerInstallationSucceed($server));
-        })
-            ->catch(function (Throwable $e) use ($server): void {
-                $server->update([
-                    'status' => ServerStatus::INSTALLATION_FAILED,
-                ]);
-                Notifier::send($server, new ServerInstallationFailed($server));
-                Log::error('server-installation-error', [
-                    'error' => (string) $e,
-                ]);
-            })
-            ->onConnection('ssh');
-    }
-
     /**
      * @param  array<string, mixed>  $input
      * @return array<string, mixed>
@@ -129,7 +102,7 @@ public static function rules(Project $project, array $input): array
         $rules = [
             'provider' => [
                 'required',
-                Rule::in(config('core.server_providers')),
+                Rule::in(array_keys(config('server-provider.providers'))),
             ],
             'name' => [
                 'required',
@@ -139,7 +112,7 @@ public static function rules(Project $project, array $input): array
                 Rule::in(config('core.operating_systems')),
             ],
             'server_provider' => [
-                Rule::when(fn (): bool => isset($input['provider']) && $input['provider'] != ServerProvider::CUSTOM, [
+                Rule::when(fn (): bool => isset($input['provider']) && $input['provider'] != Custom::id(), [
                     'required',
                     Rule::exists('server_providers', 'id')->where(function (Builder $query) use ($project): void {
                         $query->where('project_id', $project->id)
@@ -148,13 +121,13 @@ public static function rules(Project $project, array $input): array
                 ]),
             ],
             'ip' => [
-                Rule::when(fn (): bool => isset($input['provider']) && $input['provider'] == ServerProvider::CUSTOM, [
+                Rule::when(fn (): bool => isset($input['provider']) && $input['provider'] == Custom::id(), [
                     'required',
                     new RestrictedIPAddressesRule,
                 ]),
             ],
             'port' => [
-                Rule::when(fn (): bool => isset($input['provider']) && $input['provider'] == ServerProvider::CUSTOM, [
+                Rule::when(fn (): bool => isset($input['provider']) && $input['provider'] == Custom::id(), [
                     'required',
                     'numeric',
                     'min:1',
@@ -163,22 +136,7 @@ public static function rules(Project $project, array $input): array
             ],
         ];
 
-        return array_merge($rules, self::typeRules($input), self::providerRules($input));
-    }
-
-    /**
-     * @param  array<string, mixed>  $input
-     * @return array<string, array<string>>
-     */
-    private static function typeRules(array $input): array
-    {
-        if (! isset($input['type']) || ! in_array($input['type'], config('core.server_types'))) {
-            return [];
-        }
-
-        $server = new Server(['type' => $input['type']]);
-
-        return $server->type()->createRules($input);
+        return array_merge($rules, self::providerRules($input));
     }
 
     /**
@@ -190,8 +148,8 @@ private static function providerRules(array $input): array
         if (
             ! isset($input['provider']) ||
             ! isset($input['server_provider']) ||
-            ! in_array($input['provider'], config('core.server_providers')) ||
-            $input['provider'] == ServerProvider::CUSTOM
+            ! config('server-provider.providers.'.$input['provider']) ||
+            $input['provider'] == Custom::id()
         ) {
             return [];
         }
@@ -236,4 +194,49 @@ public function createFirewallRules(Server $server): void
             ],
         ]);
     }
+
+    private function createServices(): void
+    {
+        $this->server->services()->forceDelete();
+        $this->addSupervisor();
+        $this->addRedis();
+        $this->addUfw();
+        $this->addMonitoring();
+    }
+
+    private function addSupervisor(): void
+    {
+        $this->server->services()->create([
+            'type' => 'process_manager',
+            'name' => 'supervisor',
+            'version' => 'latest',
+        ]);
+    }
+
+    private function addRedis(): void
+    {
+        $this->server->services()->create([
+            'type' => 'memory_database',
+            'name' => 'redis',
+            'version' => 'latest',
+        ]);
+    }
+
+    private function addUfw(): void
+    {
+        $this->server->services()->create([
+            'type' => 'firewall',
+            'name' => 'ufw',
+            'version' => 'latest',
+        ]);
+    }
+
+    private function addMonitoring(): void
+    {
+        $this->server->services()->create([
+            'type' => 'monitoring',
+            'name' => 'remote-monitor',
+            'version' => 'latest',
+        ]);
+    }
 }
diff --git a/app/Actions/Server/InstallServer.php b/app/Actions/Server/InstallServer.php
new file mode 100644
index 00000000..eacbaca2
--- /dev/null
+++ b/app/Actions/Server/InstallServer.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Actions\Server;
+
+use App\Enums\ServerStatus;
+use App\Enums\ServiceStatus;
+use App\Exceptions\SSHConnectionError;
+use App\Exceptions\SSHError;
+use App\Facades\Notifier;
+use App\Models\Server;
+use App\Notifications\ServerInstallationSucceed;
+use App\Services\PHP\PHP;
+
+class InstallServer
+{
+    protected Server $server;
+
+    /**
+     * @throws SSHError
+     */
+    public function run(Server $server): void
+    {
+        $this->server = $server;
+
+        $maxWait = 180;
+        while ($maxWait > 0) {
+            if (! $this->server->provider()->isRunning()) {
+                continue;
+            }
+            try {
+                $this->server->ssh()->connect();
+                break;
+            } catch (SSHConnectionError) {
+                // ignore
+            }
+            sleep(10);
+            $maxWait -= 10;
+        }
+        $this->install();
+        $this->server->update([
+            'status' => ServerStatus::READY,
+        ]);
+        Notifier::send($this->server, new ServerInstallationSucceed($this->server));
+    }
+
+    /**
+     * @throws SSHError
+     */
+    public function install(): void
+    {
+        $this->createUser();
+        $this->progress(15, 'installing-updates');
+        $this->server->os()->upgrade();
+        $this->progress(25, 'installing-dependencies');
+        $this->server->os()->installDependencies();
+        $services = $this->server->services;
+        $currentProgress = 45;
+        $progressPerService = (100 - $currentProgress) / count($services);
+        foreach ($services as $service) {
+            $currentProgress += $progressPerService;
+            $this->progress($currentProgress, 'installing- '.$service->name);
+            $service->handler()->install();
+            $service->update(['status' => ServiceStatus::READY]);
+            if ($service->type == 'php') {
+                $this->progress($currentProgress, 'installing-composer');
+                /** @var PHP $handler */
+                $handler = $service->handler();
+                $handler->installComposer();
+            }
+        }
+        $this->progress(100, 'finishing');
+    }
+
+    /**
+     * @throws SSHError
+     */
+    protected function createUser(): void
+    {
+        $this->server->os()->createUser(
+            $this->server->authentication['user'],
+            $this->server->authentication['pass'],
+            $this->server->sshKey()['public_key']
+        );
+        $this->server->ssh_user = config('core.ssh_user');
+        $this->server->save();
+        $this->server->refresh();
+        $this->server->public_key = $this->server->os()->getPublicKey($this->server->getSshUser());
+        $this->server->save();
+    }
+
+    protected function progress(int|float $percentage, ?string $step = null): void
+    {
+        $this->server->progress = $percentage;
+        $this->server->progress_step = $step;
+        $this->server->save();
+    }
+}
diff --git a/app/Actions/ServerProvider/CreateServerProvider.php b/app/Actions/ServerProvider/CreateServerProvider.php
index 893e5dcc..55d9afa0 100644
--- a/app/Actions/ServerProvider/CreateServerProvider.php
+++ b/app/Actions/ServerProvider/CreateServerProvider.php
@@ -48,7 +48,7 @@ public function create(User $user, Project $project, array $input): ServerProvid
 
     private static function getProvider(string $name): ServerProviderContract
     {
-        $providerClass = config('core.server_providers_class.'.$name);
+        $providerClass = config('server-provider.providers.'.$name.'.handler');
         /** @var ServerProviderContract $provider */
         $provider = new $providerClass(new ServerProvider, new Server);
 
@@ -67,7 +67,7 @@ public static function rules(array $input): array
             ],
             'provider' => [
                 'required',
-                Rule::in(config('core.server_providers')),
+                Rule::in(array_keys(config('server-provider.providers'))),
                 Rule::notIn('custom'),
             ],
         ];
diff --git a/app/Actions/Service/Install.php b/app/Actions/Service/Install.php
index a7873961..d2fc068a 100644
--- a/app/Actions/Service/Install.php
+++ b/app/Actions/Service/Install.php
@@ -17,7 +17,12 @@ public function install(Server $server, array $input): Service
     {
         Validator::make($input, self::rules($input))->validate();
 
-        $input['type'] = config('core.service_types')[$input['name']];
+        $name = $input['name'];
+        $input['type'] = config("service.services.$name.type");
+
+        if (! $input['type']) {
+            throw new \InvalidArgumentException("Service type is not defined for $name");
+        }
 
         $service = new Service([
             'server_id' => $server->id,
@@ -55,14 +60,14 @@ public static function rules(array $input): array
         $rules = [
             'name' => [
                 'required',
-                Rule::in(array_keys(config('core.service_types'))),
+                Rule::in(array_keys(config('service.services'))),
             ],
             'version' => [
                 'required',
             ],
         ];
         if (isset($input['name'])) {
-            $rules['version'][] = Rule::in(config("core.service_versions.{$input['name']}"));
+            $rules['version'][] = Rule::in(config("service.services.{$input['name']}.versions", []));
         }
 
         return $rules;
diff --git a/app/Actions/Service/Manage.php b/app/Actions/Service/Manage.php
index 50391337..bada2a95 100644
--- a/app/Actions/Service/Manage.php
+++ b/app/Actions/Service/Manage.php
@@ -4,15 +4,17 @@
 
 use App\Enums\ServiceStatus;
 use App\Models\Service;
+use Illuminate\Validation\ValidationException;
 
 class Manage
 {
     public function start(Service $service): void
     {
+        $this->validate($service);
         $service->status = ServiceStatus::STARTING;
         $service->save();
         dispatch(function () use ($service): void {
-            $status = $service->server->systemd()->start($service->unit);
+            $status = $service->server->systemd()->start($service->handler()->unit());
             if (str($status)->contains('Active: active')) {
                 $service->status = ServiceStatus::READY;
             } else {
@@ -24,10 +26,11 @@ public function start(Service $service): void
 
     public function stop(Service $service): void
     {
+        $this->validate($service);
         $service->status = ServiceStatus::STOPPING;
         $service->save();
         dispatch(function () use ($service): void {
-            $status = $service->server->systemd()->stop($service->unit);
+            $status = $service->server->systemd()->stop($service->handler()->unit());
             if (str($status)->contains('Active: inactive')) {
                 $service->status = ServiceStatus::STOPPED;
             } else {
@@ -39,10 +42,11 @@ public function stop(Service $service): void
 
     public function restart(Service $service): void
     {
+        $this->validate($service);
         $service->status = ServiceStatus::RESTARTING;
         $service->save();
         dispatch(function () use ($service): void {
-            $status = $service->server->systemd()->restart($service->unit);
+            $status = $service->server->systemd()->restart($service->handler()->unit());
             if (str($status)->contains('Active: active')) {
                 $service->status = ServiceStatus::READY;
             } else {
@@ -54,10 +58,11 @@ public function restart(Service $service): void
 
     public function enable(Service $service): void
     {
+        $this->validate($service);
         $service->status = ServiceStatus::ENABLING;
         $service->save();
         dispatch(function () use ($service): void {
-            $status = $service->server->systemd()->enable($service->unit);
+            $status = $service->server->systemd()->enable($service->handler()->unit());
             if (str($status)->contains('Active: active')) {
                 $service->status = ServiceStatus::READY;
             } else {
@@ -69,10 +74,11 @@ public function enable(Service $service): void
 
     public function disable(Service $service): void
     {
+        $this->validate($service);
         $service->status = ServiceStatus::DISABLING;
         $service->save();
         dispatch(function () use ($service): void {
-            $status = $service->server->systemd()->disable($service->unit);
+            $status = $service->server->systemd()->disable($service->handler()->unit());
             if (str($status)->contains('Active: inactive')) {
                 $service->status = ServiceStatus::DISABLED;
             } else {
@@ -81,4 +87,13 @@ public function disable(Service $service): void
             $service->save();
         })->onConnection('ssh');
     }
+
+    private function validate(Service $service): void
+    {
+        if (! $service->handler()->unit()) {
+            throw ValidationException::withMessages([
+                'service' => __('This service does not have a systemd unit configured.'),
+            ]);
+        }
+    }
 }
diff --git a/app/Actions/Site/CreateSite.php b/app/Actions/Site/CreateSite.php
index dd294baf..81dcf8f8 100755
--- a/app/Actions/Site/CreateSite.php
+++ b/app/Actions/Site/CreateSite.php
@@ -13,7 +13,6 @@
 use App\Notifications\SiteInstallationSucceed;
 use App\ValidationRules\DomainRule;
 use Exception;
-use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
@@ -39,7 +38,6 @@ public function create(Server $server, array $input): Site
                 'type' => $input['type'],
                 'domain' => $input['domain'],
                 'aliases' => $input['aliases'] ?? [],
-                'port' => $input['port'] ?? null,
                 'user' => $user,
                 'path' => '/home/'.$user.'/'.$input['domain'],
                 'status' => SiteStatus::INSTALLING,
@@ -116,7 +114,7 @@ public static function rules(Server $server, array $input): array
         $rules = [
             'type' => [
                 'required',
-                Rule::in(config('core.site_types')),
+                Rule::in(array_keys(config('site.types'))),
             ],
             'domain' => [
                 'required',
@@ -134,14 +132,6 @@ public static function rules(Server $server, array $input): array
                 Rule::unique('sites', 'user')->where('server_id', $server->id),
                 Rule::notIn($server->getSshUsers()),
             ],
-            'port' => [
-                'nullable',
-                'integer',
-                'min:1',
-                'max:65535',
-                Rule::unique('sites', 'port')
-                    ->where(fn (Builder $query) => $query->where('server_id', $server->id)),
-            ],
         ];
 
         return array_merge($rules, self::typeRules($server, $input));
@@ -153,7 +143,7 @@ public static function rules(Server $server, array $input): array
      */
     private static function typeRules(Server $server, array $input): array
     {
-        if (! isset($input['type']) || ! in_array($input['type'], config('core.site_types'))) {
+        if (! isset($input['type']) || ! config('site.types.'.$input['type'])) {
             return [];
         }
 
diff --git a/app/Actions/Site/DeleteSite.php b/app/Actions/Site/DeleteSite.php
index 631722df..f111fa4f 100644
--- a/app/Actions/Site/DeleteSite.php
+++ b/app/Actions/Site/DeleteSite.php
@@ -5,8 +5,8 @@
 use App\Exceptions\SSHError;
 use App\Models\Service;
 use App\Models\Site;
-use App\SSH\Services\PHP\PHP;
-use App\SSH\Services\Webserver\Webserver;
+use App\Services\PHP\PHP;
+use App\Services\Webserver\Webserver;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Actions/Site/UpdateAliases.php b/app/Actions/Site/UpdateAliases.php
index 0f2c8dfb..d8cc8afb 100644
--- a/app/Actions/Site/UpdateAliases.php
+++ b/app/Actions/Site/UpdateAliases.php
@@ -4,7 +4,7 @@
 
 use App\Models\Service;
 use App\Models\Site;
-use App\SSH\Services\Webserver\Webserver;
+use App\Services\Webserver\Webserver;
 use App\ValidationRules\DomainRule;
 
 class UpdateAliases
@@ -21,7 +21,9 @@ public function update(Site $site, array $input): void
 
         /** @var Webserver $webserver */
         $webserver = $service->handler();
-        $webserver->updateVHost($site);
+        $webserver->updateVHost($site, regenerate: [
+            'core',
+        ]);
 
         $site->save();
     }
diff --git a/app/Actions/Site/UpdateBranch.php b/app/Actions/Site/UpdateBranch.php
index aa6c7815..8ed88843 100755
--- a/app/Actions/Site/UpdateBranch.php
+++ b/app/Actions/Site/UpdateBranch.php
@@ -4,7 +4,7 @@
 
 use App\Exceptions\SSHError;
 use App\Models\Site;
-use App\SSH\Git\Git;
+use App\SSH\OS\Git;
 use Illuminate\Support\Facades\Validator;
 
 class UpdateBranch
diff --git a/app/Actions/Site/UpdateLoadBalancer.php b/app/Actions/Site/UpdateLoadBalancer.php
index f3b58197..de307e05 100644
--- a/app/Actions/Site/UpdateLoadBalancer.php
+++ b/app/Actions/Site/UpdateLoadBalancer.php
@@ -30,7 +30,10 @@ public function update(Site $site, array $input): void
             $loadBalancerServer->save();
         }
 
-        $site->webserver()->updateVHost($site);
+        $site->webserver()->updateVHost($site, regenerate: [
+            'load-balancer-upstream',
+            'load-balancer',
+        ]);
     }
 
     /**
diff --git a/app/Actions/SourceControl/ConnectSourceControl.php b/app/Actions/SourceControl/ConnectSourceControl.php
index f711e47a..c8473aa4 100644
--- a/app/Actions/SourceControl/ConnectSourceControl.php
+++ b/app/Actions/SourceControl/ConnectSourceControl.php
@@ -51,7 +51,7 @@ public static function rules(array $input): array
             ],
             'provider' => [
                 'required',
-                Rule::in(config('core.source_control_providers')),
+                Rule::in(array_keys(config('source-control.providers'))),
             ],
         ];
 
diff --git a/app/Actions/StorageProvider/CreateStorageProvider.php b/app/Actions/StorageProvider/CreateStorageProvider.php
index f39752d3..49e46644 100644
--- a/app/Actions/StorageProvider/CreateStorageProvider.php
+++ b/app/Actions/StorageProvider/CreateStorageProvider.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
+use Throwable;
 
 class CreateStorageProvider
 {
@@ -35,7 +36,7 @@ public function create(User $user, Project $project, array $input): StorageProvi
                     'provider' => __("Couldn't connect to the provider"),
                 ]);
             }
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             throw ValidationException::withMessages([
                 'provider' => $e->getMessage(),
             ]);
@@ -55,7 +56,7 @@ public static function rules(array $input): array
         $rules = [
             'provider' => [
                 'required',
-                Rule::in(config('core.storage_providers')),
+                Rule::in(array_keys(config('storage-provider.providers'))),
             ],
             'name' => [
                 'required',
diff --git a/app/Actions/Worker/CreateWorker.php b/app/Actions/Worker/CreateWorker.php
index 7aba055c..aa98d904 100644
--- a/app/Actions/Worker/CreateWorker.php
+++ b/app/Actions/Worker/CreateWorker.php
@@ -7,7 +7,7 @@
 use App\Models\Service;
 use App\Models\Site;
 use App\Models\Worker;
-use App\SSH\Services\ProcessManager\ProcessManager;
+use App\Services\ProcessManager\ProcessManager;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
@@ -26,6 +26,7 @@ public function create(Server $server, array $input, ?Site $site = null): void
         $worker = new Worker([
             'server_id' => $server->id,
             'site_id' => $site?->id,
+            'name' => $input['name'],
             'command' => $input['command'],
             'user' => $input['user'],
             'auto_start' => $input['auto_start'] ? 1 : 0,
@@ -63,6 +64,19 @@ public function create(Server $server, array $input, ?Site $site = null): void
     public static function rules(Server $server, ?Site $site = null): array
     {
         return [
+            'name' => [
+                'required',
+                'string',
+                'max:255',
+                Rule::unique('workers')->where(function ($query) use ($server, $site) {
+                    return $query->where('server_id', $server->id)
+                        ->where(function ($query) use ($site) {
+                            if ($site) {
+                                $query->where('site_id', $site->id);
+                            }
+                        });
+                }),
+            ],
             'command' => [
                 'required',
             ],
diff --git a/app/Actions/Worker/EditWorker.php b/app/Actions/Worker/EditWorker.php
index c53468df..f3273a48 100644
--- a/app/Actions/Worker/EditWorker.php
+++ b/app/Actions/Worker/EditWorker.php
@@ -3,11 +3,10 @@
 namespace App\Actions\Worker;
 
 use App\Enums\WorkerStatus;
-use App\Models\Server;
 use App\Models\Service;
 use App\Models\Site;
 use App\Models\Worker;
-use App\SSH\Services\ProcessManager\ProcessManager;
+use App\Services\ProcessManager\ProcessManager;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
@@ -21,9 +20,10 @@ class EditWorker
      */
     public function edit(Worker $worker, array $input): void
     {
-        Validator::make($input, self::rules($worker->server, $worker->site))->validate();
+        Validator::make($input, self::rules($worker, $worker->site))->validate();
 
         $worker->fill([
+            'name' => $input['name'],
             'command' => $input['command'],
             'user' => $input['user'],
             'auto_start' => $input['auto_start'] ? 1 : 0,
@@ -61,15 +61,29 @@ public function edit(Worker $worker, array $input): void
     /**
      * @return array<string, array<string>>
      */
-    public static function rules(Server $server, ?Site $site = null): array
+    public static function rules(Worker $worker, ?Site $site = null): array
     {
         return [
+            'name' => [
+                'required',
+                'string',
+                'max:255',
+                Rule::unique('workers')->where(function ($query) use ($worker, $site) {
+                    return $query->where('server_id', $worker->server_id)
+                        ->where(function ($query) use ($site) {
+                            if ($site) {
+                                $query->where('site_id', $site->id);
+                            }
+                        });
+                })
+                    ->ignore($worker->id),
+            ],
             'command' => [
                 'required',
             ],
             'user' => [
                 'required',
-                Rule::in($site?->getSshUsers() ?? $server->getSshUsers()),
+                Rule::in($site?->getSshUsers() ?? $worker->server->getSshUsers()),
             ],
             'numprocs' => [
                 'required',
diff --git a/app/Actions/Worker/GetWorkerLogs.php b/app/Actions/Worker/GetWorkerLogs.php
index 2a54b2e7..6cb6faba 100644
--- a/app/Actions/Worker/GetWorkerLogs.php
+++ b/app/Actions/Worker/GetWorkerLogs.php
@@ -4,7 +4,7 @@
 
 use App\Models\Service;
 use App\Models\Worker;
-use App\SSH\Services\ProcessManager\ProcessManager;
+use App\Services\ProcessManager\ProcessManager;
 
 class GetWorkerLogs
 {
diff --git a/app/Actions/Worker/ManageWorker.php b/app/Actions/Worker/ManageWorker.php
index f3c8069b..deee226f 100644
--- a/app/Actions/Worker/ManageWorker.php
+++ b/app/Actions/Worker/ManageWorker.php
@@ -5,7 +5,7 @@
 use App\Enums\WorkerStatus;
 use App\Models\Service;
 use App\Models\Worker;
-use App\SSH\Services\ProcessManager\ProcessManager;
+use App\Services\ProcessManager\ProcessManager;
 
 class ManageWorker
 {
diff --git a/app/Console/Commands/CheckServersConnectionCommand.php b/app/Console/Commands/CheckServersConnectionCommand.php
index 1acc0d75..57d4b74a 100644
--- a/app/Console/Commands/CheckServersConnectionCommand.php
+++ b/app/Console/Commands/CheckServersConnectionCommand.php
@@ -18,9 +18,14 @@ public function handle(): void
             ServerStatus::READY,
             ServerStatus::DISCONNECTED,
         ])->chunk(50, function ($servers) {
+            $dispatchTime = now();
             /** @var Server $server */
             foreach ($servers as $server) {
-                dispatch(function () use ($server) {
+                dispatch(function () use ($server, $dispatchTime) {
+                    // check connection if dispatch time is less than 5 minutes ago
+                    if ($dispatchTime->diffInMinutes(now()) > 5) {
+                        return;
+                    }
                     $server->checkConnection();
                 })->onConnection('ssh');
             }
diff --git a/app/Console/Commands/GetMetricsCommand.php b/app/Console/Commands/GetMetricsCommand.php
index 0c52444a..a4fa3903 100644
--- a/app/Console/Commands/GetMetricsCommand.php
+++ b/app/Console/Commands/GetMetricsCommand.php
@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Enums\ServerStatus;
 use App\Models\Server;
 use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Builder;
@@ -15,17 +16,19 @@ class GetMetricsCommand extends Command
     public function handle(): void
     {
         $checkedMetrics = 0;
-        Server::query()->whereHas('services', function (Builder $query): void {
-            $query->where('type', 'monitoring')
-                ->where('name', 'remote-monitor');
-        })->chunk(10, function ($servers) use (&$checkedMetrics): void {
-            /** @var Server $server */
-            foreach ($servers as $server) {
-                $info = $server->os()->resourceInfo();
-                $server->metrics()->create(array_merge($info, ['server_id' => $server->id]));
-                $checkedMetrics++;
-            }
-        });
+        Server::query()
+            ->where('status', ServerStatus::READY)
+            ->whereHas('services', function (Builder $query): void {
+                $query->where('type', 'monitoring')
+                    ->where('name', 'remote-monitor');
+            })->chunk(10, function ($servers) use (&$checkedMetrics): void {
+                /** @var Server $server */
+                foreach ($servers as $server) {
+                    $info = $server->os()->resourceInfo();
+                    $server->metrics()->create(array_merge($info, ['server_id' => $server->id]));
+                    $checkedMetrics++;
+                }
+            });
         $this->info("Checked $checkedMetrics metrics");
     }
 }
diff --git a/app/Console/Commands/MigrateFromMysqlToSqlite.php b/app/Console/Commands/MigrateFromMysqlToSqlite.php
index c75a3bfc..36043708 100644
--- a/app/Console/Commands/MigrateFromMysqlToSqlite.php
+++ b/app/Console/Commands/MigrateFromMysqlToSqlite.php
@@ -2,6 +2,28 @@
 
 namespace App\Console\Commands;
 
+use App\Models\Backup;
+use App\Models\BackupFile;
+use App\Models\CronJob;
+use App\Models\Database;
+use App\Models\DatabaseUser;
+use App\Models\Deployment;
+use App\Models\DeploymentScript;
+use App\Models\FirewallRule;
+use App\Models\GitHook;
+use App\Models\NotificationChannel;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\ServerLog;
+use App\Models\ServerProvider;
+use App\Models\Service;
+use App\Models\Site;
+use App\Models\SourceControl;
+use App\Models\SshKey;
+use App\Models\Ssl;
+use App\Models\StorageProvider;
+use App\Models\User;
+use App\Models\Worker;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
@@ -26,28 +48,28 @@ public function handle(): void
 
         $this->call('migrate', ['--force' => true]);
 
-        $this->migrateModel(\App\Models\Backup::class);
-        $this->migrateModel(\App\Models\BackupFile::class);
-        $this->migrateModel(\App\Models\CronJob::class);
-        $this->migrateModel(\App\Models\Database::class);
-        $this->migrateModel(\App\Models\DatabaseUser::class);
-        $this->migrateModel(\App\Models\Deployment::class);
-        $this->migrateModel(\App\Models\DeploymentScript::class);
-        $this->migrateModel(\App\Models\FirewallRule::class);
-        $this->migrateModel(\App\Models\GitHook::class);
-        $this->migrateModel(\App\Models\NotificationChannel::class);
-        $this->migrateModel(\App\Models\Project::class);
-        $this->migrateModel(\App\Models\Worker::class);
-        $this->migrateModel(\App\Models\Server::class);
-        $this->migrateModel(\App\Models\ServerLog::class);
-        $this->migrateModel(\App\Models\ServerProvider::class);
-        $this->migrateModel(\App\Models\Service::class);
-        $this->migrateModel(\App\Models\Site::class);
-        $this->migrateModel(\App\Models\SourceControl::class);
-        $this->migrateModel(\App\Models\SshKey::class);
-        $this->migrateModel(\App\Models\Ssl::class);
-        $this->migrateModel(\App\Models\StorageProvider::class);
-        $this->migrateModel(\App\Models\User::class);
+        $this->migrateModel(Backup::class);
+        $this->migrateModel(BackupFile::class);
+        $this->migrateModel(CronJob::class);
+        $this->migrateModel(Database::class);
+        $this->migrateModel(DatabaseUser::class);
+        $this->migrateModel(Deployment::class);
+        $this->migrateModel(DeploymentScript::class);
+        $this->migrateModel(FirewallRule::class);
+        $this->migrateModel(GitHook::class);
+        $this->migrateModel(NotificationChannel::class);
+        $this->migrateModel(Project::class);
+        $this->migrateModel(Worker::class);
+        $this->migrateModel(Server::class);
+        $this->migrateModel(ServerLog::class);
+        $this->migrateModel(ServerProvider::class);
+        $this->migrateModel(Service::class);
+        $this->migrateModel(Site::class);
+        $this->migrateModel(SourceControl::class);
+        $this->migrateModel(SshKey::class);
+        $this->migrateModel(Ssl::class);
+        $this->migrateModel(StorageProvider::class);
+        $this->migrateModel(User::class);
 
         $env = File::get(base_path('.env'));
         $env = str_replace('DB_CONNECTION=mysql', 'DB_CONNECTION=sqlite', $env);
diff --git a/app/DTOs/DynamicFieldDTO.php b/app/DTOs/DynamicField.php
similarity index 94%
rename from app/DTOs/DynamicFieldDTO.php
rename to app/DTOs/DynamicField.php
index 584472f3..7f3dcd10 100644
--- a/app/DTOs/DynamicFieldDTO.php
+++ b/app/DTOs/DynamicField.php
@@ -2,7 +2,7 @@
 
 namespace App\DTOs;
 
-class DynamicFieldDTO
+class DynamicField
 {
     /**
      * @param  array<int, mixed>|null  $options
@@ -50,6 +50,13 @@ public function checkbox(): self
         return $this;
     }
 
+    public function alert(): self
+    {
+        $this->type = 'alert';
+
+        return $this;
+    }
+
     public function name(string $name): self
     {
         $this->name = $name;
diff --git a/app/DTOs/DynamicFieldsCollectionDTO.php b/app/DTOs/DynamicForm.php
similarity index 60%
rename from app/DTOs/DynamicFieldsCollectionDTO.php
rename to app/DTOs/DynamicForm.php
index dbf20491..62dfb6eb 100644
--- a/app/DTOs/DynamicFieldsCollectionDTO.php
+++ b/app/DTOs/DynamicForm.php
@@ -2,15 +2,23 @@
 
 namespace App\DTOs;
 
-readonly class DynamicFieldsCollectionDTO
+readonly class DynamicForm
 {
     /**
-     * @param  array<int, DynamicFieldDTO>  $fields
+     * @param  array<int, DynamicField>  $fields
      */
     public function __construct(
         private array $fields = [],
     ) {}
 
+    /**
+     * @param  array<int, DynamicField>  $fields
+     */
+    public static function make(array $fields): self
+    {
+        return new self($fields);
+    }
+
     /**
      * @return array<int, mixed>
      */
diff --git a/app/Enums/BackupFileStatus.php b/app/Enums/BackupFileStatus.php
index 59ac3b55..f361977b 100644
--- a/app/Enums/BackupFileStatus.php
+++ b/app/Enums/BackupFileStatus.php
@@ -4,17 +4,17 @@
 
 final class BackupFileStatus
 {
-    const CREATED = 'created';
+    const string CREATED = 'created';
 
-    const CREATING = 'creating';
+    const string CREATING = 'creating';
 
-    const FAILED = 'failed';
+    const string FAILED = 'failed';
 
-    const DELETING = 'deleting';
+    const string DELETING = 'deleting';
 
-    const RESTORING = 'restoring';
+    const string RESTORING = 'restoring';
 
-    const RESTORED = 'restored';
+    const string RESTORED = 'restored';
 
-    const RESTORE_FAILED = 'restore_failed';
+    const string RESTORE_FAILED = 'restore_failed';
 }
diff --git a/app/Enums/BackupStatus.php b/app/Enums/BackupStatus.php
index 428f9a1f..1a2a4cc1 100644
--- a/app/Enums/BackupStatus.php
+++ b/app/Enums/BackupStatus.php
@@ -4,11 +4,11 @@
 
 final class BackupStatus
 {
-    const RUNNING = 'running';
+    const string RUNNING = 'running';
 
-    const FAILED = 'failed';
+    const string FAILED = 'failed';
 
-    const DELETING = 'deleting';
+    const string DELETING = 'deleting';
 
-    const STOPPED = 'stopped';
+    const string STOPPED = 'stopped';
 }
diff --git a/app/Enums/CommandExecutionStatus.php b/app/Enums/CommandExecutionStatus.php
index c66d6d9b..893ba4f9 100644
--- a/app/Enums/CommandExecutionStatus.php
+++ b/app/Enums/CommandExecutionStatus.php
@@ -4,9 +4,9 @@
 
 final class CommandExecutionStatus
 {
-    const EXECUTING = 'executing';
+    const string EXECUTING = 'executing';
 
-    const COMPLETED = 'completed';
+    const string COMPLETED = 'completed';
 
-    const FAILED = 'failed';
+    const string FAILED = 'failed';
 }
diff --git a/app/Enums/CronjobStatus.php b/app/Enums/CronjobStatus.php
index 0c84aced..6baef958 100644
--- a/app/Enums/CronjobStatus.php
+++ b/app/Enums/CronjobStatus.php
@@ -4,17 +4,17 @@
 
 final class CronjobStatus
 {
-    const CREATING = 'creating';
+    const string CREATING = 'creating';
 
-    const READY = 'ready';
+    const string READY = 'ready';
 
-    const DELETING = 'deleting';
+    const string DELETING = 'deleting';
 
-    const ENABLING = 'enabling';
+    const string ENABLING = 'enabling';
 
-    const DISABLING = 'disabling';
+    const string DISABLING = 'disabling';
 
-    const UPDATING = 'updating';
+    const string UPDATING = 'updating';
 
-    const DISABLED = 'disabled';
+    const string DISABLED = 'disabled';
 }
diff --git a/app/Enums/Database.php b/app/Enums/Database.php
deleted file mode 100644
index ba5ea52c..00000000
--- a/app/Enums/Database.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-use App\Traits\Enum;
-
-final class Database
-{
-    use Enum;
-
-    const NONE = 'none';
-
-    const MYSQL57 = 'mysql57';
-
-    const MYSQL80 = 'mysql80';
-
-    const MYSQL84 = 'mysql84';
-
-    const MARIADB103 = 'mariadb103';
-
-    const MARIADB104 = 'mariadb104';
-
-    const MARIADB106 = 'mariadb1006';
-
-    const MARIADB1011 = 'mariadb1011';
-
-    const MARIADB114 = 'mariadb114';
-
-    const POSTGRESQL12 = 'postgresql12';
-
-    const POSTGRESQL13 = 'postgresql13';
-
-    const POSTGRESQL14 = 'postgresql14';
-
-    const POSTGRESQL15 = 'postgresql15';
-
-    const POSTGRESQL16 = 'postgresql16';
-}
diff --git a/app/Enums/DatabaseStatus.php b/app/Enums/DatabaseStatus.php
index 418e6c48..c1226f4f 100644
--- a/app/Enums/DatabaseStatus.php
+++ b/app/Enums/DatabaseStatus.php
@@ -4,11 +4,11 @@
 
 final class DatabaseStatus
 {
-    const READY = 'ready';
+    const string READY = 'ready';
 
-    const CREATING = 'creating';
+    const string CREATING = 'creating';
 
-    const FAILED = 'failed';
+    const string FAILED = 'failed';
 
-    const DELETING = 'deleting';
+    const string DELETING = 'deleting';
 }
diff --git a/app/Enums/DatabaseUserStatus.php b/app/Enums/DatabaseUserStatus.php
index 26586147..387f6752 100644
--- a/app/Enums/DatabaseUserStatus.php
+++ b/app/Enums/DatabaseUserStatus.php
@@ -4,11 +4,11 @@
 
 final class DatabaseUserStatus
 {
-    const READY = 'ready';
+    const string READY = 'ready';
 
-    const CREATING = 'creating';
+    const string CREATING = 'creating';
 
-    const FAILED = 'failed';
+    const string FAILED = 'failed';
 
-    const DELETING = 'deleting';
+    const string DELETING = 'deleting';
 }
diff --git a/app/Enums/DeploymentStatus.php b/app/Enums/DeploymentStatus.php
index 8a7d07c6..5a704919 100644
--- a/app/Enums/DeploymentStatus.php
+++ b/app/Enums/DeploymentStatus.php
@@ -4,9 +4,9 @@
 
 final class DeploymentStatus
 {
-    const DEPLOYING = 'deploying';
+    const string DEPLOYING = 'deploying';
 
-    const FINISHED = 'finished';
+    const string FINISHED = 'finished';
 
-    const FAILED = 'failed';
+    const string FAILED = 'failed';
 }
diff --git a/app/Enums/FirewallRuleStatus.php b/app/Enums/FirewallRuleStatus.php
index 36f9d868..fb2e63d4 100644
--- a/app/Enums/FirewallRuleStatus.php
+++ b/app/Enums/FirewallRuleStatus.php
@@ -4,13 +4,13 @@
 
 final class FirewallRuleStatus
 {
-    const CREATING = 'creating';
+    const string CREATING = 'creating';
 
-    const UPDATING = 'updating';
+    const string UPDATING = 'updating';
 
-    const READY = 'ready';
+    const string READY = 'ready';
 
-    const DELETING = 'deleting';
+    const string DELETING = 'deleting';
 
-    const FAILED = 'failed';
+    const string FAILED = 'failed';
 }
diff --git a/app/Enums/LogType.php b/app/Enums/LogType.php
deleted file mode 100644
index c1739714..00000000
--- a/app/Enums/LogType.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-final class LogType
-{
-    const SERVER = 'server';
-
-    const SITE = 'site';
-}
diff --git a/app/Enums/NodeJS.php b/app/Enums/NodeJS.php
deleted file mode 100644
index fd6d3085..00000000
--- a/app/Enums/NodeJS.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-use App\Traits\Enum;
-
-final class NodeJS
-{
-    use Enum;
-
-    const NONE = 'none';
-
-    const V4 = '4';
-
-    const V6 = '6';
-
-    const V8 = '8';
-
-    const V10 = '10';
-
-    const V12 = '12';
-
-    const V14 = '14';
-
-    const V16 = '16';
-
-    const V18 = '18';
-
-    const V20 = '20';
-
-    const V22 = '22';
-}
diff --git a/app/Enums/NotificationChannel.php b/app/Enums/NotificationChannel.php
deleted file mode 100644
index 940bb1b4..00000000
--- a/app/Enums/NotificationChannel.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-final class NotificationChannel
-{
-    const EMAIL = 'email';
-
-    const SLACK = 'slack';
-
-    const DISCORD = 'discord';
-
-    const TELEGRAM = 'telegram';
-}
diff --git a/app/Enums/PHP.php b/app/Enums/PHP.php
deleted file mode 100644
index f13a82c7..00000000
--- a/app/Enums/PHP.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-use App\Traits\Enum;
-
-final class PHP
-{
-    use Enum;
-
-    const NONE = 'none';
-
-    const V70 = '7.0';
-
-    const V71 = '7.1';
-
-    const V72 = '7.2';
-
-    const V73 = '7.3';
-
-    const V74 = '7.4';
-
-    const V80 = '8.0';
-
-    const V81 = '8.1';
-
-    const V82 = '8.2';
-
-    const V83 = '8.3';
-
-    const V84 = '8.4';
-}
diff --git a/app/Enums/PHPIniType.php b/app/Enums/PHPIniType.php
index 2c6a5efb..c1ec9747 100644
--- a/app/Enums/PHPIniType.php
+++ b/app/Enums/PHPIniType.php
@@ -4,7 +4,7 @@
 
 final class PHPIniType
 {
-    const CLI = 'cli';
+    const string CLI = 'cli';
 
-    const FPM = 'fpm';
+    const string FPM = 'fpm';
 }
diff --git a/app/Enums/RedirectStatus.php b/app/Enums/RedirectStatus.php
index 4b393109..cecf3429 100644
--- a/app/Enums/RedirectStatus.php
+++ b/app/Enums/RedirectStatus.php
@@ -4,11 +4,11 @@
 
 final class RedirectStatus
 {
-    const CREATING = 'creating';
+    const string CREATING = 'creating';
 
-    const READY = 'ready';
+    const string READY = 'ready';
 
-    const DELETING = 'deleting';
+    const string DELETING = 'deleting';
 
-    const FAILED = 'failed';
+    const string FAILED = 'failed';
 }
diff --git a/app/Enums/ScriptExecutionStatus.php b/app/Enums/ScriptExecutionStatus.php
index 5a537305..4177d790 100644
--- a/app/Enums/ScriptExecutionStatus.php
+++ b/app/Enums/ScriptExecutionStatus.php
@@ -4,9 +4,9 @@
 
 final class ScriptExecutionStatus
 {
-    const EXECUTING = 'executing';
+    const string EXECUTING = 'executing';
 
-    const COMPLETED = 'completed';
+    const string COMPLETED = 'completed';
 
-    const FAILED = 'failed';
+    const string FAILED = 'failed';
 }
diff --git a/app/Enums/ServerProvider.php b/app/Enums/ServerProvider.php
deleted file mode 100644
index d9d5b26e..00000000
--- a/app/Enums/ServerProvider.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-final class ServerProvider
-{
-    const CUSTOM = 'custom';
-
-    const AWS = 'aws';
-
-    const LINODE = 'linode';
-
-    const DIGITALOCEAN = 'digitalocean';
-
-    const VULTR = 'vultr';
-
-    const HETZNER = 'hetzner';
-}
diff --git a/app/Enums/ServerStatus.php b/app/Enums/ServerStatus.php
index 193983b4..29f2f901 100644
--- a/app/Enums/ServerStatus.php
+++ b/app/Enums/ServerStatus.php
@@ -4,13 +4,13 @@
 
 final class ServerStatus
 {
-    const READY = 'ready';
+    const string READY = 'ready';
 
-    const INSTALLING = 'installing';
+    const string INSTALLING = 'installing';
 
-    const INSTALLATION_FAILED = 'installation_failed';
+    const string INSTALLATION_FAILED = 'installation_failed';
 
-    const DISCONNECTED = 'disconnected';
+    const string DISCONNECTED = 'disconnected';
 
-    const UPDATING = 'updating';
+    const string UPDATING = 'updating';
 }
diff --git a/app/Enums/ServerType.php b/app/Enums/ServerType.php
deleted file mode 100644
index a4e9b1e0..00000000
--- a/app/Enums/ServerType.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-/**
- * @deprecated server types will be dropped
- */
-final class ServerType
-{
-    const REGULAR = 'regular';
-
-    const DATABASE = 'database';
-}
diff --git a/app/Enums/ServiceStatus.php b/app/Enums/ServiceStatus.php
index eb25b2ac..3c9666d5 100644
--- a/app/Enums/ServiceStatus.php
+++ b/app/Enums/ServiceStatus.php
@@ -4,27 +4,27 @@
 
 final class ServiceStatus
 {
-    const READY = 'ready';
+    const string READY = 'ready';
 
-    const INSTALLING = 'installing';
+    const string INSTALLING = 'installing';
 
-    const INSTALLATION_FAILED = 'installation_failed';
+    const string INSTALLATION_FAILED = 'installation_failed';
 
-    const UNINSTALLING = 'uninstalling';
+    const string UNINSTALLING = 'uninstalling';
 
-    const FAILED = 'failed';
+    const string FAILED = 'failed';
 
-    const STARTING = 'starting';
+    const string STARTING = 'starting';
 
-    const STOPPING = 'stopping';
+    const string STOPPING = 'stopping';
 
-    const RESTARTING = 'restarting';
+    const string RESTARTING = 'restarting';
 
-    const STOPPED = 'stopped';
+    const string STOPPED = 'stopped';
 
-    const ENABLING = 'enabling';
+    const string ENABLING = 'enabling';
 
-    const DISABLING = 'disabling';
+    const string DISABLING = 'disabling';
 
-    const DISABLED = 'disabled';
+    const string DISABLED = 'disabled';
 }
diff --git a/app/Enums/SiteFeature.php b/app/Enums/SiteFeature.php
deleted file mode 100644
index 3bff6bab..00000000
--- a/app/Enums/SiteFeature.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-final class SiteFeature
-{
-    const DEPLOYMENT = 'deployment';
-
-    const ENV = 'env';
-
-    const SSL = 'ssl';
-
-    const WORKERS = 'workers';
-
-    const COMMANDS = 'commands';
-}
diff --git a/app/Enums/SiteStatus.php b/app/Enums/SiteStatus.php
index 741e4df3..56591643 100644
--- a/app/Enums/SiteStatus.php
+++ b/app/Enums/SiteStatus.php
@@ -4,11 +4,11 @@
 
 final class SiteStatus
 {
-    const READY = 'ready';
+    const string READY = 'ready';
 
-    const INSTALLING = 'installing';
+    const string INSTALLING = 'installing';
 
-    const INSTALLATION_FAILED = 'installation_failed';
+    const string INSTALLATION_FAILED = 'installation_failed';
 
-    const DELETING = 'deleting';
+    const string DELETING = 'deleting';
 }
diff --git a/app/Enums/SiteType.php b/app/Enums/SiteType.php
deleted file mode 100644
index a7091e3a..00000000
--- a/app/Enums/SiteType.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-final class SiteType
-{
-    const PHP = 'php';
-
-    const PHP_BLANK = 'php-blank';
-
-    const LARAVEL = 'laravel';
-
-    const WORDPRESS = 'wordpress';
-
-    const PHPMYADMIN = 'phpmyadmin';
-
-    const LOAD_BALANCER = 'load-balancer';
-}
diff --git a/app/Enums/SourceControl.php b/app/Enums/SourceControl.php
deleted file mode 100644
index b1486c4a..00000000
--- a/app/Enums/SourceControl.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-final class SourceControl
-{
-    const GITHUB = 'github';
-
-    const GITLAB = 'gitlab';
-
-    const BITBUCKET = 'bitbucket';
-}
diff --git a/app/Enums/SshKeyStatus.php b/app/Enums/SshKeyStatus.php
index 23f1eb2a..e8e4817b 100644
--- a/app/Enums/SshKeyStatus.php
+++ b/app/Enums/SshKeyStatus.php
@@ -4,9 +4,9 @@
 
 final class SshKeyStatus
 {
-    const ADDING = 'adding';
+    const string ADDING = 'adding';
 
-    const ADDED = 'added';
+    const string ADDED = 'added';
 
-    const DELETING = 'deleting';
+    const string DELETING = 'deleting';
 }
diff --git a/app/Enums/SslStatus.php b/app/Enums/SslStatus.php
index 7b8eb11d..23d9e6eb 100644
--- a/app/Enums/SslStatus.php
+++ b/app/Enums/SslStatus.php
@@ -4,11 +4,11 @@
 
 final class SslStatus
 {
-    const CREATED = 'created';
+    const string CREATED = 'created';
 
-    const CREATING = 'creating';
+    const string CREATING = 'creating';
 
-    const DELETING = 'deleting';
+    const string DELETING = 'deleting';
 
-    const FAILED = 'failed';
+    const string FAILED = 'failed';
 }
diff --git a/app/Enums/SslType.php b/app/Enums/SslType.php
index 092fc839..4ce9a7c2 100644
--- a/app/Enums/SslType.php
+++ b/app/Enums/SslType.php
@@ -4,7 +4,7 @@
 
 final class SslType
 {
-    const LETSENCRYPT = 'letsencrypt';
+    const string LETSENCRYPT = 'letsencrypt';
 
-    const CUSTOM = 'custom';
+    const string CUSTOM = 'custom';
 }
diff --git a/app/Enums/StorageProvider.php b/app/Enums/StorageProvider.php
deleted file mode 100644
index 4e49132e..00000000
--- a/app/Enums/StorageProvider.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-final class StorageProvider
-{
-    const DROPBOX = 'dropbox';
-
-    const FTP = 'ftp';
-
-    const LOCAL = 'local';
-
-    const S3 = 's3';
-}
diff --git a/app/Enums/UserRole.php b/app/Enums/UserRole.php
index 57fc7ebc..a76fc48c 100644
--- a/app/Enums/UserRole.php
+++ b/app/Enums/UserRole.php
@@ -4,7 +4,7 @@
 
 final class UserRole
 {
-    const USER = 'user';
+    const string USER = 'user';
 
-    const ADMIN = 'admin';
+    const string ADMIN = 'admin';
 }
diff --git a/app/Enums/Webserver.php b/app/Enums/Webserver.php
deleted file mode 100644
index aa2ed7df..00000000
--- a/app/Enums/Webserver.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-final class Webserver
-{
-    const NONE = 'none';
-
-    const NGINX = 'nginx';
-
-    const CADDY = 'caddy';
-}
diff --git a/app/Enums/WorkerStatus.php b/app/Enums/WorkerStatus.php
index 89f1278e..a3ce1ea6 100644
--- a/app/Enums/WorkerStatus.php
+++ b/app/Enums/WorkerStatus.php
@@ -4,19 +4,19 @@
 
 final class WorkerStatus
 {
-    const RUNNING = 'running';
+    const string RUNNING = 'running';
 
-    const CREATING = 'creating';
+    const string CREATING = 'creating';
 
-    const DELETING = 'deleting';
+    const string DELETING = 'deleting';
 
-    const FAILED = 'failed';
+    const string FAILED = 'failed';
 
-    const STARTING = 'starting';
+    const string STARTING = 'starting';
 
-    const STOPPING = 'stopping';
+    const string STOPPING = 'stopping';
 
-    const RESTARTING = 'restarting';
+    const string RESTARTING = 'restarting';
 
-    const STOPPED = 'stopped';
+    const string STOPPED = 'stopped';
 }
diff --git a/app/Facades/SSH.php b/app/Facades/SSH.php
index b58c4c31..fa5917e8 100644
--- a/app/Facades/SSH.php
+++ b/app/Facades/SSH.php
@@ -2,14 +2,16 @@
 
 namespace App\Facades;
 
+use App\Models\Server;
+use App\Models\ServerLog;
 use App\Support\Testing\SSHFake;
 use Illuminate\Support\Facades\Facade as FacadeAlias;
 
 /**
  * Class SSH
  *
- * @method static \App\Helpers\SSH|SSHFake init(\App\Models\Server $server, string $asUser = null)
- * @method static setLog(?\App\Models\ServerLog $log)
+ * @method static \App\Helpers\SSH|SSHFake init(Server $server, string $asUser = null)
+ * @method static setLog(?ServerLog $log)
  * @method static connect()
  * @method static string exec(string $command, string $log = '', int $siteId = null, ?bool $stream = false, callable $streamCallback = null)
  * @method static string upload(string $local, string $remote, ?string $owner = null)
diff --git a/app/Helpers/Agent.php b/app/Helpers/Agent.php
index 99eb81ea..91a9646a 100644
--- a/app/Helpers/Agent.php
+++ b/app/Helpers/Agent.php
@@ -126,7 +126,7 @@ protected function findDetectionRulesAgainstUserAgent(array $rules)
     /**
      * Retrieve from the given key from the cache or resolve the value.
      *
-     * @param  \Closure():mixed  $callback
+     * @param  Closure():mixed  $callback
      * @return mixed
      */
     protected function retrieveUsingCacheOrResolve(string $key, Closure $callback)
diff --git a/app/Http/Controllers/API/HealthController.php b/app/Http/Controllers/API/HealthController.php
index c6efe31a..1a51fad2 100644
--- a/app/Http/Controllers/API/HealthController.php
+++ b/app/Http/Controllers/API/HealthController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\API;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
 use Knuckles\Scribe\Attributes\Endpoint;
 use Knuckles\Scribe\Attributes\Group;
 use Knuckles\Scribe\Attributes\Unauthenticated;
@@ -14,7 +15,7 @@ class HealthController extends Controller
     #[Get('api/health', name: 'api.health')]
     #[Unauthenticated]
     #[Endpoint(title: 'health-check')]
-    public function __invoke(): \Illuminate\Http\JsonResponse
+    public function __invoke(): JsonResponse
     {
         return response()->json([
             'success' => true,
diff --git a/app/Http/Controllers/API/ServerController.php b/app/Http/Controllers/API/ServerController.php
index 4dfcd0f1..82e64f9d 100644
--- a/app/Http/Controllers/API/ServerController.php
+++ b/app/Http/Controllers/API/ServerController.php
@@ -5,10 +5,6 @@
 use App\Actions\Server\CreateServer;
 use App\Actions\Server\RebootServer;
 use App\Actions\Server\Update;
-use App\Enums\Database;
-use App\Enums\PHP;
-use App\Enums\ServerProvider;
-use App\Enums\Webserver;
 use App\Http\Controllers\Controller;
 use App\Http\Resources\ServerResource;
 use App\Models\Project;
@@ -45,16 +41,16 @@ public function index(Project $project): ResourceCollection
     #[Post('/', name: 'api.projects.servers.create', middleware: 'ability:write')]
     #[Endpoint(title: 'create', description: 'Create a new server.')]
     #[BodyParam(name: 'provider', description: 'The server provider type', required: true)]
-    #[BodyParam(name: 'server_provider', description: 'If the provider is not custom, the ID of the server provider profile', enum: [ServerProvider::CUSTOM, ServerProvider::HETZNER, ServerProvider::DIGITALOCEAN, ServerProvider::LINODE, ServerProvider::VULTR])]
+    #[BodyParam(name: 'server_provider', description: 'If the provider is not custom, the ID of the server provider profile')]
     #[BodyParam(name: 'region', description: 'Provider region if the provider is not custom')]
     #[BodyParam(name: 'plan', description: 'Provider plan if the provider is not custom')]
     #[BodyParam(name: 'ip', description: 'SSH IP address if the provider is custom')]
     #[BodyParam(name: 'port', description: 'SSH Port if the provider is custom')]
     #[BodyParam(name: 'name', description: 'The name of the server.', required: true)]
     #[BodyParam(name: 'os', description: 'The os of the server', required: true)]
-    #[BodyParam(name: 'webserver', description: 'Web server', required: true, enum: [Webserver::NONE, Webserver::NGINX, Webserver::CADDY])]
-    #[BodyParam(name: 'database', description: 'Database', required: true, enum: [Database::NONE, Database::MYSQL57, Database::MYSQL80, Database::MARIADB103, Database::MARIADB104, Database::MARIADB103, Database::POSTGRESQL12, Database::POSTGRESQL13, Database::POSTGRESQL14, Database::POSTGRESQL15, Database::POSTGRESQL16], )]
-    #[BodyParam(name: 'php', description: 'PHP version', required: true, enum: [PHP::V70, PHP::V71, PHP::V72, PHP::V73, PHP::V74, PHP::V80, PHP::V81, PHP::V82, PHP::V83])]
+    #[BodyParam(name: 'webserver', description: 'Web server', required: true)]
+    #[BodyParam(name: 'database', description: 'Database', required: true)]
+    #[BodyParam(name: 'php', description: 'PHP version', required: true)]
     #[ResponseFromApiResource(ServerResource::class, Server::class)]
     public function create(Request $request, Project $project): ServerResource
     {
diff --git a/app/Http/Controllers/API/SiteController.php b/app/Http/Controllers/API/SiteController.php
index e4b82565..ff89e835 100644
--- a/app/Http/Controllers/API/SiteController.php
+++ b/app/Http/Controllers/API/SiteController.php
@@ -9,13 +9,13 @@
 use App\Actions\Site\UpdateEnv;
 use App\Actions\Site\UpdateLoadBalancer;
 use App\Enums\LoadBalancerMethod;
-use App\Enums\SiteType;
 use App\Exceptions\DeploymentScriptIsEmptyException;
 use App\Http\Controllers\Controller;
 use App\Http\Resources\SiteResource;
 use App\Models\Project;
 use App\Models\Server;
 use App\Models\Site;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 use Knuckles\Scribe\Attributes\BodyParam;
@@ -49,7 +49,7 @@ public function index(Project $project, Server $server): ResourceCollection
 
     #[Post('/', name: 'api.projects.servers.sites.create', middleware: 'ability:write')]
     #[Endpoint(title: 'create', description: 'Create a new site.')]
-    #[BodyParam(name: 'type', required: true, enum: [SiteType::PHP, SiteType::PHP_BLANK, SiteType::PHPMYADMIN, SiteType::LARAVEL, SiteType::WORDPRESS, SiteType::LOAD_BALANCER])]
+    #[BodyParam(name: 'type', required: true)]
     #[BodyParam(name: 'domain', required: true)]
     #[BodyParam(name: 'aliases', type: 'array')]
     #[BodyParam(name: 'php_version', description: 'One of the installed PHP Versions', required: true, example: '7.4')]
@@ -172,7 +172,7 @@ public function updateDeploymentScript(Request $request, Project $project, Serve
     #[Get('{site}/deployment-script', name: 'api.projects.servers.sites.deployment-script.show', middleware: 'ability:read')]
     #[Endpoint(title: 'deployment-script', description: 'Get site deployment script content')]
     #[Response(status: 200)]
-    public function showDeploymentScript(Project $project, Server $server, Site $site): \Illuminate\Http\JsonResponse
+    public function showDeploymentScript(Project $project, Server $server, Site $site): JsonResponse
     {
         $this->authorize('view', [$site, $server]);
 
@@ -190,7 +190,7 @@ public function showDeploymentScript(Project $project, Server $server, Site $sit
             'env' => 'APP_NAME=Laravel\nAPP_ENV=production',
         ],
     ], status: 200)]
-    public function showEnv(Project $project, Server $server, Site $site): \Illuminate\Http\JsonResponse
+    public function showEnv(Project $project, Server $server, Site $site): JsonResponse
     {
         $this->authorize('view', [$site, $server]);
 
diff --git a/app/Http/Controllers/API/SourceControlController.php b/app/Http/Controllers/API/SourceControlController.php
index 72e435ed..7a5c4bdb 100644
--- a/app/Http/Controllers/API/SourceControlController.php
+++ b/app/Http/Controllers/API/SourceControlController.php
@@ -42,7 +42,7 @@ public function index(Project $project): ResourceCollection
 
     #[Post('/', name: 'api.projects.source-controls.create', middleware: 'ability:write')]
     #[Endpoint(title: 'create')]
-    #[BodyParam(name: 'provider', description: 'The provider', required: true, enum: [\App\Enums\SourceControl::GITLAB, \App\Enums\SourceControl::GITHUB, \App\Enums\SourceControl::BITBUCKET])]
+    #[BodyParam(name: 'provider', description: 'The provider', required: true)]
     #[BodyParam(name: 'name', description: 'The name of the storage provider.', required: true)]
     #[BodyParam(name: 'token', description: 'The token if provider requires api token')]
     #[BodyParam(name: 'url', description: 'The URL if the provider is Gitlab and it is self-hosted')]
@@ -61,7 +61,7 @@ public function create(Request $request, Project $project): SourceControlResourc
     #[Get('{sourceControl}', name: 'api.projects.source-controls.show', middleware: 'ability:read')]
     #[Endpoint(title: 'show')]
     #[ResponseFromApiResource(SourceControlResource::class, SourceControl::class)]
-    public function show(Project $project, SourceControl $sourceControl): \App\Http\Resources\SourceControlResource
+    public function show(Project $project, SourceControl $sourceControl): SourceControlResource
     {
         $this->authorize('view', $sourceControl);
 
@@ -79,7 +79,7 @@ public function show(Project $project, SourceControl $sourceControl): \App\Http\
     #[BodyParam(name: 'password', description: 'The password if the provider is Bitbucket')]
     #[BodyParam(name: 'global', description: 'Accessible in all projects', enum: [true, false])]
     #[ResponseFromApiResource(SourceControlResource::class, SourceControl::class)]
-    public function update(Request $request, Project $project, SourceControl $sourceControl): \App\Http\Resources\SourceControlResource
+    public function update(Request $request, Project $project, SourceControl $sourceControl): SourceControlResource
     {
         $this->authorize('update', $sourceControl);
 
diff --git a/app/Http/Controllers/SSLController.php b/app/Http/Controllers/SSLController.php
index a70833b9..a5489165 100644
--- a/app/Http/Controllers/SSLController.php
+++ b/app/Http/Controllers/SSLController.php
@@ -63,7 +63,9 @@ public function enableForceSSL(Server $server, Site $site): RedirectResponse
 
         $site->force_ssl = true;
         $site->save();
-        $site->webserver()->updateVHost($site);
+        $site->webserver()->updateVHost($site, regenerate: [
+            'force-ssl',
+        ]);
 
         return back()
             ->with('success', 'Force SSL enabled successfully.');
@@ -76,7 +78,9 @@ public function disableForceSSL(Server $server, Site $site): RedirectResponse
 
         $site->force_ssl = false;
         $site->save();
-        $site->webserver()->updateVHost($site);
+        $site->webserver()->updateVHost($site, regenerate: [
+            'force-ssl',
+        ]);
 
         return back()
             ->with('success', 'Force SSL disabled successfully.');
diff --git a/app/Http/Controllers/SiteFeatureController.php b/app/Http/Controllers/SiteFeatureController.php
new file mode 100644
index 00000000..bff57681
--- /dev/null
+++ b/app/Http/Controllers/SiteFeatureController.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Server;
+use App\Models\Site;
+use App\SiteFeatures\ActionInterface;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Inertia\Inertia;
+use Inertia\Response;
+use Spatie\RouteAttributes\Attributes\Get;
+use Spatie\RouteAttributes\Attributes\Middleware;
+use Spatie\RouteAttributes\Attributes\Post;
+use Spatie\RouteAttributes\Attributes\Prefix;
+
+#[Prefix('/servers/{server}/sites/{site}/features')]
+#[Middleware(['auth', 'has-project'])]
+class SiteFeatureController extends Controller
+{
+    #[Get('/', name: 'site-features')]
+    public function index(Server $server, Site $site): Response
+    {
+        $this->authorize('view', [$site, $server]);
+
+        return Inertia::render('site-features/index', [
+            'features' => $site->features(),
+        ]);
+    }
+
+    #[Post('/{feature}/{action}', name: 'site-features.action')]
+    public function action(Request $request, Server $server, Site $site, string $feature, string $action): RedirectResponse
+    {
+        $this->authorize('update', [$site, $server]);
+
+        $handler = config('site.types.'.$site->type.'.features.'.$feature.'.actions.'.$action.'.handler');
+        if ($handler && class_exists($handler)) {
+            /** @var ActionInterface $actionHandler */
+            $actionHandler = new $handler($site);
+            $actionHandler->handle($request);
+        }
+
+        return back();
+    }
+}
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index c520b73c..cee1d15e 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -2,7 +2,37 @@
 
 namespace App\Http;
 
+use App\Http\Middleware\Authenticate;
+use App\Http\Middleware\CanSeeProjectMiddleware;
+use App\Http\Middleware\EncryptCookies;
+use App\Http\Middleware\HandleAppearance;
+use App\Http\Middleware\HandleInertiaRequests;
+use App\Http\Middleware\HasProjectMiddleware;
+use App\Http\Middleware\MustBeAdminMiddleware;
+use App\Http\Middleware\PreventRequestsDuringMaintenance;
+use App\Http\Middleware\RedirectIfAuthenticated;
+use App\Http\Middleware\TrimStrings;
+use App\Http\Middleware\TrustProxies;
+use App\Http\Middleware\ValidateSignature;
+use App\Http\Middleware\VerifyCsrfToken;
+use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
+use Illuminate\Auth\Middleware\Authorize;
+use Illuminate\Auth\Middleware\EnsureEmailIsVerified;
+use Illuminate\Auth\Middleware\RequirePassword;
+use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
+use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
+use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
+use Illuminate\Http\Middleware\AddLinkHeadersForPreloadedAssets;
+use Illuminate\Http\Middleware\HandleCors;
+use Illuminate\Http\Middleware\SetCacheHeaders;
+use Illuminate\Routing\Middleware\SubstituteBindings;
+use Illuminate\Routing\Middleware\ThrottleRequests;
+use Illuminate\Session\Middleware\AuthenticateSession;
+use Illuminate\Session\Middleware\StartSession;
+use Illuminate\View\Middleware\ShareErrorsFromSession;
+use Laravel\Sanctum\Http\Middleware\CheckAbilities;
+use Laravel\Sanctum\Http\Middleware\CheckForAnyAbility;
 
 class Kernel extends HttpKernel
 {
@@ -15,12 +45,12 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
-        \App\Http\Middleware\TrustProxies::class,
-        \Illuminate\Http\Middleware\HandleCors::class,
-        \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
-        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \App\Http\Middleware\TrimStrings::class,
-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+        TrustProxies::class,
+        HandleCors::class,
+        PreventRequestsDuringMaintenance::class,
+        ValidatePostSize::class,
+        TrimStrings::class,
+        ConvertEmptyStringsToNull::class,
     ];
 
     /**
@@ -30,20 +60,20 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
-            \App\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \App\Http\Middleware\HandleInertiaRequests::class,
-            \App\Http\Middleware\HandleAppearance::class,
-            \Illuminate\Http\Middleware\AddLinkHeadersForPreloadedAssets::class,
+            EncryptCookies::class,
+            AddQueuedCookiesToResponse::class,
+            StartSession::class,
+            ShareErrorsFromSession::class,
+            VerifyCsrfToken::class,
+            SubstituteBindings::class,
+            HandleInertiaRequests::class,
+            HandleAppearance::class,
+            AddLinkHeadersForPreloadedAssets::class,
         ],
 
         'api' => [
-            \Illuminate\Routing\Middleware\ThrottleRequests::class.':api',
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            ThrottleRequests::class.':api',
+            SubstituteBindings::class,
         ],
     ];
 
@@ -55,20 +85,20 @@ class Kernel extends HttpKernel
      * @var array<string, class-string|string>
      */
     protected $middlewareAliases = [
-        'auth' => \App\Http\Middleware\Authenticate::class,
-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
-        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
-        'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
-        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
-        'signed' => \App\Http\Middleware\ValidateSignature::class,
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
-        'abilities' => \Laravel\Sanctum\Http\Middleware\CheckAbilities::class,
-        'ability' => \Laravel\Sanctum\Http\Middleware\CheckForAnyAbility::class,
-        'has-project' => \App\Http\Middleware\HasProjectMiddleware::class,
-        'can-see-project' => \App\Http\Middleware\CanSeeProjectMiddleware::class,
-        'must-be-admin' => \App\Http\Middleware\MustBeAdminMiddleware::class,
+        'auth' => Authenticate::class,
+        'auth.basic' => AuthenticateWithBasicAuth::class,
+        'auth.session' => AuthenticateSession::class,
+        'cache.headers' => SetCacheHeaders::class,
+        'can' => Authorize::class,
+        'guest' => RedirectIfAuthenticated::class,
+        'password.confirm' => RequirePassword::class,
+        'signed' => ValidateSignature::class,
+        'throttle' => ThrottleRequests::class,
+        'verified' => EnsureEmailIsVerified::class,
+        'abilities' => CheckAbilities::class,
+        'ability' => CheckForAnyAbility::class,
+        'has-project' => HasProjectMiddleware::class,
+        'can-see-project' => CanSeeProjectMiddleware::class,
+        'must-be-admin' => MustBeAdminMiddleware::class,
     ];
 }
diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php
index 1aa5ee2d..91df4dd8 100644
--- a/app/Http/Middleware/HandleInertiaRequests.php
+++ b/app/Http/Middleware/HandleInertiaRequests.php
@@ -65,7 +65,7 @@ public function share(Request $request): array
                 $sites = SiteResource::collection($server->sites);
             }
 
-            $data['serverSites'] = $sites;
+            $data['server_sites'] = $sites;
 
             if ($request->route('site')) {
                 $data['site'] = SiteResource::make($request->route('site'));
@@ -82,15 +82,37 @@ public function share(Request $request): array
                 'projects' => $user?->allProjects()->get(),
                 'currentProject' => $user?->currentProject,
             ],
-            'publicKeyText' => __('servers.create.public_key_text', ['public_key' => get_public_key_content()]),
-            'projectServers' => $servers,
-            'configs' => config('core'),
+            'public_key_text' => __('servers.create.public_key_text', ['public_key' => get_public_key_content()]),
+            'project_servers' => $servers,
+            'configs' => [
+                'operating_systems' => config('core.operating_systems'),
+                'colors' => config('core.colors'),
+                'cronjob_intervals' => config('core.cronjob_intervals'),
+                'metrics_periods' => config('core.metrics_periods'),
+                'site' => [
+                    'types' => config('site.types'),
+                ],
+                'source_control' => [
+                    'providers' => config('source-control.providers'),
+                ],
+                'server_provider' => [
+                    'providers' => config('server-provider.providers'),
+                ],
+                'storage_provider' => [
+                    'providers' => config('storage-provider.providers'),
+                ],
+                'notification_channel' => [
+                    'providers' => config('notification-channel.providers'),
+                ],
+                'service' => [
+                    'services' => config('service.services'),
+                ],
+            ],
             'ziggy' => fn (): array => [
                 ...(new Ziggy)->toArray(),
                 'location' => $request->url(),
             ],
             'csrf_token' => csrf_token(),
-            'sidebarOpen' => ! $request->hasCookie('sidebar_state') || $request->cookie('sidebar_state') === 'true',
             'flash' => [
                 'success' => fn () => $request->session()->get('success'),
                 'error' => fn () => $request->session()->get('error'),
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index fef34bdd..fd952703 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -13,7 +13,7 @@ class RedirectIfAuthenticated
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     * @param  Closure(Request): (Response)  $next
      */
     public function handle(Request $request, Closure $next, string ...$guards): Response
     {
diff --git a/app/Http/Resources/ServerResource.php b/app/Http/Resources/ServerResource.php
index f3676525..7547369f 100644
--- a/app/Http/Resources/ServerResource.php
+++ b/app/Http/Resources/ServerResource.php
@@ -27,8 +27,6 @@ public function toArray(Request $request): array
             'local_ip' => $this->local_ip,
             'port' => $this->port,
             'os' => $this->os,
-            'type' => $this->type,
-            'type_data' => $this->type_data,
             'provider' => $this->provider,
             'provider_data' => $this->provider_data,
             'public_key' => $this->public_key,
diff --git a/app/Http/Resources/SiteResource.php b/app/Http/Resources/SiteResource.php
index c55e67fb..e8025ec0 100644
--- a/app/Http/Resources/SiteResource.php
+++ b/app/Http/Resources/SiteResource.php
@@ -21,11 +21,10 @@ public function toArray(Request $request): array
             'source_control_id' => $this->source_control_id,
             'type' => $this->type,
             'type_data' => $this->type_data,
-            'features' => $this->type()->supportedFeatures(),
             'domain' => $this->domain,
             'aliases' => $this->aliases,
             'web_directory' => $this->web_directory,
-            'webserver' => $this->webserver()->name(),
+            'webserver' => $this->webserver()->id(),
             'path' => $this->path,
             'php_version' => $this->php_version,
             'repository' => $this->repository,
diff --git a/app/Http/Resources/WorkerResource.php b/app/Http/Resources/WorkerResource.php
index a67c8b79..64d95748 100644
--- a/app/Http/Resources/WorkerResource.php
+++ b/app/Http/Resources/WorkerResource.php
@@ -17,6 +17,7 @@ public function toArray(Request $request): array
         return [
             'id' => $this->id,
             'server_id' => $this->server_id,
+            'name' => $this->name,
             'command' => $this->command,
             'user' => $this->user,
             'auto_start' => $this->auto_start,
diff --git a/app/Models/BackupFile.php b/app/Models/BackupFile.php
index 90fa00f9..dd427414 100644
--- a/app/Models/BackupFile.php
+++ b/app/Models/BackupFile.php
@@ -4,7 +4,10 @@
 
 use App\Actions\Database\ManageBackupFile;
 use App\Enums\BackupFileStatus;
-use App\Enums\StorageProvider as StorageProviderAlias;
+use App\StorageProviders\Dropbox;
+use App\StorageProviders\FTP;
+use App\StorageProviders\Local;
+use App\StorageProviders\S3;
 use Carbon\Carbon;
 use Database\Factories\BackupFileFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -81,7 +84,7 @@ public function isAvailable(): bool
 
     public function isLocal(): bool
     {
-        return $this->backup->storage->provider === StorageProviderAlias::LOCAL;
+        return $this->backup->storage->provider === Local::id();
     }
 
     /**
@@ -103,8 +106,8 @@ public function path(): string
         $databaseName = $this->backup->database->name;
 
         return match ($storage->provider) {
-            StorageProviderAlias::DROPBOX => '/'.$databaseName.'/'.$this->name.'.zip',
-            StorageProviderAlias::S3, StorageProviderAlias::FTP, StorageProviderAlias::LOCAL => implode('/', [
+            Dropbox::id() => '/'.$databaseName.'/'.$this->name.'.zip',
+            S3::id(), FTP::id(), Local::id() => implode('/', [
                 rtrim((string) $storage->credentials['path'], '/'),
                 $databaseName,
                 $this->name.'.zip',
diff --git a/app/Models/CronJob.php b/app/Models/CronJob.php
index 80d44ab1..2d5737bc 100755
--- a/app/Models/CronJob.php
+++ b/app/Models/CronJob.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Enums\CronjobStatus;
+use Database\Factories\CronJobFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
@@ -18,7 +19,7 @@
  */
 class CronJob extends AbstractModel
 {
-    /** @use HasFactory<\Database\Factories\CronJobFactory> */
+    /** @use HasFactory<CronJobFactory> */
     use HasFactory;
 
     protected $fillable = [
diff --git a/app/Models/DatabaseUser.php b/app/Models/DatabaseUser.php
index 4af54fac..171fbd4d 100755
--- a/app/Models/DatabaseUser.php
+++ b/app/Models/DatabaseUser.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Enums\DatabaseUserStatus;
+use Database\Factories\DatabaseUserFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
@@ -17,7 +18,7 @@
  */
 class DatabaseUser extends AbstractModel
 {
-    /** @use HasFactory<\Database\Factories\DatabaseUserFactory> */
+    /** @use HasFactory<DatabaseUserFactory> */
     use HasFactory;
 
     protected $fillable = [
diff --git a/app/Models/File.php b/app/Models/File.php
index 34b57d35..9b639787 100644
--- a/app/Models/File.php
+++ b/app/Models/File.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use Database\Factories\FileFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
@@ -23,7 +24,7 @@
  */
 class File extends AbstractModel
 {
-    /** @use HasFactory<\Database\Factories\FileFactory> */
+    /** @use HasFactory<FileFactory> */
     use HasFactory;
 
     protected $fillable = [
diff --git a/app/Models/GitHook.php b/app/Models/GitHook.php
index ffca9ab3..4d8c4230 100755
--- a/app/Models/GitHook.php
+++ b/app/Models/GitHook.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Exceptions\FailedToDestroyGitHook;
+use Database\Factories\GitHookFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
@@ -19,7 +20,7 @@
  */
 class GitHook extends AbstractModel
 {
-    /** @use HasFactory<\Database\Factories\GitHookFactory> */
+    /** @use HasFactory<GitHookFactory> */
     use HasFactory;
 
     protected $fillable = [
diff --git a/app/Models/NotificationChannel.php b/app/Models/NotificationChannel.php
index 33c422d1..f5f92d03 100644
--- a/app/Models/NotificationChannel.php
+++ b/app/Models/NotificationChannel.php
@@ -42,7 +42,7 @@ class NotificationChannel extends AbstractModel
 
     public function provider(): \App\NotificationChannels\NotificationChannel
     {
-        $class = config('core.notification_channels_providers_class')[$this->provider];
+        $class = config('notification-channel.providers.'.$this->provider.'.handler');
 
         /** @var \App\NotificationChannels\NotificationChannel $provider */
         $provider = new $class($this);
diff --git a/app/Models/Script.php b/app/Models/Script.php
index d7c1f8a5..55b5adf6 100644
--- a/app/Models/Script.php
+++ b/app/Models/Script.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Carbon\Carbon;
+use Database\Factories\ScriptFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -25,7 +26,7 @@
  */
 class Script extends AbstractModel
 {
-    /** @use HasFactory<\Database\Factories\ScriptFactory> */
+    /** @use HasFactory<ScriptFactory> */
     use HasFactory;
 
     protected $fillable = [
diff --git a/app/Models/ScriptExecution.php b/app/Models/ScriptExecution.php
index 88cb27cb..f0caaa31 100644
--- a/app/Models/ScriptExecution.php
+++ b/app/Models/ScriptExecution.php
@@ -4,6 +4,7 @@
 
 use App\Enums\ScriptExecutionStatus;
 use Carbon\Carbon;
+use Database\Factories\ScriptExecutionFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
@@ -23,7 +24,7 @@
  */
 class ScriptExecution extends AbstractModel
 {
-    /** @use HasFactory<\Database\Factories\ScriptExecutionFactory> */
+    /** @use HasFactory<ScriptExecutionFactory> */
     use HasFactory;
 
     protected $fillable = [
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 4f1a64ce..127dd944 100755
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -7,10 +7,9 @@
 use App\Enums\ServiceStatus;
 use App\Exceptions\SSHError;
 use App\Facades\SSH;
-use App\ServerTypes\ServerType;
-use App\SSH\Cron\Cron;
+use App\SSH\OS\Cron;
 use App\SSH\OS\OS;
-use App\SSH\Systemd\Systemd;
+use App\SSH\OS\Systemd;
 use App\Support\Testing\SSHFake;
 use Carbon\Carbon;
 use Database\Factories\ServerFactory;
@@ -81,8 +80,6 @@ class Server extends AbstractModel
         'local_ip',
         'port',
         'os',
-        'type',
-        'type_data',
         'provider',
         'provider_id',
         'provider_data',
@@ -101,7 +98,6 @@ class Server extends AbstractModel
     protected $casts = [
         'project_id' => 'integer',
         'user_id' => 'integer',
-        'type_data' => 'json',
         'port' => 'integer',
         'provider_data' => 'json',
         'authentication' => 'encrypted:json',
@@ -410,19 +406,9 @@ public function installedNodejsVersions(): array
         return $versions;
     }
 
-    public function type(): ServerType
-    {
-        $typeClass = config('core.server_types_class')[$this->type];
-
-        /** @var ServerType $type */
-        $type = new $typeClass($this);
-
-        return $type;
-    }
-
     public function provider(): \App\ServerProviders\ServerProvider
     {
-        $providerClass = config('core.server_providers_class')[$this->provider];
+        $providerClass = config('server-provider.providers.'.$this->provider.'.handler');
 
         /** @var \App\ServerProviders\ServerProvider $provider */
         $provider = new $providerClass($this->serverProvider ?? new ServerProvider, $this);
diff --git a/app/Models/ServerProvider.php b/app/Models/ServerProvider.php
index 6bf2f84e..a44cbbce 100644
--- a/app/Models/ServerProvider.php
+++ b/app/Models/ServerProvider.php
@@ -67,7 +67,7 @@ public function servers(): HasMany
 
     public function provider(): \App\ServerProviders\ServerProvider
     {
-        $providerClass = config('core.server_providers_class')[$this->provider];
+        $providerClass = config('server-provider.providers.'.$this->provider.'.handler');
 
         /** @var \App\ServerProviders\ServerProvider $provider */
         $provider = new $providerClass($this, new Server);
diff --git a/app/Models/Service.php b/app/Models/Service.php
index 5a529003..4aad15d6 100755
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -5,15 +5,16 @@
 use App\Actions\Service\Manage;
 use App\Enums\ServiceStatus;
 use App\Exceptions\ServiceInstallationFailed;
-use App\SSH\Services\Firewall\Firewall;
-use App\SSH\Services\PHP\PHP;
-use App\SSH\Services\ProcessManager\ProcessManager;
-use App\SSH\Services\ServiceInterface;
-use App\SSH\Services\Webserver\Webserver;
+use App\Services\Firewall\Firewall;
+use App\Services\PHP\PHP;
+use App\Services\ProcessManager\ProcessManager;
+use App\Services\ServiceInterface;
+use App\Services\Webserver\Webserver;
 use Database\Factories\ServiceFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Str;
+use InvalidArgumentException;
 
 /**
  * @property int $server_id
@@ -50,17 +51,6 @@ class Service extends AbstractModel
         'is_default' => 'boolean',
     ];
 
-    public static function boot(): void
-    {
-        parent::boot();
-
-        static::creating(function (Service $service): void {
-            if (array_key_exists($service->name, config('core.service_units'))) {
-                $service->unit = config('core.service_units')[$service->name][$service->server->os][$service->version];
-            }
-        });
-    }
-
     /**
      * @var array<string, string>
      */
@@ -87,9 +77,14 @@ public function server(): BelongsTo
         return $this->belongsTo(Server::class);
     }
 
-    public function handler(): ServiceInterface|Webserver|PHP|Firewall|\App\SSH\Services\Database\Database|ProcessManager
+    public function handler(): ServiceInterface|Webserver|PHP|Firewall|\App\Services\Database\Database|ProcessManager
     {
-        $handler = config('core.service_handlers')[$this->name];
+        $name = $this->name;
+        $handler = config("service.services.$name.handler");
+
+        if (! $handler) {
+            throw new InvalidArgumentException("Service handler for $name is not defined.");
+        }
 
         /** @var ServiceInterface $service */
         $service = new $handler($this);
@@ -109,26 +104,26 @@ public function validateInstall(string $result): void
 
     public function start(): void
     {
-        $this->unit && app(Manage::class)->start($this);
+        $this->handler()->unit() && app(Manage::class)->start($this);
     }
 
     public function stop(): void
     {
-        $this->unit && app(Manage::class)->stop($this);
+        $this->handler()->unit() && app(Manage::class)->stop($this);
     }
 
     public function restart(): void
     {
-        $this->unit && app(Manage::class)->restart($this);
+        $this->handler()->unit() && app(Manage::class)->restart($this);
     }
 
     public function enable(): void
     {
-        $this->unit && app(Manage::class)->enable($this);
+        $this->handler()->unit() && app(Manage::class)->enable($this);
     }
 
     public function disable(): void
     {
-        $this->unit && app(Manage::class)->disable($this);
+        $this->handler()->unit() && app(Manage::class)->disable($this);
     }
 }
diff --git a/app/Models/Site.php b/app/Models/Site.php
index 9bdd9708..1bdaee39 100755
--- a/app/Models/Site.php
+++ b/app/Models/Site.php
@@ -8,9 +8,10 @@
 use App\Exceptions\FailedToDestroyGitHook;
 use App\Exceptions\SourceControlIsNotConnected;
 use App\Exceptions\SSHError;
+use App\Services\PHP\PHP;
+use App\Services\Webserver\Webserver;
+use App\SiteFeatures\ActionInterface;
 use App\SiteTypes\SiteType;
-use App\SSH\Services\PHP\PHP;
-use App\SSH\Services\Webserver\Webserver;
 use App\Traits\HasProjectThroughServer;
 use Database\Factories\SiteFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -20,6 +21,7 @@
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use RuntimeException;
 
 /**
  * @property int $server_id
@@ -237,12 +239,15 @@ public function getAliasesString(): string
 
     public function type(): SiteType
     {
-        $typeClass = config('core.site_types_class.'.$this->type);
+        $handlerClass = config('site.types.'.$this->type.'.handler');
+        if (! class_exists($handlerClass)) {
+            throw new RuntimeException("Site type handler class {$handlerClass} does not exist.");
+        }
 
-        /** @var SiteType $type */
-        $type = new $typeClass($this);
+        /** @var SiteType $handler */
+        $handler = new $handlerClass($this);
 
-        return $type;
+        return $handler;
     }
 
     public function php(): ?Service
@@ -352,11 +357,6 @@ public function getSshKeyName(): string
         return str('site_'.$this->id)->toString();
     }
 
-    public function hasFeature(string $feature): bool
-    {
-        return in_array($feature, $this->type()->supportedFeatures());
-    }
-
     public function getEnv(): string
     {
         try {
@@ -438,4 +438,25 @@ public function activeRedirects(): HasMany
     {
         return $this->redirects()->whereIn('status', [RedirectStatus::CREATING, RedirectStatus::READY]);
     }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function features(): array
+    {
+        $features = config('site.types.'.$this->type.'.features', []);
+        foreach ($features as $featureKey => $feature) {
+            foreach ($feature['actions'] ?? [] as $actionKey => $action) {
+                $handlerClass = $action['handler'] ?? null;
+                if ($handlerClass && class_exists($handlerClass)) {
+                    /** @var ActionInterface $handler */
+                    $handler = new $handlerClass($this);
+                    $action['active'] = $handler->active();
+                }
+                $features[$featureKey]['actions'][$actionKey] = $action;
+            }
+        }
+
+        return $features;
+    }
 }
diff --git a/app/Models/SourceControl.php b/app/Models/SourceControl.php
index 0df84043..e36748f9 100755
--- a/app/Models/SourceControl.php
+++ b/app/Models/SourceControl.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\SourceControlProviders\SourceControlProvider;
+use Database\Factories\SourceControlFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -19,7 +20,7 @@
  */
 class SourceControl extends AbstractModel
 {
-    /** @use HasFactory<\Database\Factories\SourceControlFactory> */
+    /** @use HasFactory<SourceControlFactory> */
     use HasFactory;
 
     use SoftDeletes;
@@ -41,7 +42,7 @@ class SourceControl extends AbstractModel
 
     public function provider(): SourceControlProvider
     {
-        $providerClass = config('core.source_control_providers_class')[$this->provider];
+        $providerClass = config('source-control.providers.'.$this->provider.'.handler');
 
         /** @var SourceControlProvider $provider */
         $provider = new $providerClass($this);
diff --git a/app/Models/StorageProvider.php b/app/Models/StorageProvider.php
index fb834153..3e443882 100644
--- a/app/Models/StorageProvider.php
+++ b/app/Models/StorageProvider.php
@@ -45,10 +45,10 @@ public function user(): BelongsTo
 
     public function provider(): \App\StorageProviders\StorageProvider
     {
-        $providerClass = config('core.storage_providers_class')[$this->provider];
+        $providerClass = config('storage-provider.providers.'.$this->provider.'.handler');
 
         /** @var \App\StorageProviders\StorageProvider $provider */
-        $provider = new $providerClass($this);
+        $provider = new $providerClass($this, new Server);
 
         return $provider;
     }
diff --git a/app/Models/Worker.php b/app/Models/Worker.php
index e951d2e7..f4b4a22c 100644
--- a/app/Models/Worker.php
+++ b/app/Models/Worker.php
@@ -3,7 +3,7 @@
 namespace App\Models;
 
 use App\Enums\WorkerStatus;
-use App\SSH\Services\ProcessManager\ProcessManager;
+use App\Services\ProcessManager\ProcessManager;
 use Database\Factories\WorkerFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -21,6 +21,7 @@
  * @property int $redirect_stderr
  * @property string $stdout_logfile
  * @property string $status
+ * @property string $name
  * @property Server $server
  * @property Site $site
  */
@@ -40,6 +41,7 @@ class Worker extends AbstractModel
         'redirect_stderr',
         'stdout_logfile',
         'status',
+        'name',
     ];
 
     protected $casts = [
diff --git a/app/NotificationChannels/Discord.php b/app/NotificationChannels/Discord.php
index be4197de..21f8704e 100644
--- a/app/NotificationChannels/Discord.php
+++ b/app/NotificationChannels/Discord.php
@@ -8,6 +8,11 @@
 
 class Discord extends AbstractNotificationChannel
 {
+    public static function id(): string
+    {
+        return 'discord';
+    }
+
     public function createRules(array $input): array
     {
         return [
diff --git a/app/NotificationChannels/Email.php b/app/NotificationChannels/Email.php
index 389d5052..cdff1e28 100644
--- a/app/NotificationChannels/Email.php
+++ b/app/NotificationChannels/Email.php
@@ -10,6 +10,11 @@
 
 class Email extends AbstractNotificationChannel
 {
+    public static function id(): string
+    {
+        return 'email';
+    }
+
     public function createRules(array $input): array
     {
         return [
diff --git a/app/NotificationChannels/NotificationChannel.php b/app/NotificationChannels/NotificationChannel.php
index 8c9fcbdc..c7eeba7d 100644
--- a/app/NotificationChannels/NotificationChannel.php
+++ b/app/NotificationChannels/NotificationChannel.php
@@ -6,6 +6,8 @@
 
 interface NotificationChannel
 {
+    public static function id(): string;
+
     /**
      * @param  array<string, mixed>  $input
      * @return array<string, mixed>
diff --git a/app/NotificationChannels/Slack.php b/app/NotificationChannels/Slack.php
index 4f7763cd..e1c05c5a 100644
--- a/app/NotificationChannels/Slack.php
+++ b/app/NotificationChannels/Slack.php
@@ -8,6 +8,11 @@
 
 class Slack extends AbstractNotificationChannel
 {
+    public static function id(): string
+    {
+        return 'slack';
+    }
+
     public function createRules(array $input): array
     {
         return [
diff --git a/app/NotificationChannels/Telegram.php b/app/NotificationChannels/Telegram.php
index 0ddae2ea..9a1f253d 100644
--- a/app/NotificationChannels/Telegram.php
+++ b/app/NotificationChannels/Telegram.php
@@ -11,6 +11,11 @@ class Telegram extends AbstractNotificationChannel
 {
     protected string $apiUrl = 'https://api.telegram.org/bot';
 
+    public static function id(): string
+    {
+        return 'telegram';
+    }
+
     public function createRules(array $input): array
     {
         return [
diff --git a/app/Plugins/RegisterNotificationChannel.php b/app/Plugins/RegisterNotificationChannel.php
new file mode 100644
index 00000000..7d2dd365
--- /dev/null
+++ b/app/Plugins/RegisterNotificationChannel.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Plugins;
+
+use App\DTOs\DynamicForm;
+
+class RegisterNotificationChannel
+{
+    public function __construct(
+        private string $name,
+        private string $label = '',
+        private string $handler = '',
+        private ?DynamicForm $form = null,
+    ) {}
+
+    public static function make(string $name): self
+    {
+        return new self($name);
+    }
+
+    public function name(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function label(string $label): self
+    {
+        $this->label = $label;
+
+        return $this;
+    }
+
+    public function handler(string $handler): self
+    {
+        $this->handler = $handler;
+
+        return $this;
+    }
+
+    public function form(DynamicForm $form): self
+    {
+        $this->form = $form;
+
+        return $this;
+    }
+
+    public function register(): void
+    {
+        $providers = config('notification-channel.providers');
+
+        $providers[$this->name] = [
+            'label' => $this->label,
+            'handler' => $this->handler,
+            'form' => $this->form ? $this->form->toArray() : [],
+        ];
+
+        config(['notification-channel.providers' => $providers]);
+    }
+}
diff --git a/app/Plugins/RegisterServerProvider.php b/app/Plugins/RegisterServerProvider.php
new file mode 100644
index 00000000..287eb85f
--- /dev/null
+++ b/app/Plugins/RegisterServerProvider.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Plugins;
+
+use App\DTOs\DynamicForm;
+
+class RegisterServerProvider
+{
+    public function __construct(
+        private string $name,
+        private string $label = '',
+        private string $handler = '',
+        private ?DynamicForm $form = null,
+        private string $defaultUser = '',
+    ) {}
+
+    public static function make(string $name): self
+    {
+        return new self($name);
+    }
+
+    public function name(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function label(string $label): self
+    {
+        $this->label = $label;
+
+        return $this;
+    }
+
+    public function handler(string $handler): self
+    {
+        $this->handler = $handler;
+
+        return $this;
+    }
+
+    public function form(DynamicForm $form): self
+    {
+        $this->form = $form;
+
+        return $this;
+    }
+
+    public function defaultUser(string $defaultUser): self
+    {
+        $this->defaultUser = $defaultUser;
+
+        return $this;
+    }
+
+    public function register(): void
+    {
+        $providers = config('server-provider.providers');
+
+        $providers[$this->name] = [
+            'label' => $this->label,
+            'handler' => $this->handler,
+            'form' => $this->form ? $this->form->toArray() : [],
+            'default_user' => $this->defaultUser,
+        ];
+
+        config(['server-provider.providers' => $providers]);
+    }
+}
diff --git a/app/Plugins/RegisterServiceType.php b/app/Plugins/RegisterServiceType.php
new file mode 100644
index 00000000..6b682bd9
--- /dev/null
+++ b/app/Plugins/RegisterServiceType.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace App\Plugins;
+
+use App\DTOs\DynamicForm;
+use InvalidArgumentException;
+
+class RegisterServiceType
+{
+    /**
+     * @param  array<string>  $versions
+     * @param  array<string, mixed>  $data
+     */
+    public function __construct(
+        private string $name,
+        private string $type = '',
+        private string $unit = '',
+        private string $label = '',
+        private string $handler = '',
+        private ?DynamicForm $form = null,
+        private array $versions = ['latest'],
+        private array $data = []
+    ) {}
+
+    public static function make(string $name): self
+    {
+        return new self($name);
+    }
+
+    public function name(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function type(string $type): self
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    public function unit(string $unit): self
+    {
+        $this->unit = $unit;
+
+        return $this;
+    }
+
+    public function label(string $label): self
+    {
+        $this->label = $label;
+
+        return $this;
+    }
+
+    public function handler(string $handler): self
+    {
+        $this->handler = $handler;
+
+        return $this;
+    }
+
+    public function form(DynamicForm $form): self
+    {
+        $this->form = $form;
+
+        return $this;
+    }
+
+    /**
+     * @param  array<string>  $versions
+     */
+    public function versions(array $versions): self
+    {
+        $this->versions = $versions;
+
+        return $this;
+    }
+
+    /**
+     * @param  array<string, mixed>  $data
+     */
+    public function data(array $data): self
+    {
+        $this->data = $data;
+
+        return $this;
+    }
+
+    public function register(): void
+    {
+        $types = config('service.services');
+
+        if (! $this->type) {
+            throw new InvalidArgumentException('Service type must be specified.');
+        }
+
+        $types[$this->name] = [
+            'type' => $this->type,
+            'unit' => $this->unit,
+            'label' => $this->label,
+            'handler' => $this->handler,
+            'form' => $this->form ? $this->form->toArray() : [],
+            'versions' => $this->versions,
+            'data' => $this->data,
+        ];
+
+        config(['service.services' => $types]);
+    }
+}
diff --git a/app/Plugins/RegisterSiteFeature.php b/app/Plugins/RegisterSiteFeature.php
new file mode 100644
index 00000000..3a9523fc
--- /dev/null
+++ b/app/Plugins/RegisterSiteFeature.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Plugins;
+
+use RuntimeException;
+
+class RegisterSiteFeature
+{
+    public function __construct(
+        public string $type,
+        public string $name,
+        public string $label = '',
+        public string $description = ''
+    ) {}
+
+    public static function make(string $type, string $name): self
+    {
+        return new self($type, $name);
+    }
+
+    public function label(string $label): self
+    {
+        $this->label = $label;
+
+        return $this;
+    }
+
+    public function description(string $description): self
+    {
+        $this->description = $description;
+
+        return $this;
+    }
+
+    public function register(): void
+    {
+        if (! config()->has('site.types.'.$this->type)) {
+            throw new RuntimeException('Site types not found');
+        }
+
+        $features = config('site.types.'.$this->type.'.features') ?? [];
+
+        if (isset($features[$this->name])) {
+            throw new RuntimeException("Feature '{$this->name}' already exists for type '{$this->type}'");
+        }
+
+        $features[$this->name] = [
+            'label' => $this->label,
+            'description' => $this->description,
+        ];
+
+        config(['site.types.'.$this->type.'.features' => $features]);
+    }
+}
diff --git a/app/Plugins/RegisterSiteFeatureAction.php b/app/Plugins/RegisterSiteFeatureAction.php
new file mode 100644
index 00000000..d6ff2806
--- /dev/null
+++ b/app/Plugins/RegisterSiteFeatureAction.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Plugins;
+
+use App\DTOs\DynamicForm;
+use RuntimeException;
+
+class RegisterSiteFeatureAction
+{
+    public function __construct(
+        public string $type,
+        public string $feature,
+        public string $name,
+        public string $label = '',
+        public string $handler = '',
+        public ?DynamicForm $form = null,
+    ) {}
+
+    public static function make(string $type, string $feature, string $name): self
+    {
+        return new self($type, $feature, $name);
+    }
+
+    public function label(string $label): self
+    {
+        $this->label = $label;
+
+        return $this;
+    }
+
+    public function handler(string $handler): self
+    {
+        $this->handler = $handler;
+
+        return $this;
+    }
+
+    public function form(DynamicForm $form): self
+    {
+        $this->form = $form;
+
+        return $this;
+    }
+
+    public function register(): void
+    {
+        if (! config()->has('site.types.'.$this->type)) {
+            throw new RuntimeException('Site types not found');
+        }
+
+        $feature = config('site.types.'.$this->type.'.features.'.$this->feature);
+
+        if (! $feature) {
+            throw new RuntimeException("Feature '{$this->feature}' not found for type '{$this->type}'");
+        }
+
+        $actions = $feature['actions'] ?? [];
+        if (isset($actions[$this->name])) {
+            throw new RuntimeException("Action '{$this->name}' already exists for feature '{$this->feature}' in type '{$this->type}'");
+        }
+
+        $actions[$this->name] = [
+            'label' => $this->label,
+            'handler' => $this->handler,
+            'form' => $this->form ? $this->form->toArray() : [],
+        ];
+
+        config(['site.types.'.$this->type.'.features.'.$this->feature.'.actions' => $actions]);
+    }
+}
diff --git a/app/Plugins/RegisterSiteType.php b/app/Plugins/RegisterSiteType.php
new file mode 100644
index 00000000..582abf9b
--- /dev/null
+++ b/app/Plugins/RegisterSiteType.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Plugins;
+
+use App\DTOs\DynamicForm;
+
+class RegisterSiteType
+{
+    public function __construct(
+        public string $name,
+        public string $label = '',
+        public string $handler = '',
+        public ?DynamicForm $form = null,
+    ) {}
+
+    public static function make(string $name): self
+    {
+        return new self($name);
+    }
+
+    public function label(string $label): self
+    {
+        $this->label = $label;
+
+        return $this;
+    }
+
+    public function handler(string $handler): self
+    {
+        $this->handler = $handler;
+
+        return $this;
+    }
+
+    public function form(DynamicForm $form): self
+    {
+        $this->form = $form;
+
+        return $this;
+    }
+
+    public function register(): void
+    {
+        $types = config('site.types');
+
+        $types[$this->name] = [
+            'label' => $this->label,
+            'handler' => $this->handler,
+            'form' => $this->form ? $this->form->toArray() : [],
+        ];
+
+        config(['site.types' => $types]);
+    }
+}
diff --git a/app/Plugins/RegisterSourceControl.php b/app/Plugins/RegisterSourceControl.php
new file mode 100644
index 00000000..314f2798
--- /dev/null
+++ b/app/Plugins/RegisterSourceControl.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Plugins;
+
+use App\DTOs\DynamicForm;
+
+class RegisterSourceControl
+{
+    public function __construct(
+        private string $name,
+        private string $label = '',
+        private string $handler = '',
+        private ?DynamicForm $form = null,
+    ) {}
+
+    public static function make(string $name): self
+    {
+        return new self($name);
+    }
+
+    public function name(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function label(string $label): self
+    {
+        $this->label = $label;
+
+        return $this;
+    }
+
+    public function handler(string $handler): self
+    {
+        $this->handler = $handler;
+
+        return $this;
+    }
+
+    public function form(DynamicForm $form): self
+    {
+        $this->form = $form;
+
+        return $this;
+    }
+
+    public function register(): void
+    {
+        $providers = config('source-control.providers');
+
+        $providers[$this->name] = [
+            'label' => $this->label,
+            'handler' => $this->handler,
+            'form' => $this->form ? $this->form->toArray() : [],
+        ];
+
+        config(['source-control.providers' => $providers]);
+    }
+}
diff --git a/app/Plugins/RegisterStorageProvider.php b/app/Plugins/RegisterStorageProvider.php
new file mode 100644
index 00000000..b867583b
--- /dev/null
+++ b/app/Plugins/RegisterStorageProvider.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Plugins;
+
+use App\DTOs\DynamicForm;
+
+class RegisterStorageProvider
+{
+    public function __construct(
+        private string $name,
+        private string $label = '',
+        private string $handler = '',
+        private ?DynamicForm $form = null,
+    ) {}
+
+    public static function make(string $name): self
+    {
+        return new self($name);
+    }
+
+    public function name(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function label(string $label): self
+    {
+        $this->label = $label;
+
+        return $this;
+    }
+
+    public function handler(string $handler): self
+    {
+        $this->handler = $handler;
+
+        return $this;
+    }
+
+    public function form(DynamicForm $form): self
+    {
+        $this->form = $form;
+
+        return $this;
+    }
+
+    public function register(): void
+    {
+        $providers = config('storage-provider.providers');
+
+        $providers[$this->name] = [
+            'label' => $this->label,
+            'handler' => $this->handler,
+            'form' => $this->form ? $this->form->toArray() : [],
+        ];
+
+        config(['storage-provider.providers' => $providers]);
+    }
+}
diff --git a/app/Policies/ServicePolicy.php b/app/Policies/ServicePolicy.php
index eaddbd96..bb33781a 100644
--- a/app/Policies/ServicePolicy.php
+++ b/app/Policies/ServicePolicy.php
@@ -38,26 +38,26 @@ public function delete(User $user, Service $service): bool
 
     public function start(User $user, Service $service): bool
     {
-        return $this->update($user, $service) && $service->unit;
+        return $this->update($user, $service);
     }
 
     public function stop(User $user, Service $service): bool
     {
-        return $this->update($user, $service) && $service->unit;
+        return $this->update($user, $service);
     }
 
     public function restart(User $user, Service $service): bool
     {
-        return $this->update($user, $service) && $service->unit;
+        return $this->update($user, $service);
     }
 
     public function disable(User $user, Service $service): bool
     {
-        return $this->update($user, $service) && $service->unit;
+        return $this->update($user, $service);
     }
 
     public function enable(User $user, Service $service): bool
     {
-        return $this->update($user, $service) && $service->unit;
+        return $this->update($user, $service);
     }
 }
diff --git a/app/Providers/DemoServiceProvider.php b/app/Providers/DemoServiceProvider.php
index a1df1b43..63268e04 100644
--- a/app/Providers/DemoServiceProvider.php
+++ b/app/Providers/DemoServiceProvider.php
@@ -3,6 +3,11 @@
 namespace App\Providers;
 
 use App\Facades\SSH;
+use App\Models\FirewallRule;
+use App\Models\PersonalAccessToken;
+use App\Models\Script;
+use App\Models\ScriptExecution;
+use App\Models\ServerLog;
 use App\Models\User;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\ServiceProvider;
@@ -22,20 +27,20 @@ class DemoServiceProvider extends ServiceProvider
      * @var string[]
      */
     protected array $canUpdate = [
-        \App\Models\ServerLog::class,
-        \App\Models\Script::class,
-        \App\Models\ScriptExecution::class,
+        ServerLog::class,
+        Script::class,
+        ScriptExecution::class,
     ];
 
     /**
      * @var string[]
      */
     protected array $canCreate = [
-        \App\Models\ServerLog::class,
-        \App\Models\Script::class,
-        \App\Models\ScriptExecution::class,
-        \App\Models\FirewallRule::class,
-        \App\Models\PersonalAccessToken::class,
+        ServerLog::class,
+        Script::class,
+        ScriptExecution::class,
+        FirewallRule::class,
+        PersonalAccessToken::class,
     ];
 
     public function register(): void
diff --git a/app/Providers/NotificationChannelServiceProvider.php b/app/Providers/NotificationChannelServiceProvider.php
new file mode 100644
index 00000000..36db49c1
--- /dev/null
+++ b/app/Providers/NotificationChannelServiceProvider.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Providers;
+
+use App\DTOs\DynamicField;
+use App\DTOs\DynamicForm;
+use App\NotificationChannels\Discord;
+use App\NotificationChannels\Email;
+use App\NotificationChannels\Slack;
+use App\NotificationChannels\Telegram;
+use App\Plugins\RegisterNotificationChannel;
+use Illuminate\Support\ServiceProvider;
+
+class NotificationChannelServiceProvider extends ServiceProvider
+{
+    public function register(): void {}
+
+    public function boot(): void
+    {
+        $this->discord();
+        $this->slack();
+        $this->email();
+        $this->telegram();
+    }
+
+    private function discord(): void
+    {
+        RegisterNotificationChannel::make(Discord::id())
+            ->label('Discord')
+            ->handler(Discord::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('webhook_url')
+                        ->text()
+                        ->label('Webhook URL'),
+                ])
+            )
+            ->register();
+    }
+
+    public function slack(): void
+    {
+        RegisterNotificationChannel::make(Slack::id())
+            ->label('Slack')
+            ->handler(Slack::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('webhook_url')
+                        ->text()
+                        ->label('Webhook URL'),
+                ])
+            )
+            ->register();
+    }
+
+    private function email(): void
+    {
+        RegisterNotificationChannel::make(Email::id())
+            ->label('Email')
+            ->handler(Email::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('email')
+                        ->text()
+                        ->label('Email address'),
+                ])
+            )
+            ->register();
+    }
+
+    private function telegram(): void
+    {
+        RegisterNotificationChannel::make(Telegram::id())
+            ->label('Telegram')
+            ->handler(Telegram::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('bot_token')
+                        ->text()
+                        ->label('Bot Token'),
+                    DynamicField::make('chat_id')
+                        ->text()
+                        ->label('Chat ID'),
+                ]),
+            )
+            ->register();
+    }
+}
diff --git a/app/Providers/ServerProviderServiceProvider.php b/app/Providers/ServerProviderServiceProvider.php
new file mode 100644
index 00000000..882d2b57
--- /dev/null
+++ b/app/Providers/ServerProviderServiceProvider.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Providers;
+
+use App\DTOs\DynamicField;
+use App\DTOs\DynamicForm;
+use App\Plugins\RegisterServerProvider;
+use App\ServerProviders\AWS;
+use App\ServerProviders\Custom;
+use App\ServerProviders\DigitalOcean;
+use App\ServerProviders\Hetzner;
+use App\ServerProviders\Linode;
+use App\ServerProviders\Vultr;
+use Illuminate\Support\ServiceProvider;
+
+class ServerProviderServiceProvider extends ServiceProvider
+{
+    public function register(): void {}
+
+    public function boot(): void
+    {
+        $this->custom();
+        $this->aws();
+        $this->hetzner();
+        $this->digitalOcean();
+        $this->linode();
+        $this->vultr();
+    }
+
+    private function custom(): void
+    {
+        RegisterServerProvider::make(Custom::id())
+            ->label('Custom')
+            ->handler(Custom::class)
+            ->register();
+    }
+
+    private function aws(): void
+    {
+        RegisterServerProvider::make(AWS::id())
+            ->label('AWS')
+            ->handler(AWS::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('key')
+                        ->text()
+                        ->label('Access Key'),
+                    DynamicField::make('secret')
+                        ->text()
+                        ->label('Secret'),
+                ])
+            )
+            ->defaultUser('ubuntu')
+            ->register();
+    }
+
+    private function hetzner(): void
+    {
+        RegisterServerProvider::make(Hetzner::id())
+            ->label('Hetzner')
+            ->handler(Hetzner::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('token')
+                        ->text()
+                        ->label('Token'),
+                ])
+            )
+            ->defaultUser('root')
+            ->register();
+    }
+
+    private function digitalOcean(): void
+    {
+        RegisterServerProvider::make(DigitalOcean::id())
+            ->label('DigitalOcean')
+            ->handler(DigitalOcean::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('token')
+                        ->text()
+                        ->label('Token'),
+                ])
+            )
+            ->defaultUser('root')
+            ->register();
+    }
+
+    private function linode(): void
+    {
+        RegisterServerProvider::make(Linode::id())
+            ->label('Linode')
+            ->handler(Linode::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('token')
+                        ->text()
+                        ->label('Token'),
+                ])
+            )
+            ->defaultUser('root')
+            ->register();
+    }
+
+    private function vultr(): void
+    {
+        RegisterServerProvider::make(Vultr::id())
+            ->label('Vultr')
+            ->handler(Vultr::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('token')
+                        ->text()
+                        ->label('Token'),
+                ])
+            )
+            ->defaultUser('root')
+            ->register();
+    }
+}
diff --git a/app/Providers/ServiceTypeServiceProvider.php b/app/Providers/ServiceTypeServiceProvider.php
new file mode 100644
index 00000000..0b5a2bd4
--- /dev/null
+++ b/app/Providers/ServiceTypeServiceProvider.php
@@ -0,0 +1,180 @@
+<?php
+
+namespace App\Providers;
+
+use App\Plugins\RegisterServiceType;
+use App\Services\Database\Mariadb;
+use App\Services\Database\Mysql;
+use App\Services\Database\Postgresql;
+use App\Services\Firewall\Ufw;
+use App\Services\Monitoring\RemoteMonitor\RemoteMonitor;
+use App\Services\Monitoring\VitoAgent\VitoAgent;
+use App\Services\NodeJS\NodeJS;
+use App\Services\PHP\PHP;
+use App\Services\ProcessManager\Supervisor;
+use App\Services\Redis\Redis;
+use App\Services\Webserver\Caddy;
+use App\Services\Webserver\Nginx;
+use Illuminate\Support\ServiceProvider;
+
+class ServiceTypeServiceProvider extends ServiceProvider
+{
+    public function register(): void {}
+
+    public function boot(): void
+    {
+        $this->webservers();
+        $this->databases();
+        $this->memoryDatabases();
+        $this->firewalls();
+        $this->processManagers();
+        $this->monitoring();
+        $this->php();
+        $this->node();
+    }
+
+    private function webservers(): void
+    {
+        RegisterServiceType::make(Nginx::id())
+            ->type(Nginx::type())
+            ->label('Nginx')
+            ->handler(Nginx::class)
+            ->register();
+
+        RegisterServiceType::make(Caddy::id())
+            ->type(Caddy::type())
+            ->label('Caddy (beta)')
+            ->handler(Caddy::class)
+            ->register();
+    }
+
+    private function databases(): void
+    {
+        RegisterServiceType::make(Mysql::id())
+            ->type(Mysql::type())
+            ->label('MySQL')
+            ->handler(Mysql::class)
+            ->versions([
+                '8.4',
+                '8.0',
+                '5.7',
+            ])
+            ->register();
+        RegisterServiceType::make(Postgresql::id())
+            ->type(Postgresql::type())
+            ->label('PostgreSQL')
+            ->handler(Postgresql::class)
+            ->versions([
+                '16',
+                '15',
+                '14',
+                '13',
+                '12',
+            ])
+            ->register();
+        RegisterServiceType::make(Mariadb::id())
+            ->type(Mariadb::type())
+            ->label('MariaDB')
+            ->handler(Mariadb::class)
+            ->versions([
+                '11.4',
+                '10.11',
+                '10.6',
+                '10.4',
+                '10.3',
+            ])
+            ->register();
+    }
+
+    private function memoryDatabases(): void
+    {
+        RegisterServiceType::make(Redis::id())
+            ->type(Redis::type())
+            ->label('Redis')
+            ->handler(Redis::class)
+            ->register();
+    }
+
+    private function firewalls(): void
+    {
+        RegisterServiceType::make(Ufw::id())
+            ->type(Ufw::type())
+            ->label('UFW')
+            ->handler(Ufw::class)
+            ->register();
+    }
+
+    private function processManagers(): void
+    {
+        RegisterServiceType::make(Supervisor::id())
+            ->type(Supervisor::type())
+            ->label('Supervisor')
+            ->handler(Supervisor::class)
+            ->register();
+    }
+
+    private function monitoring(): void
+    {
+        RegisterServiceType::make(VitoAgent::id())
+            ->type(VitoAgent::type())
+            ->label('VitoAgent')
+            ->handler(VitoAgent::class)
+            ->register();
+
+        RegisterServiceType::make(RemoteMonitor::id())
+            ->type(RemoteMonitor::type())
+            ->label('RemoteMonitor')
+            ->handler(RemoteMonitor::class)
+            ->register();
+    }
+
+    private function php(): void
+    {
+        RegisterServiceType::make(PHP::id())
+            ->type(PHP::type())
+            ->label('PHP')
+            ->handler(PHP::class)
+            ->versions([
+                '8.4',
+                '8.3',
+                '8.2',
+                '8.1',
+                '8.0',
+                '7.4',
+                '7.3',
+                '7.2',
+                '7.1',
+                '7.0',
+                '5.6',
+            ])
+            ->data([
+                'extensions' => [
+                    'imagick',
+                    'exif',
+                    'gmagick',
+                    'gmp',
+                    'intl',
+                    'sqlite3',
+                    'opcache',
+                ],
+            ])
+            ->register();
+    }
+
+    private function node(): void
+    {
+        RegisterServiceType::make(NodeJS::id())
+            ->type(NodeJS::type())
+            ->label('Node.js')
+            ->handler(NodeJS::class)
+            ->versions([
+                '22',
+                '20',
+                '18',
+                '16',
+                '14',
+                '12',
+            ])
+            ->register();
+    }
+}
diff --git a/app/Providers/SiteTypeServiceProvider.php b/app/Providers/SiteTypeServiceProvider.php
new file mode 100644
index 00000000..bb6d7ac8
--- /dev/null
+++ b/app/Providers/SiteTypeServiceProvider.php
@@ -0,0 +1,210 @@
+<?php
+
+namespace App\Providers;
+
+use App\DTOs\DynamicField;
+use App\DTOs\DynamicForm;
+use App\Enums\LoadBalancerMethod;
+use App\Plugins\RegisterSiteFeature;
+use App\Plugins\RegisterSiteFeatureAction;
+use App\Plugins\RegisterSiteType;
+use App\SiteFeatures\LaravelOctane\Disable;
+use App\SiteFeatures\LaravelOctane\Enable;
+use App\SiteTypes\Laravel;
+use App\SiteTypes\LoadBalancer;
+use App\SiteTypes\PHPBlank;
+use App\SiteTypes\PHPMyAdmin;
+use App\SiteTypes\PHPSite;
+use App\SiteTypes\Wordpress;
+use Illuminate\Support\ServiceProvider;
+
+class SiteTypeServiceProvider extends ServiceProvider
+{
+    public function register(): void {}
+
+    public function boot(): void
+    {
+        $this->php();
+        $this->phpBlank();
+        $this->laravel();
+        $this->loadBalancer();
+        $this->phpMyAdmin();
+        $this->wordpress();
+    }
+
+    private function php(): void
+    {
+        RegisterSiteType::make(PHPSite::id())
+            ->label('PHP')
+            ->handler(PHPSite::class)
+            ->form(DynamicForm::make([
+                DynamicField::make('php_version')
+                    ->component()
+                    ->label('PHP Version'),
+                DynamicField::make('source_control')
+                    ->component()
+                    ->label('Source Control'),
+                DynamicField::make('web_directory')
+                    ->text()
+                    ->label('Web Directory')
+                    ->placeholder('For / leave empty')
+                    ->description('The relative path of your website from /home/vito/your-domain/'),
+                DynamicField::make('repository')
+                    ->text()
+                    ->label('Repository')
+                    ->placeholder('organization/repository'),
+                DynamicField::make('branch')
+                    ->text()
+                    ->label('Branch')
+                    ->default('main'),
+                DynamicField::make('composer')
+                    ->checkbox()
+                    ->label('Run `composer install --no-dev`')
+                    ->default(false),
+            ]))
+            ->register();
+    }
+
+    private function phpBlank(): void
+    {
+        RegisterSiteType::make(PHPBlank::id())
+            ->label('PHP Blank')
+            ->handler(PHPBlank::class)
+            ->form(DynamicForm::make([
+                DynamicField::make('php_version')
+                    ->component()
+                    ->label('PHP Version'),
+                DynamicField::make('web_directory')
+                    ->text()
+                    ->label('Web Directory')
+                    ->placeholder('For / leave empty')
+                    ->description('The relative path of your website from /home/vito/your-domain/'),
+            ]))
+            ->register();
+    }
+
+    private function laravel(): void
+    {
+        RegisterSiteType::make(Laravel::id())
+            ->label('Laravel')
+            ->handler(Laravel::class)
+            ->form(DynamicForm::make([
+                DynamicField::make('php_version')
+                    ->component()
+                    ->label('PHP Version'),
+                DynamicField::make('source_control')
+                    ->component()
+                    ->label('Source Control'),
+                DynamicField::make('web_directory')
+                    ->text()
+                    ->label('Web Directory')
+                    ->placeholder('For / leave empty')
+                    ->description('The relative path of your website from /home/vito/your-domain/'),
+                DynamicField::make('repository')
+                    ->text()
+                    ->label('Repository')
+                    ->placeholder('organization/repository'),
+                DynamicField::make('branch')
+                    ->text()
+                    ->label('Branch')
+                    ->default('main'),
+                DynamicField::make('composer')
+                    ->checkbox()
+                    ->label('Run `composer install --no-dev`')
+                    ->default(false),
+            ]))
+            ->register();
+        RegisterSiteFeature::make('laravel', 'laravel-octane')
+            ->label('Laravel Octane')
+            ->description('Enable Laravel Octane for this site')
+            ->register();
+        RegisterSiteFeatureAction::make('laravel', 'laravel-octane', 'enable')
+            ->label('Enable')
+            ->form(DynamicForm::make([
+                DynamicField::make('alert')
+                    ->alert()
+                    ->label('Alert')
+                    ->description('Make sure you have already set the `OCTANE_SERVER` in your `.env` file'),
+                DynamicField::make('port')
+                    ->text()
+                    ->label('Octane Port')
+                    ->default(8000)
+                    ->description('The port on which Laravel Octane will run.'),
+            ]))
+            ->handler(Enable::class)
+            ->register();
+        RegisterSiteFeatureAction::make('laravel', 'laravel-octane', 'disable')
+            ->label('Disable')
+            ->handler(Disable::class)
+            ->register();
+    }
+
+    public function loadBalancer(): void
+    {
+        RegisterSiteType::make(LoadBalancer::id())
+            ->label('Load Balancer')
+            ->handler(LoadBalancer::class)
+            ->form(DynamicForm::make([
+                DynamicField::make('method')
+                    ->select()
+                    ->label('Load Balancing Method')
+                    ->options([
+                        LoadBalancerMethod::IP_HASH,
+                        LoadBalancerMethod::ROUND_ROBIN,
+                        LoadBalancerMethod::LEAST_CONNECTIONS,
+                    ]),
+            ]))
+            ->register();
+    }
+
+    public function phpMyAdmin(): void
+    {
+        RegisterSiteType::make(PHPMyAdmin::id())
+            ->label('PHPMyAdmin')
+            ->handler(PHPMyAdmin::class)
+            ->form(DynamicForm::make([
+                DynamicField::make('php_version')
+                    ->component()
+                    ->label('PHP Version'),
+            ]))
+            ->register();
+    }
+
+    public function wordpress(): void
+    {
+        RegisterSiteType::make(Wordpress::id())
+            ->label('WordPress')
+            ->handler(Wordpress::class)
+            ->form(DynamicForm::make([
+                DynamicField::make('php_version')
+                    ->component()
+                    ->label('PHP Version'),
+                DynamicField::make('title')
+                    ->text()
+                    ->label('Site Title')
+                    ->placeholder('My WordPress Site'),
+                DynamicField::make('username')
+                    ->text()
+                    ->label('Admin Username')
+                    ->placeholder('admin'),
+                DynamicField::make('password')
+                    ->text()
+                    ->label('Admin Password'),
+                DynamicField::make('email')
+                    ->text()
+                    ->label('Admin Email'),
+                DynamicField::make('database')
+                    ->text()
+                    ->label('Database Name')
+                    ->placeholder('wordpress'),
+                DynamicField::make('database_user')
+                    ->text()
+                    ->label('Database User')
+                    ->placeholder('wp_user'),
+                DynamicField::make('database_password')
+                    ->text()
+                    ->label('Database Password'),
+            ]))
+            ->register();
+    }
+}
diff --git a/app/Providers/SourceControlServiceProvider.php b/app/Providers/SourceControlServiceProvider.php
new file mode 100644
index 00000000..eb67ad11
--- /dev/null
+++ b/app/Providers/SourceControlServiceProvider.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Providers;
+
+use App\DTOs\DynamicField;
+use App\DTOs\DynamicForm;
+use App\Plugins\RegisterSourceControl;
+use App\SourceControlProviders\Bitbucket;
+use App\SourceControlProviders\Github;
+use App\SourceControlProviders\Gitlab;
+use Illuminate\Support\ServiceProvider;
+
+class SourceControlServiceProvider extends ServiceProvider
+{
+    public function register(): void {}
+
+    public function boot(): void
+    {
+        $this->github();
+        $this->gitlab();
+        $this->bitbucket();
+    }
+
+    private function github(): void
+    {
+        RegisterSourceControl::make(Github::id())
+            ->label('Github')
+            ->handler(Github::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('token')
+                        ->text()
+                        ->label('Token'),
+                ])
+            )
+            ->register();
+    }
+
+    private function gitlab(): void
+    {
+        RegisterSourceControl::make(Gitlab::id())
+            ->label('Gitlab')
+            ->handler(Gitlab::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('token')
+                        ->text()
+                        ->label('Token'),
+                    DynamicField::make('url')
+                        ->text()
+                        ->label('Self hosted URL'),
+                ])
+            )
+            ->register();
+    }
+
+    private function bitbucket(): void
+    {
+        RegisterSourceControl::make(Bitbucket::id())
+            ->label('Bitbucket')
+            ->handler(Bitbucket::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('username')
+                        ->text()
+                        ->label('Username'),
+                    DynamicField::make('password')
+                        ->text()
+                        ->label('Password'),
+                ])
+            )
+            ->register();
+    }
+}
diff --git a/app/Providers/StorageProviderServiceProvider.php b/app/Providers/StorageProviderServiceProvider.php
new file mode 100644
index 00000000..734256b0
--- /dev/null
+++ b/app/Providers/StorageProviderServiceProvider.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace App\Providers;
+
+use App\DTOs\DynamicField;
+use App\DTOs\DynamicForm;
+use App\Plugins\RegisterStorageProvider;
+use App\StorageProviders\Dropbox;
+use App\StorageProviders\FTP;
+use App\StorageProviders\Local;
+use App\StorageProviders\S3;
+use Illuminate\Support\ServiceProvider;
+
+class StorageProviderServiceProvider extends ServiceProvider
+{
+    public function register(): void {}
+
+    public function boot(): void
+    {
+        $this->local();
+        $this->aws();
+        $this->dropbox();
+        $this->ftp();
+    }
+
+    private function local(): void
+    {
+        RegisterStorageProvider::make(Local::id())
+            ->label('Local')
+            ->handler(Local::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('path')
+                        ->text()
+                        ->label('Path'),
+                ])
+            )
+            ->register();
+    }
+
+    private function aws(): void
+    {
+        RegisterStorageProvider::make(S3::id())
+            ->label('S3')
+            ->handler(S3::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('api_url')
+                        ->text()
+                        ->label('API URL'),
+                    DynamicField::make('key')
+                        ->text()
+                        ->label('Access Key'),
+                    DynamicField::make('secret')
+                        ->text()
+                        ->label('Secret Key'),
+                    DynamicField::make('region')
+                        ->text()
+                        ->label('Region'),
+                    DynamicField::make('bucket')
+                        ->text()
+                        ->label('Bucket Name'),
+                    DynamicField::make('path')
+                        ->text()
+                        ->label('Path'),
+                ])
+            )
+            ->register();
+    }
+
+    private function dropbox(): void
+    {
+        RegisterStorageProvider::make(Dropbox::id())
+            ->label('Dropbox')
+            ->handler(Dropbox::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('token')
+                        ->text()
+                        ->label('Token'),
+                ])
+            )
+            ->register();
+    }
+
+    private function ftp(): void
+    {
+        RegisterStorageProvider::make(FTP::id())
+            ->label('FTP')
+            ->handler(FTP::class)
+            ->form(
+                DynamicForm::make([
+                    DynamicField::make('host')
+                        ->text()
+                        ->label('Host'),
+                    DynamicField::make('port')
+                        ->text()
+                        ->label('Port')
+                        ->default(21),
+                    DynamicField::make('path')
+                        ->text()
+                        ->label('Path'),
+                    DynamicField::make('username')
+                        ->text()
+                        ->label('Username'),
+                    DynamicField::make('password')
+                        ->text()
+                        ->label('Password'),
+                    DynamicField::make('ssl')
+                        ->checkbox()
+                        ->label('Use SSL')
+                        ->default(false),
+                    DynamicField::make('passive')
+                        ->checkbox()
+                        ->label('Use Passive Mode')
+                        ->default(true),
+                ])
+            )
+            ->register();
+    }
+}
diff --git a/app/SSH/HasS3Storage.php b/app/SSH/HasS3Storage.php
deleted file mode 100644
index adecb1cb..00000000
--- a/app/SSH/HasS3Storage.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace App\SSH;
-
-trait HasS3Storage
-{
-    private function prepareS3Path(string $path, string $prefix = ''): string
-    {
-        $path = trim($path);
-        $path = ltrim($path, '/');
-        $path = preg_replace('/[^a-zA-Z0-9\-_\.\/]/', '_', $path);
-        $path = preg_replace('/\/+/', '/', (string) $path);
-
-        if ($prefix !== '' && $prefix !== '0') {
-            return trim($prefix, '/').'/'.$path;
-        }
-
-        if ($path === null) {
-            throw new \Exception('Invalid S3 path');
-        }
-
-        return $path;
-    }
-}
diff --git a/app/SSH/Composer/Composer.php b/app/SSH/OS/Composer.php
similarity index 94%
rename from app/SSH/Composer/Composer.php
rename to app/SSH/OS/Composer.php
index cb262dc7..d01d8c66 100644
--- a/app/SSH/Composer/Composer.php
+++ b/app/SSH/OS/Composer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\SSH\Composer;
+namespace App\SSH\OS;
 
 use App\Exceptions\SSHError;
 use App\Models\Site;
diff --git a/app/SSH/Cron/Cron.php b/app/SSH/OS/Cron.php
similarity index 94%
rename from app/SSH/Cron/Cron.php
rename to app/SSH/OS/Cron.php
index 73316926..4f62401f 100644
--- a/app/SSH/Cron/Cron.php
+++ b/app/SSH/OS/Cron.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\SSH\Cron;
+namespace App\SSH\OS;
 
 use App\Exceptions\SSHError;
 use App\Models\Server;
diff --git a/app/SSH/Git/Git.php b/app/SSH/OS/Git.php
similarity index 98%
rename from app/SSH/Git/Git.php
rename to app/SSH/OS/Git.php
index 57d43138..c0b240da 100644
--- a/app/SSH/Git/Git.php
+++ b/app/SSH/OS/Git.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\SSH\Git;
+namespace App\SSH\OS;
 
 use App\Exceptions\SSHError;
 use App\Models\Site;
diff --git a/app/SSH/OS/OS.php b/app/SSH/OS/OS.php
index 10a21f25..eddb8137 100644
--- a/app/SSH/OS/OS.php
+++ b/app/SSH/OS/OS.php
@@ -225,7 +225,7 @@ public function tail(string $path, int $lines): string
     public function runScript(string $path, string $script, ?ServerLog $serverLog, ?string $user = null, ?array $variables = []): ServerLog
     {
         $ssh = $this->server->ssh($user);
-        if ($serverLog instanceof \App\Models\ServerLog) {
+        if ($serverLog instanceof ServerLog) {
             $ssh->setLog($serverLog);
         }
         $command = '';
diff --git a/app/SSH/Systemd/Systemd.php b/app/SSH/OS/Systemd.php
similarity index 98%
rename from app/SSH/Systemd/Systemd.php
rename to app/SSH/OS/Systemd.php
index 484a9157..8d947748 100644
--- a/app/SSH/Systemd/Systemd.php
+++ b/app/SSH/OS/Systemd.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\SSH\Systemd;
+namespace App\SSH\OS;
 
 use App\Exceptions\SSHError;
 use App\Models\Server;
diff --git a/app/SSH/PHPMyAdmin/PHPMyAdmin.php b/app/SSH/PHPMyAdmin/PHPMyAdmin.php
deleted file mode 100644
index 35f9c7e0..00000000
--- a/app/SSH/PHPMyAdmin/PHPMyAdmin.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace App\SSH\PHPMyAdmin;
-
-use App\Exceptions\SSHError;
-use App\Models\Site;
-
-class PHPMyAdmin
-{
-    /**
-     * @throws SSHError
-     */
-    public function install(Site $site): void
-    {
-        $site->server->ssh($site->user)->exec(
-            view('ssh.phpmyadmin.install', [
-                'version' => $site->type_data['version'],
-                'path' => $site->path,
-            ]),
-            'install-phpmyadmin',
-            $site->id
-        );
-    }
-}
diff --git a/app/SSH/Services/Webserver/AbstractWebserver.php b/app/SSH/Services/Webserver/AbstractWebserver.php
deleted file mode 100755
index c40e2c88..00000000
--- a/app/SSH/Services/Webserver/AbstractWebserver.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace App\SSH\Services\Webserver;
-
-use App\SSH\Services\AbstractService;
-use Closure;
-
-abstract class AbstractWebserver extends AbstractService implements Webserver
-{
-    public function creationRules(array $input): array
-    {
-        return [
-            'name' => [
-                'required',
-                function (string $attribute, mixed $value, Closure $fail): void {
-                    $webserverExists = $this->service->server->webserver();
-                    if ($webserverExists) {
-                        $fail('You already have a webserver service on the server.');
-                    }
-                },
-            ],
-        ];
-    }
-
-    public function deletionRules(): array
-    {
-        return [
-            'service' => [
-                function (string $attribute, mixed $value, Closure $fail): void {
-                    $hasSite = $this->service->server->sites()
-                        ->exists();
-                    if ($hasSite) {
-                        $fail('Cannot uninstall webserver while you have websites using it.');
-                    }
-                },
-            ],
-        ];
-    }
-}
diff --git a/app/SSH/Storage/S3.php b/app/SSH/Storage/S3.php
index c3d4e2cc..e2fcc343 100644
--- a/app/SSH/Storage/S3.php
+++ b/app/SSH/Storage/S3.php
@@ -4,13 +4,10 @@
 
 use App\Exceptions\SSHCommandError;
 use App\Exceptions\SSHError;
-use App\SSH\HasS3Storage;
 use Illuminate\Support\Facades\Log;
 
 class S3 extends AbstractStorage
 {
-    use HasS3Storage;
-
     /**
      * @throws SSHError
      */
@@ -89,4 +86,25 @@ public function delete(string $src): void
             'delete-from-s3'
         );
     }
+
+    /**
+     * @throws SSHError
+     */
+    private function prepareS3Path(string $path, string $prefix = ''): string
+    {
+        $path = trim($path);
+        $path = ltrim($path, '/');
+        $path = preg_replace('/[^a-zA-Z0-9\-_\.\/]/', '_', $path);
+        $path = preg_replace('/\/+/', '/', (string) $path);
+
+        if ($prefix !== '' && $prefix !== '0') {
+            return trim($prefix, '/').'/'.$path;
+        }
+
+        if ($path === null) {
+            throw new SSHError('Invalid S3 path');
+        }
+
+        return $path;
+    }
 }
diff --git a/app/SSH/Wordpress/Wordpress.php b/app/SSH/Wordpress/Wordpress.php
deleted file mode 100644
index 4a9dfe9c..00000000
--- a/app/SSH/Wordpress/Wordpress.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace App\SSH\Wordpress;
-
-use App\Exceptions\SSHError;
-use App\Models\Site;
-
-class Wordpress
-{
-    /**
-     * @throws SSHError
-     */
-    public function install(Site $site): void
-    {
-        $site->server->ssh($site->user)->exec(
-            view('ssh.wordpress.install', [
-                'path' => $site->path,
-                'domain' => $site->domain,
-                'isIsolated' => $site->isIsolated() ? 'true' : 'false',
-                'isolatedUsername' => $site->user,
-                'dbName' => $site->type_data['database'],
-                'dbUser' => $site->type_data['database_user'],
-                'dbPass' => $site->type_data['database_password'],
-                'dbHost' => 'localhost',
-                'dbPrefix' => 'wp_',
-                'username' => $site->type_data['username'],
-                'password' => $site->type_data['password'],
-                'email' => $site->type_data['email'],
-                'title' => $site->type_data['title'],
-            ]),
-            'install-wordpress',
-            $site->id
-        );
-    }
-}
diff --git a/app/ServerProviders/AWS.php b/app/ServerProviders/AWS.php
index b1f532c1..8b274973 100755
--- a/app/ServerProviders/AWS.php
+++ b/app/ServerProviders/AWS.php
@@ -15,6 +15,11 @@ class AWS extends AbstractProvider
 {
     protected Ec2Client $ec2Client;
 
+    public static function id(): string
+    {
+        return 'aws';
+    }
+
     public function createRules(array $input): array
     {
         return [
diff --git a/app/ServerProviders/Custom.php b/app/ServerProviders/Custom.php
index 981a8429..09c8a3ae 100755
--- a/app/ServerProviders/Custom.php
+++ b/app/ServerProviders/Custom.php
@@ -10,6 +10,11 @@
 
 class Custom extends AbstractProvider
 {
+    public static function id(): string
+    {
+        return 'custom';
+    }
+
     public function createRules(array $input): array
     {
         return [
diff --git a/app/ServerProviders/DigitalOcean.php b/app/ServerProviders/DigitalOcean.php
index 6fc83c61..a3733e5e 100644
--- a/app/ServerProviders/DigitalOcean.php
+++ b/app/ServerProviders/DigitalOcean.php
@@ -14,6 +14,11 @@ class DigitalOcean extends AbstractProvider
 {
     protected string $apiUrl = 'https://api.digitalocean.com/v2';
 
+    public static function id(): string
+    {
+        return 'digitalocean';
+    }
+
     public function createRules(array $input): array
     {
         return [
diff --git a/app/ServerProviders/Hetzner.php b/app/ServerProviders/Hetzner.php
index b59b42b1..25b13867 100644
--- a/app/ServerProviders/Hetzner.php
+++ b/app/ServerProviders/Hetzner.php
@@ -15,6 +15,11 @@ class Hetzner extends AbstractProvider
 {
     protected string $apiUrl = 'https://api.hetzner.cloud/v1';
 
+    public static function id(): string
+    {
+        return 'hetzner';
+    }
+
     public function createRules(array $input): array
     {
         return [
diff --git a/app/ServerProviders/Linode.php b/app/ServerProviders/Linode.php
index 7902eada..ac09c484 100644
--- a/app/ServerProviders/Linode.php
+++ b/app/ServerProviders/Linode.php
@@ -14,6 +14,11 @@ class Linode extends AbstractProvider
 {
     protected string $apiUrl = 'https://api.linode.com/v4';
 
+    public static function id(): string
+    {
+        return 'linode';
+    }
+
     public function createRules(array $input): array
     {
         return [
diff --git a/app/ServerProviders/ServerProvider.php b/app/ServerProviders/ServerProvider.php
index e4049245..e1277efd 100755
--- a/app/ServerProviders/ServerProvider.php
+++ b/app/ServerProviders/ServerProvider.php
@@ -4,6 +4,8 @@
 
 interface ServerProvider
 {
+    public static function id(): string;
+
     /**
      * @param  array<string, mixed>  $input
      * @return array<string, mixed>
diff --git a/app/ServerProviders/Vultr.php b/app/ServerProviders/Vultr.php
index 0a202d0e..c861b7c4 100644
--- a/app/ServerProviders/Vultr.php
+++ b/app/ServerProviders/Vultr.php
@@ -16,6 +16,11 @@ class Vultr extends AbstractProvider
 {
     protected string $apiUrl = 'https://api.vultr.com/v2';
 
+    public static function id(): string
+    {
+        return 'vultr';
+    }
+
     public function createRules(array $input): array
     {
         return [
diff --git a/app/ServerTypes/AbstractType.php b/app/ServerTypes/AbstractType.php
deleted file mode 100755
index 860e3eaa..00000000
--- a/app/ServerTypes/AbstractType.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-namespace App\ServerTypes;
-
-use App\Enums\ServiceStatus;
-use App\Exceptions\SSHError;
-use App\Models\Server;
-use App\SSH\Services\PHP\PHP;
-
-abstract class AbstractType implements ServerType
-{
-    public function __construct(protected Server $server) {}
-
-    /**
-     * @throws SSHError
-     */
-    public function install(): void
-    {
-        $this->createUser();
-        $this->progress(15, 'installing-updates');
-        $this->server->os()->upgrade();
-        $this->progress(25, 'installing-dependencies');
-        $this->server->os()->installDependencies();
-        $services = $this->server->services;
-        $currentProgress = 45;
-        $progressPerService = (100 - $currentProgress) / count($services);
-        foreach ($services as $service) {
-            $currentProgress += $progressPerService;
-            $this->progress($currentProgress, 'installing- '.$service->name);
-            $service->handler()->install();
-            $service->update(['status' => ServiceStatus::READY]);
-            if ($service->type == 'php') {
-                $this->progress($currentProgress, 'installing-composer');
-                /** @var PHP $handler */
-                $handler = $service->handler();
-                $handler->installComposer();
-            }
-        }
-        $this->progress(100, 'finishing');
-    }
-
-    protected function createUser(): void
-    {
-        $this->server->os()->createUser(
-            $this->server->authentication['user'],
-            $this->server->authentication['pass'],
-            $this->server->sshKey()['public_key']
-        );
-        $this->server->ssh_user = config('core.ssh_user');
-        $this->server->save();
-        $this->server->refresh();
-        $this->server->public_key = $this->server->os()->getPublicKey($this->server->getSshUser());
-        $this->server->save();
-    }
-
-    protected function progress(int|float $percentage, ?string $step = null): void
-    {
-        $this->server->progress = $percentage;
-        $this->server->progress_step = $step;
-        $this->server->save();
-    }
-
-    protected function addWebserver(string $service): void
-    {
-        if ($service !== 'none') {
-            $this->server->services()->create([
-                'type' => 'webserver',
-                'name' => $service,
-                'version' => 'latest',
-            ]);
-        }
-    }
-
-    protected function addDatabase(string $service): void
-    {
-        if ($service !== 'none') {
-            $this->server->services()->create([
-                'type' => 'database',
-                'name' => config('core.databases_name.'.$service),
-                'version' => config('core.databases_version.'.$service),
-            ]);
-        }
-    }
-
-    protected function addPHP(string $version): void
-    {
-        if ($version !== 'none') {
-            $this->server->services()->create([
-                'type' => 'php',
-                'type_data' => [
-                    'extensions' => [],
-                ],
-                'name' => 'php',
-                'version' => $version,
-            ]);
-        }
-    }
-
-    protected function addSupervisor(): void
-    {
-        $this->server->services()->create([
-            'type' => 'process_manager',
-            'name' => 'supervisor',
-            'version' => 'latest',
-        ]);
-    }
-
-    protected function addRedis(): void
-    {
-        $this->server->services()->create([
-            'type' => 'memory_database',
-            'name' => 'redis',
-            'version' => 'latest',
-        ]);
-    }
-
-    protected function addUfw(): void
-    {
-        $this->server->services()->create([
-            'type' => 'firewall',
-            'name' => 'ufw',
-            'version' => 'latest',
-        ]);
-    }
-
-    protected function addMonitoring(): void
-    {
-        $this->server->services()->create([
-            'type' => 'monitoring',
-            'name' => 'remote-monitor',
-            'version' => 'latest',
-        ]);
-    }
-}
diff --git a/app/ServerTypes/Database.php b/app/ServerTypes/Database.php
deleted file mode 100755
index b8e1925f..00000000
--- a/app/ServerTypes/Database.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace App\ServerTypes;
-
-class Database extends AbstractType
-{
-    public function createRules(array $input): array
-    {
-        return [
-            'database' => [
-                'required',
-                'in:'.implode(',', config('core.databases')),
-            ],
-        ];
-    }
-
-    public function data(array $input): array
-    {
-        return [];
-    }
-
-    public function createServices(array $input): void
-    {
-        $this->server->services()->forceDelete();
-        $this->addDatabase($input['database']);
-        $this->addSupervisor();
-        $this->addRedis();
-        $this->addUfw();
-    }
-}
diff --git a/app/ServerTypes/Regular.php b/app/ServerTypes/Regular.php
deleted file mode 100755
index d9669042..00000000
--- a/app/ServerTypes/Regular.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace App\ServerTypes;
-
-use Illuminate\Validation\Rule;
-
-class Regular extends AbstractType
-{
-    public function createRules(array $input): array
-    {
-        return [
-            'webserver' => [
-                'required',
-                Rule::in(config('core.webservers')),
-
-            ],
-            'php' => [
-                'required',
-                Rule::in(config('core.php_versions')),
-            ],
-            'database' => [
-                'required',
-                Rule::in(config('core.databases')),
-            ],
-        ];
-    }
-
-    public function data(array $input): array
-    {
-        return [];
-    }
-
-    public function createServices(array $input): void
-    {
-        $this->server->services()->forceDelete();
-        $this->addWebserver($input['webserver']);
-        $this->addDatabase($input['database']);
-        $this->addPHP($input['php']);
-        $this->addSupervisor();
-        $this->addRedis();
-        $this->addUfw();
-        $this->addMonitoring();
-    }
-}
diff --git a/app/ServerTypes/ServerType.php b/app/ServerTypes/ServerType.php
deleted file mode 100755
index 11387a82..00000000
--- a/app/ServerTypes/ServerType.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace App\ServerTypes;
-
-interface ServerType
-{
-    /**
-     * @param  array<string, mixed>  $input
-     * @return array<string, mixed>
-     */
-    public function createRules(array $input): array;
-
-    /**
-     * @param  array<string, mixed>  $input
-     * @return array<string, mixed>
-     */
-    public function data(array $input): array;
-
-    /**
-     * @param  array<string, mixed>  $input
-     */
-    public function createServices(array $input): void;
-
-    public function install(): void;
-}
diff --git a/app/SSH/Services/AbstractService.php b/app/Services/AbstractService.php
similarity index 95%
rename from app/SSH/Services/AbstractService.php
rename to app/Services/AbstractService.php
index fa6e9cc6..3816c90b 100644
--- a/app/SSH/Services/AbstractService.php
+++ b/app/Services/AbstractService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\SSH\Services;
+namespace App\Services;
 
 use App\Models\Service;
 
diff --git a/app/SSH/Services/Database/AbstractDatabase.php b/app/Services/Database/AbstractDatabase.php
similarity index 99%
rename from app/SSH/Services/Database/AbstractDatabase.php
rename to app/Services/Database/AbstractDatabase.php
index d1ffd1dd..1abc02da 100755
--- a/app/SSH/Services/Database/AbstractDatabase.php
+++ b/app/Services/Database/AbstractDatabase.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\SSH\Services\Database;
+namespace App\Services\Database;
 
 use App\Actions\Database\SyncDatabases;
 use App\Enums\BackupStatus;
 use App\Exceptions\ServiceInstallationFailed;
 use App\Exceptions\SSHError;
 use App\Models\BackupFile;
-use App\SSH\Services\AbstractService;
+use App\Services\AbstractService;
 use Closure;
 
 abstract class AbstractDatabase extends AbstractService implements Database
@@ -63,7 +63,7 @@ public function install(): void
         $version = str_replace('.', '', $this->service->version);
         $command = view($this->getScriptView('install-'.$version));
         $this->service->server->ssh()->exec($command, 'install-'.$this->service->name.'-'.$version);
-        $status = $this->service->server->systemd()->status($this->service->unit);
+        $status = $this->service->server->systemd()->status($this->unit());
         $this->service->validateInstall($status);
         $this->service->server->os()->cleanup();
         /** @TODO implement post-install for services and move it there */
diff --git a/app/SSH/Services/Database/Database.php b/app/Services/Database/Database.php
similarity index 93%
rename from app/SSH/Services/Database/Database.php
rename to app/Services/Database/Database.php
index e72a2726..5672d1bc 100755
--- a/app/SSH/Services/Database/Database.php
+++ b/app/Services/Database/Database.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\SSH\Services\Database;
+namespace App\Services\Database;
 
 use App\Models\BackupFile;
-use App\SSH\Services\ServiceInterface;
+use App\Services\ServiceInterface;
 
 interface Database extends ServiceInterface
 {
diff --git a/app/SSH/Services/Database/Mariadb.php b/app/Services/Database/Mariadb.php
similarity index 52%
rename from app/SSH/Services/Database/Mariadb.php
rename to app/Services/Database/Mariadb.php
index c46ca3bb..158004ed 100644
--- a/app/SSH/Services/Database/Mariadb.php
+++ b/app/Services/Database/Mariadb.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\SSH\Services\Database;
+namespace App\Services\Database;
 
 class Mariadb extends AbstractDatabase
 {
@@ -13,4 +13,19 @@ class Mariadb extends AbstractDatabase
     ];
 
     protected string $defaultCharset = 'utf8mb3';
+
+    public static function id(): string
+    {
+        return 'mariadb';
+    }
+
+    public static function type(): string
+    {
+        return 'database';
+    }
+
+    public function unit(): string
+    {
+        return 'mariadb';
+    }
 }
diff --git a/app/SSH/Services/Database/Mysql.php b/app/Services/Database/Mysql.php
similarity index 55%
rename from app/SSH/Services/Database/Mysql.php
rename to app/Services/Database/Mysql.php
index d5b613a8..89bd49fe 100755
--- a/app/SSH/Services/Database/Mysql.php
+++ b/app/Services/Database/Mysql.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\SSH\Services\Database;
+namespace App\Services\Database;
 
 class Mysql extends AbstractDatabase
 {
@@ -14,4 +14,19 @@ class Mysql extends AbstractDatabase
     ];
 
     protected string $defaultCharset = 'utf8mb3';
+
+    public static function id(): string
+    {
+        return 'mysql';
+    }
+
+    public static function type(): string
+    {
+        return 'database';
+    }
+
+    public function unit(): string
+    {
+        return 'mysql';
+    }
 }
diff --git a/app/SSH/Services/Database/Postgresql.php b/app/Services/Database/Postgresql.php
similarity index 58%
rename from app/SSH/Services/Database/Postgresql.php
rename to app/Services/Database/Postgresql.php
index 5133c9b8..4ccbc949 100644
--- a/app/SSH/Services/Database/Postgresql.php
+++ b/app/Services/Database/Postgresql.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\SSH\Services\Database;
+namespace App\Services\Database;
 
 class Postgresql extends AbstractDatabase
 {
@@ -18,4 +18,19 @@ class Postgresql extends AbstractDatabase
     protected string $separator = '|';
 
     protected bool $removeLastRow = true;
+
+    public static function id(): string
+    {
+        return 'postgresql';
+    }
+
+    public static function type(): string
+    {
+        return 'database';
+    }
+
+    public function unit(): string
+    {
+        return 'postgresql';
+    }
 }
diff --git a/app/SSH/Services/Firewall/AbstractFirewall.php b/app/Services/Firewall/AbstractFirewall.php
similarity index 53%
rename from app/SSH/Services/Firewall/AbstractFirewall.php
rename to app/Services/Firewall/AbstractFirewall.php
index 50c31316..ce94434e 100755
--- a/app/SSH/Services/Firewall/AbstractFirewall.php
+++ b/app/Services/Firewall/AbstractFirewall.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace App\SSH\Services\Firewall;
+namespace App\Services\Firewall;
 
-use App\SSH\Services\AbstractService;
+use App\Services\AbstractService;
 
 abstract class AbstractFirewall extends AbstractService implements Firewall {}
diff --git a/app/SSH/Services/Firewall/Firewall.php b/app/Services/Firewall/Firewall.php
similarity index 56%
rename from app/SSH/Services/Firewall/Firewall.php
rename to app/Services/Firewall/Firewall.php
index da914f6f..90420164 100755
--- a/app/SSH/Services/Firewall/Firewall.php
+++ b/app/Services/Firewall/Firewall.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\SSH\Services\Firewall;
+namespace App\Services\Firewall;
 
-use App\SSH\Services\ServiceInterface;
+use App\Services\ServiceInterface;
 
 interface Firewall extends ServiceInterface
 {
diff --git a/app/SSH/Services/Firewall/Ufw.php b/app/Services/Firewall/Ufw.php
similarity index 76%
rename from app/SSH/Services/Firewall/Ufw.php
rename to app/Services/Firewall/Ufw.php
index e83c7a5e..669f5f3b 100755
--- a/app/SSH/Services/Firewall/Ufw.php
+++ b/app/Services/Firewall/Ufw.php
@@ -1,12 +1,27 @@
 <?php
 
-namespace App\SSH\Services\Firewall;
+namespace App\Services\Firewall;
 
 use App\Enums\FirewallRuleStatus;
 use App\Exceptions\SSHError;
 
 class Ufw extends AbstractFirewall
 {
+    public static function id(): string
+    {
+        return 'ufw';
+    }
+
+    public static function type(): string
+    {
+        return 'firewall';
+    }
+
+    public function unit(): string
+    {
+        return 'ufw';
+    }
+
     /**
      * @throws SSHError
      */
diff --git a/app/SSH/Services/Monitoring/RemoteMonitor/RemoteMonitor.php b/app/Services/Monitoring/RemoteMonitor/RemoteMonitor.php
similarity index 73%
rename from app/SSH/Services/Monitoring/RemoteMonitor/RemoteMonitor.php
rename to app/Services/Monitoring/RemoteMonitor/RemoteMonitor.php
index de5376e7..1464cd9a 100644
--- a/app/SSH/Services/Monitoring/RemoteMonitor/RemoteMonitor.php
+++ b/app/Services/Monitoring/RemoteMonitor/RemoteMonitor.php
@@ -1,14 +1,29 @@
 <?php
 
-namespace App\SSH\Services\Monitoring\RemoteMonitor;
+namespace App\Services\Monitoring\RemoteMonitor;
 
 use App\Models\Metric;
-use App\SSH\Services\AbstractService;
+use App\Services\AbstractService;
 use Closure;
 use Illuminate\Validation\Rule;
 
 class RemoteMonitor extends AbstractService
 {
+    public static function id(): string
+    {
+        return 'remote-monitor';
+    }
+
+    public static function type(): string
+    {
+        return 'monitoring';
+    }
+
+    public function unit(): string
+    {
+        return '';
+    }
+
     public function creationRules(array $input): array
     {
         return [
@@ -48,6 +63,6 @@ public function install(): void
 
     public function uninstall(): void
     {
-        Metric::where('server_id', $this->service->server_id)->delete();
+        Metric::query()->where('server_id', $this->service->server_id)->delete();
     }
 }
diff --git a/app/SSH/Services/Monitoring/VitoAgent/VitoAgent.php b/app/Services/Monitoring/VitoAgent/VitoAgent.php
similarity index 82%
rename from app/SSH/Services/Monitoring/VitoAgent/VitoAgent.php
rename to app/Services/Monitoring/VitoAgent/VitoAgent.php
index a810d57b..0a668bb2 100644
--- a/app/SSH/Services/Monitoring/VitoAgent/VitoAgent.php
+++ b/app/Services/Monitoring/VitoAgent/VitoAgent.php
@@ -1,21 +1,37 @@
 <?php
 
-namespace App\SSH\Services\Monitoring\VitoAgent;
+namespace App\Services\Monitoring\VitoAgent;
 
 use App\Exceptions\ServiceInstallationFailed;
 use App\Exceptions\SSHError;
 use App\Models\Metric;
-use App\SSH\Services\AbstractService;
+use App\Services\AbstractService;
 use Closure;
+use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Validation\Rule;
 use Ramsey\Uuid\Uuid;
 
 class VitoAgent extends AbstractService
 {
-    const TAGS_URL = 'https://api.github.com/repos/vitodeploy/agent/tags';
+    const string TAGS_URL = 'https://api.github.com/repos/vitodeploy/agent/tags';
 
-    const DOWNLOAD_URL = 'https://github.com/vitodeploy/agent/releases/download/%s';
+    const string DOWNLOAD_URL = 'https://github.com/vitodeploy/agent/releases/download/%s';
+
+    public static function id(): string
+    {
+        return 'vito-agent';
+    }
+
+    public static function type(): string
+    {
+        return 'monitoring';
+    }
+
+    public function unit(): string
+    {
+        return 'vito-agent';
+    }
 
     public function creationRules(array $input): array
     {
@@ -56,6 +72,7 @@ public function data(): array
     /**
      * @throws SSHError
      * @throws ServiceInstallationFailed
+     * @throws ConnectionException
      */
     public function install(): void
     {
@@ -81,7 +98,7 @@ public function install(): void
             ]),
             'install-vito-agent'
         );
-        $status = $this->service->server->systemd()->status($this->service->unit);
+        $status = $this->service->server->systemd()->status($this->unit());
         $this->service->validateInstall($status);
     }
 
diff --git a/app/SSH/Services/NodeJS/NodeJS.php b/app/Services/NodeJS/NodeJS.php
similarity index 85%
rename from app/SSH/Services/NodeJS/NodeJS.php
rename to app/Services/NodeJS/NodeJS.php
index f4fb63e5..7317c8a4 100644
--- a/app/SSH/Services/NodeJS/NodeJS.php
+++ b/app/Services/NodeJS/NodeJS.php
@@ -1,21 +1,35 @@
 <?php
 
-namespace App\SSH\Services\NodeJS;
+namespace App\Services\NodeJS;
 
 use App\Exceptions\SSHError;
-use App\SSH\Services\AbstractService;
+use App\Services\AbstractService;
 use Closure;
 use Illuminate\Validation\Rule;
 
 class NodeJS extends AbstractService
 {
+    public static function id(): string
+    {
+        return 'nodejs';
+    }
+
+    public static function type(): string
+    {
+        return 'nodejs';
+    }
+
+    public function unit(): string
+    {
+        return '';
+    }
+
     public function creationRules(array $input): array
     {
         return [
             'version' => [
                 'required',
-                Rule::in(config('core.nodejs_versions')),
-                Rule::notIn([\App\Enums\NodeJS::NONE]),
+                Rule::in(config('service.services.nodejs.versions')),
                 Rule::unique('services', 'version')
                     ->where('type', 'nodejs')
                     ->where('server_id', $this->service->server_id),
diff --git a/app/SSH/Services/PHP/PHP.php b/app/Services/PHP/PHP.php
similarity index 90%
rename from app/SSH/Services/PHP/PHP.php
rename to app/Services/PHP/PHP.php
index 46b41ed7..539b9455 100644
--- a/app/SSH/Services/PHP/PHP.php
+++ b/app/Services/PHP/PHP.php
@@ -1,23 +1,37 @@
 <?php
 
-namespace App\SSH\Services\PHP;
+namespace App\Services\PHP;
 
 use App\Exceptions\SSHCommandError;
 use App\Exceptions\SSHError;
-use App\SSH\Services\AbstractService;
+use App\Services\AbstractService;
 use Closure;
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
 
 class PHP extends AbstractService
 {
+    public static function id(): string
+    {
+        return 'php';
+    }
+
+    public static function type(): string
+    {
+        return 'php';
+    }
+
+    public function unit(): string
+    {
+        return 'php'.$this->service->version.'-fpm';
+    }
+
     public function creationRules(array $input): array
     {
         return [
             'version' => [
                 'required',
-                Rule::in(config('core.php_versions')),
-                Rule::notIn([\App\Enums\PHP::NONE]),
+                Rule::in(config('service.services.php.versions')),
                 Rule::unique('services', 'version')
                     ->where('type', 'php')
                     ->where('server_id', $this->service->server_id),
@@ -142,7 +156,7 @@ public function createFpmPool(string $user, string $version): void
             'root'
         );
 
-        $this->service->server->systemd()->restart($this->service->unit);
+        $this->service->server->systemd()->restart($this->unit());
     }
 
     /**
diff --git a/app/SSH/Services/ProcessManager/AbstractProcessManager.php b/app/Services/ProcessManager/AbstractProcessManager.php
similarity index 92%
rename from app/SSH/Services/ProcessManager/AbstractProcessManager.php
rename to app/Services/ProcessManager/AbstractProcessManager.php
index 24702c37..2131d798 100644
--- a/app/SSH/Services/ProcessManager/AbstractProcessManager.php
+++ b/app/Services/ProcessManager/AbstractProcessManager.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\SSH\Services\ProcessManager;
+namespace App\Services\ProcessManager;
 
-use App\SSH\Services\AbstractService;
+use App\Services\AbstractService;
 use Closure;
 
 abstract class AbstractProcessManager extends AbstractService implements ProcessManager
diff --git a/app/SSH/Services/ProcessManager/ProcessManager.php b/app/Services/ProcessManager/ProcessManager.php
similarity index 88%
rename from app/SSH/Services/ProcessManager/ProcessManager.php
rename to app/Services/ProcessManager/ProcessManager.php
index 6b2e52ef..1cb6cf23 100755
--- a/app/SSH/Services/ProcessManager/ProcessManager.php
+++ b/app/Services/ProcessManager/ProcessManager.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\SSH\Services\ProcessManager;
+namespace App\Services\ProcessManager;
 
-use App\SSH\Services\ServiceInterface;
+use App\Services\ServiceInterface;
 
 interface ProcessManager extends ServiceInterface
 {
diff --git a/app/SSH/Services/ProcessManager/Supervisor.php b/app/Services/ProcessManager/Supervisor.php
similarity index 92%
rename from app/SSH/Services/ProcessManager/Supervisor.php
rename to app/Services/ProcessManager/Supervisor.php
index c1b6e69b..e722cc03 100644
--- a/app/SSH/Services/ProcessManager/Supervisor.php
+++ b/app/Services/ProcessManager/Supervisor.php
@@ -1,12 +1,27 @@
 <?php
 
-namespace App\SSH\Services\ProcessManager;
+namespace App\Services\ProcessManager;
 
 use App\Exceptions\SSHError;
 use Throwable;
 
 class Supervisor extends AbstractProcessManager
 {
+    public static function id(): string
+    {
+        return 'supervisor';
+    }
+
+    public static function type(): string
+    {
+        return 'process_manager';
+    }
+
+    public function unit(): string
+    {
+        return 'supervisor';
+    }
+
     /**
      * @throws SSHError
      */
diff --git a/app/SSH/Services/Redis/Redis.php b/app/Services/Redis/Redis.php
similarity index 80%
rename from app/SSH/Services/Redis/Redis.php
rename to app/Services/Redis/Redis.php
index a8739dc2..f7286ac3 100644
--- a/app/SSH/Services/Redis/Redis.php
+++ b/app/Services/Redis/Redis.php
@@ -1,14 +1,29 @@
 <?php
 
-namespace App\SSH\Services\Redis;
+namespace App\Services\Redis;
 
 use App\Exceptions\ServiceInstallationFailed;
 use App\Exceptions\SSHError;
-use App\SSH\Services\AbstractService;
+use App\Services\AbstractService;
 use Closure;
 
 class Redis extends AbstractService
 {
+    public static function id(): string
+    {
+        return 'redis';
+    }
+
+    public static function type(): string
+    {
+        return 'memory_database';
+    }
+
+    public function unit(): string
+    {
+        return 'redis';
+    }
+
     public function creationRules(array $input): array
     {
         return [
@@ -34,7 +49,7 @@ public function install(): void
             view('ssh.services.redis.install'),
             'install-redis'
         );
-        $status = $this->service->server->systemd()->status($this->service->unit);
+        $status = $this->service->server->systemd()->status($this->unit());
         $this->service->validateInstall($status);
         $this->service->server->os()->cleanup();
     }
diff --git a/app/SSH/Services/ServiceInterface.php b/app/Services/ServiceInterface.php
similarity index 80%
rename from app/SSH/Services/ServiceInterface.php
rename to app/Services/ServiceInterface.php
index df3f854f..aa6f5736 100644
--- a/app/SSH/Services/ServiceInterface.php
+++ b/app/Services/ServiceInterface.php
@@ -1,9 +1,15 @@
 <?php
 
-namespace App\SSH\Services;
+namespace App\Services;
 
 interface ServiceInterface
 {
+    public static function id(): string;
+
+    public static function type(): string;
+
+    public function unit(): string;
+
     /**
      * @param  array<string, mixed>  $input
      * @return array<string, mixed>
diff --git a/app/Services/Webserver/AbstractWebserver.php b/app/Services/Webserver/AbstractWebserver.php
new file mode 100755
index 00000000..c72e76f0
--- /dev/null
+++ b/app/Services/Webserver/AbstractWebserver.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Services\Webserver;
+
+use App\Models\Site;
+use App\Services\AbstractService;
+use Closure;
+use InvalidArgumentException;
+
+abstract class AbstractWebserver extends AbstractService implements Webserver
+{
+    public function creationRules(array $input): array
+    {
+        return [
+            'name' => [
+                'required',
+                function (string $attribute, mixed $value, Closure $fail): void {
+                    $webserverExists = $this->service->server->webserver();
+                    if ($webserverExists) {
+                        $fail('You already have a webserver service on the server.');
+                    }
+                },
+            ],
+        ];
+    }
+
+    public function deletionRules(): array
+    {
+        return [
+            'service' => [
+                function (string $attribute, mixed $value, Closure $fail): void {
+                    $hasSite = $this->service->server->sites()
+                        ->exists();
+                    if ($hasSite) {
+                        $fail('Cannot uninstall webserver while you have websites using it.');
+                    }
+                },
+            ],
+        ];
+    }
+
+    /**
+     * @param  array<string, string>  $replace  replace blocks
+     * @param  array<int, string>  $regenerate  regenerates the blocks
+     * @param  array<string, string>  $append  appends to the blocks
+     */
+    protected function getUpdatedVHost(Site $site, string $vhost, array $replace = [], array $regenerate = [], array $append = []): string
+    {
+        foreach ($replace as $block => $replacement) {
+            $vhost = preg_replace(
+                '/#\['.$block.'](.*?)#\[\/'.$block.']/s',
+                $replacement,
+                $vhost
+            );
+        }
+
+        foreach ($regenerate as $block) {
+            $vhost = preg_replace(
+                '/#\['.$block.'](.*?)#\[\/'.$block.']/s',
+                $this->generateVhost($site, $block),
+                $vhost
+            );
+        }
+
+        foreach ($append as $block => $content) {
+            /**
+             * #[block]
+             * content
+             * content
+             * content
+             * content
+             * --append-here--
+             * #[/block]
+             */
+            $vhost = preg_replace(
+                '/(#\['.$block.'](.*?)\n)(?=#\[\/'.$block.'])/s',
+                "\$1$content\n",
+                $vhost
+            );
+        }
+
+        return $vhost;
+    }
+
+    protected function generateVhost(Site $site, ?string $block = null): string
+    {
+        $viewPath = 'ssh.services.webserver.'.$this::id().'.vhost-blocks.'.$block;
+        if ($block) {
+            if (! view()->exists($viewPath)) {
+                throw new InvalidArgumentException("View for block '{$block}' does not exist.");
+            }
+            $vhost = view($viewPath, [
+                'site' => $site,
+            ]);
+        } else {
+            $vhost = $site->type()->vhost($this::id());
+        }
+
+        return format_nginx_config($vhost);
+    }
+}
diff --git a/app/SSH/Services/Webserver/Caddy.php b/app/Services/Webserver/Caddy.php
similarity index 88%
rename from app/SSH/Services/Webserver/Caddy.php
rename to app/Services/Webserver/Caddy.php
index dbb2917d..5164f15d 100755
--- a/app/SSH/Services/Webserver/Caddy.php
+++ b/app/Services/Webserver/Caddy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\SSH\Services\Webserver;
+namespace App\Services\Webserver;
 
 use App\Exceptions\SSHError;
 use App\Exceptions\SSLCreationException;
@@ -10,9 +10,19 @@
 
 class Caddy extends AbstractWebserver
 {
-    public function name(): string
+    public static function id(): string
     {
-        return \App\Enums\Webserver::CADDY;
+        return 'caddy';
+    }
+
+    public static function type(): string
+    {
+        return 'webserver';
+    }
+
+    public function unit(): string
+    {
+        return 'caddy';
     }
 
     /**
@@ -91,11 +101,19 @@ public function createVHost(Site $site): void
     /**
      * @throws SSHError
      */
-    public function updateVHost(Site $site, ?string $vhost = null): void
+    public function updateVHost(Site $site, ?string $vhost = null, array $replace = [], array $regenerate = [], array $append = []): void
     {
+        if (! $vhost) {
+            $vhost = $this->getVHost($site);
+        }
+
+        if (! $vhost || ! preg_match('/#\[main]/', $vhost)) {
+            $vhost = $this->generateVhost($site);
+        }
+
         $this->service->server->ssh()->write(
             '/etc/caddy/sites-available/'.$site->domain,
-            $vhost ?? $this->generateVhost($site),
+            format_nginx_config($this->getUpdatedVHost($site, $vhost, $replace, $regenerate, $append)),
             'root'
         );
 
@@ -188,13 +206,4 @@ public function removeSSL(Ssl $ssl): void
 
         $this->updateVHost($ssl->site);
     }
-
-    private function generateVhost(Site $site): string
-    {
-        $vhost = view('ssh.services.webserver.caddy.vhost', [
-            'site' => $site,
-        ]);
-
-        return format_nginx_config($vhost);
-    }
 }
diff --git a/app/SSH/Services/Webserver/Nginx.php b/app/Services/Webserver/Nginx.php
similarity index 87%
rename from app/SSH/Services/Webserver/Nginx.php
rename to app/Services/Webserver/Nginx.php
index 44009f6f..cf3fd2d0 100755
--- a/app/SSH/Services/Webserver/Nginx.php
+++ b/app/Services/Webserver/Nginx.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\SSH\Services\Webserver;
+namespace App\Services\Webserver;
 
 use App\Exceptions\SSHError;
 use App\Exceptions\SSLCreationException;
@@ -10,9 +10,19 @@
 
 class Nginx extends AbstractWebserver
 {
-    public function name(): string
+    public static function id(): string
     {
-        return \App\Enums\Webserver::NGINX;
+        return 'nginx';
+    }
+
+    public static function type(): string
+    {
+        return 'webserver';
+    }
+
+    public function unit(): string
+    {
+        return 'nginx';
     }
 
     /**
@@ -86,11 +96,19 @@ public function createVHost(Site $site): void
     /**
      * @throws SSHError
      */
-    public function updateVHost(Site $site, ?string $vhost = null): void
+    public function updateVHost(Site $site, ?string $vhost = null, array $replace = [], array $regenerate = [], array $append = []): void
     {
+        if (! $vhost) {
+            $vhost = $this->getVHost($site);
+        }
+
+        if (! $vhost || ! preg_match('/#\[header]/', $vhost) || ! preg_match('/#\[main]/', $vhost) || ! preg_match('/#\[footer]/', $vhost)) {
+            $vhost = $this->generateVhost($site);
+        }
+
         $this->service->server->ssh()->write(
             '/etc/nginx/sites-available/'.$site->domain,
-            $vhost ?? $this->generateVhost($site),
+            format_nginx_config($this->getUpdatedVHost($site, $vhost, $replace, $regenerate, $append)),
             'root'
         );
 
@@ -192,13 +210,4 @@ public function removeSSL(Ssl $ssl): void
 
         $this->updateVHost($ssl->site);
     }
-
-    private function generateVhost(Site $site): string
-    {
-        $vhost = view('ssh.services.webserver.nginx.vhost', [
-            'site' => $site,
-        ]);
-
-        return format_nginx_config($vhost);
-    }
 }
diff --git a/app/SSH/Services/Webserver/Webserver.php b/app/Services/Webserver/Webserver.php
similarity index 57%
rename from app/SSH/Services/Webserver/Webserver.php
rename to app/Services/Webserver/Webserver.php
index 0c161c9b..fd71d0d9 100755
--- a/app/SSH/Services/Webserver/Webserver.php
+++ b/app/Services/Webserver/Webserver.php
@@ -1,18 +1,21 @@
 <?php
 
-namespace App\SSH\Services\Webserver;
+namespace App\Services\Webserver;
 
 use App\Models\Site;
 use App\Models\Ssl;
-use App\SSH\Services\ServiceInterface;
+use App\Services\ServiceInterface;
 
 interface Webserver extends ServiceInterface
 {
-    public function name(): string;
-
     public function createVHost(Site $site): void;
 
-    public function updateVHost(Site $site, ?string $vhost = null): void;
+    /**
+     * @param  array<string, string>  $replace  replace blocks
+     * @param  array<int, string>  $regenerate  regenerates the blocks
+     * @param  array<string, string>  $append  appends to the blocks
+     */
+    public function updateVHost(Site $site, ?string $vhost = null, array $replace = [], array $regenerate = [], array $append = []): void;
 
     public function getVHost(Site $site): string;
 
diff --git a/app/SiteFeatures/Action.php b/app/SiteFeatures/Action.php
new file mode 100644
index 00000000..22a59b12
--- /dev/null
+++ b/app/SiteFeatures/Action.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\SiteFeatures;
+
+use App\Models\Site;
+
+abstract class Action implements ActionInterface
+{
+    public function __construct(public Site $site) {}
+}
diff --git a/app/SiteFeatures/ActionInterface.php b/app/SiteFeatures/ActionInterface.php
new file mode 100644
index 00000000..55068ea5
--- /dev/null
+++ b/app/SiteFeatures/ActionInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\SiteFeatures;
+
+use App\DTOs\DynamicForm;
+use Illuminate\Http\Request;
+
+interface ActionInterface
+{
+    public function name(): string;
+
+    public function active(): bool;
+
+    public function form(): ?DynamicForm;
+
+    public function handle(Request $request): void;
+}
diff --git a/app/SiteFeatures/FeatureInterface.php b/app/SiteFeatures/FeatureInterface.php
new file mode 100644
index 00000000..a6589809
--- /dev/null
+++ b/app/SiteFeatures/FeatureInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\SiteFeatures;
+
+use App\DTOs\DynamicForm;
+use Illuminate\Http\Request;
+
+interface FeatureInterface
+{
+    public function name(): string;
+
+    public function active(): bool;
+
+    public function form(): ?DynamicForm;
+
+    public function handle(Request $request): void;
+}
diff --git a/app/SiteFeatures/LaravelOctane/Disable.php b/app/SiteFeatures/LaravelOctane/Disable.php
new file mode 100644
index 00000000..b0764e4b
--- /dev/null
+++ b/app/SiteFeatures/LaravelOctane/Disable.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\SiteFeatures\LaravelOctane;
+
+use App\Actions\Worker\DeleteWorker;
+use App\DTOs\DynamicField;
+use App\DTOs\DynamicForm;
+use App\Models\Worker;
+use App\SiteFeatures\Action;
+use Illuminate\Http\Request;
+
+class Disable extends Action
+{
+    public function name(): string
+    {
+        return 'Disable';
+    }
+
+    public function active(): bool
+    {
+        return data_get($this->site->type_data, 'octane', false);
+    }
+
+    public function form(): ?DynamicForm
+    {
+        return DynamicForm::make([
+            DynamicField::make('port')
+                ->text()
+                ->default(8000),
+        ]);
+    }
+
+    public function handle(Request $request): void
+    {
+        $typeData = $this->site->type_data ?? [];
+
+        /** @var ?Worker $worker */
+        $worker = $this->site->workers()->where('name', 'laravel-octane')->first();
+        if ($worker) {
+            app(DeleteWorker::class)->delete($worker);
+        }
+
+        data_set($typeData, 'octane', false);
+        data_set($typeData, 'octane_port', $request->input('port'));
+        $this->site->type_data = $typeData;
+        $this->site->save();
+
+        $webserver = $this->site->webserver()->id();
+
+        if ($webserver === 'nginx') {
+            $this->site->webserver()->updateVHost(
+                $this->site,
+                replace: [
+                    'laravel-octane-map' => '',
+                    'laravel-octane' => view('ssh.services.webserver.nginx.vhost-blocks.php', ['site' => $this->site]),
+                ],
+            );
+        }
+
+        $request->session()->flash('success', 'Laravel Octane has been disabled for this site.');
+    }
+}
diff --git a/app/SiteFeatures/LaravelOctane/Enable.php b/app/SiteFeatures/LaravelOctane/Enable.php
new file mode 100644
index 00000000..d4f3681c
--- /dev/null
+++ b/app/SiteFeatures/LaravelOctane/Enable.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace App\SiteFeatures\LaravelOctane;
+
+use App\Actions\Worker\CreateWorker;
+use App\Actions\Worker\ManageWorker;
+use App\DTOs\DynamicField;
+use App\DTOs\DynamicForm;
+use App\Exceptions\SSHError;
+use App\Models\Worker;
+use App\SiteFeatures\Action;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
+use RuntimeException;
+
+class Enable extends Action
+{
+    public function name(): string
+    {
+        return 'Enable';
+    }
+
+    public function active(): bool
+    {
+        return ! data_get($this->site->type_data, 'octane', false);
+    }
+
+    public function form(): ?DynamicForm
+    {
+        return DynamicForm::make([
+            DynamicField::make('port')
+                ->text()
+                ->default(8000),
+        ]);
+    }
+
+    /**
+     * @throws SSHError
+     */
+    public function handle(Request $request): void
+    {
+        Validator::make($request->all(), [
+            'port' => 'required|integer|min:1|max:65535',
+        ])->validate();
+
+        $this->site->server->ssh()->exec(
+            __('php :path/artisan octane:install --no-interaction', [
+                'path' => $this->site->path,
+            ]),
+            'install-laravel-octane',
+        );
+
+        $command = __('php :path/artisan octane:start --port=:port --host=127.0.0.1', [
+            'path' => $this->site->path,
+            'port' => $request->input('port'),
+        ]);
+
+        /** @var ?Worker $worker */
+        $worker = $this->site->workers()->where('name', 'laravel-octane')->first();
+        if ($worker) {
+            app(ManageWorker::class)->restart($worker);
+        } else {
+            app(CreateWorker::class)->create(
+                $this->site->server,
+                [
+                    'name' => 'laravel-octane',
+                    'command' => $command,
+                    'user' => $this->site->user ?? $this->site->server->getSshUser(),
+                    'auto_start' => true,
+                    'auto_restart' => true,
+                    'numprocs' => 1,
+                ],
+                $this->site,
+            );
+        }
+
+        $typeData = $this->site->type_data ?? [];
+        data_set($typeData, 'octane', true);
+        data_set($typeData, 'octane_port', $request->input('port'));
+        $this->site->type_data = $typeData;
+        $this->site->save();
+
+        $this->updateVHost();
+
+        $request->session()->flash('success', 'Laravel Octane has been enabled for this site.');
+    }
+
+    private function updateVHost(): void
+    {
+        $webserver = $this->site->webserver();
+
+        if ($webserver->id() === 'nginx') {
+            $this->site->webserver()->updateVHost(
+                $this->site,
+                replace: [
+                    'php' => view('ssh.services.webserver.nginx.vhost-blocks.laravel-octane', ['site' => $this->site]),
+                    'laravel-octane-map' => '',
+                ],
+                append: [
+                    'header' => view('ssh.services.webserver.nginx.vhost-blocks.laravel-octane-map', ['site' => $this->site]),
+                ]
+            );
+
+            return;
+        }
+
+        throw new RuntimeException('Unsupported webserver: '.$webserver->id());
+    }
+}
diff --git a/app/SiteTypes/AbstractSiteType.php b/app/SiteTypes/AbstractSiteType.php
index de1429b2..eac54240 100755
--- a/app/SiteTypes/AbstractSiteType.php
+++ b/app/SiteTypes/AbstractSiteType.php
@@ -4,8 +4,9 @@
 
 use App\Exceptions\FailedToDeployGitKey;
 use App\Exceptions\SSHError;
+use App\Models\Service;
 use App\Models\Site;
-use App\SSH\Services\PHP\PHP;
+use App\Services\PHP\PHP;
 use Illuminate\Support\Str;
 use RuntimeException;
 
@@ -76,7 +77,7 @@ protected function isolate(): void
         // Generate the FPM pool
         if ($this->site->php_version) {
             $service = $this->site->php();
-            if (! $service instanceof \App\Models\Service) {
+            if (! $service instanceof Service) {
                 throw new RuntimeException('PHP service not found');
             }
             /** @var PHP $php */
diff --git a/app/SiteTypes/Laravel.php b/app/SiteTypes/Laravel.php
index dc12a5d5..142f2ae6 100644
--- a/app/SiteTypes/Laravel.php
+++ b/app/SiteTypes/Laravel.php
@@ -6,57 +6,29 @@
 
 class Laravel extends PHPSite
 {
+    public static function id(): string
+    {
+        return 'laravel';
+    }
+
     public static function make(): self
     {
-        return new self(new Site(['type' => \App\Enums\SiteType::LARAVEL]));
+        return new self(new Site(['type' => self::id()]));
     }
 
     public function baseCommands(): array
     {
         return array_merge(parent::baseCommands(), [
-            // Initial Setup Commands
             [
-                'name' => 'Generate Application Key',
-                'command' => 'php artisan key:generate',
-            ],
-            [
-                'name' => 'Create Storage Symbolic Link',
-                'command' => 'php artisan storage:link',
-            ],
-            // Database Commands
-            [
-                'name' => 'Run Database Migrations',
-                'command' => 'php artisan migrate --force',
-            ],
-            // Cache & Optimization Commands
-            [
-                'name' => 'Optimize Application',
-                'command' => 'php artisan optimize',
-            ],
-            [
-                'name' => 'Clear All Application Optimizations',
-                'command' => 'php artisan optimize:clear',
-            ],
-            [
-                'name' => 'Clear Application Cache Only',
+                'name' => 'cache:clear',
                 'command' => 'php artisan cache:clear',
             ],
-            // Worker Commands
             [
-                'name' => 'Restart Workers',
-                'command' => 'php artisan queue:restart',
-            ],
-            [
-                'name' => 'Clear All Failed Queue Jobs',
-                'command' => 'php artisan queue:flush',
-            ],
-            // Application State Commands
-            [
-                'name' => 'Put Application in Maintenance Mode',
+                'name' => 'down',
                 'command' => 'php artisan down --retry=5 --refresh=6 --quiet',
             ],
             [
-                'name' => 'Bring Application Online',
+                'name' => 'up',
                 'command' => 'php artisan up',
             ],
         ]);
diff --git a/app/SiteTypes/LoadBalancer.php b/app/SiteTypes/LoadBalancer.php
index 6e6094b0..4904e9eb 100755
--- a/app/SiteTypes/LoadBalancer.php
+++ b/app/SiteTypes/LoadBalancer.php
@@ -2,19 +2,21 @@
 
 namespace App\SiteTypes;
 
-use App\DTOs\DynamicFieldDTO;
-use App\DTOs\DynamicFieldsCollectionDTO;
 use App\Enums\LoadBalancerMethod;
-use App\Enums\SiteFeature;
 use App\Exceptions\SSHError;
 use App\Models\Site;
 use Illuminate\Validation\Rule;
 
 class LoadBalancer extends AbstractSiteType
 {
+    public static function id(): string
+    {
+        return 'load-balancer';
+    }
+
     public static function make(): self
     {
-        return new self(new Site(['type' => \App\Enums\SiteType::LOAD_BALANCER]));
+        return new self(new Site(['type' => self::id()]));
     }
 
     public function language(): string
@@ -22,27 +24,6 @@ public function language(): string
         return 'yaml';
     }
 
-    public function supportedFeatures(): array
-    {
-        return [
-            SiteFeature::SSL,
-        ];
-    }
-
-    public function fields(): DynamicFieldsCollectionDTO
-    {
-        return new DynamicFieldsCollectionDTO([
-            DynamicFieldDTO::make('method')
-                ->select()
-                ->label('Load Balancing Method')
-                ->options([
-                    LoadBalancerMethod::IP_HASH,
-                    LoadBalancerMethod::ROUND_ROBIN,
-                    LoadBalancerMethod::LEAST_CONNECTIONS,
-                ]),
-        ]);
-    }
-
     public function createRules(array $input): array
     {
         return [
@@ -73,4 +54,36 @@ public function install(): void
 
         $this->site->webserver()->createVHost($this->site);
     }
+
+    public function vhost(string $webserver): string
+    {
+        if ($webserver === 'nginx') {
+            return view('ssh.services.webserver.nginx.vhost', [
+                'header' => [
+                    view('ssh.services.webserver.nginx.vhost-blocks.force-ssl', ['site' => $this->site]),
+                    view('ssh.services.webserver.nginx.vhost-blocks.load-balancer-upstream', ['site' => $this->site]),
+                ],
+                'main' => [
+                    view('ssh.services.webserver.nginx.vhost-blocks.port', ['site' => $this->site]),
+                    view('ssh.services.webserver.nginx.vhost-blocks.core', ['site' => $this->site]),
+                    view('ssh.services.webserver.nginx.vhost-blocks.load-balancer', ['site' => $this->site]),
+                    view('ssh.services.webserver.nginx.vhost-blocks.redirects', ['site' => $this->site]),
+                ],
+            ]);
+        }
+
+        if ($webserver === 'caddy') {
+            return view('ssh.services.webserver.caddy.vhost', [
+                'main' => implode("\n", [
+                    view('ssh.services.webserver.caddy.vhost-blocks.force-ssl', ['site' => $this->site]),
+                    view('ssh.services.webserver.caddy.vhost-blocks.port', ['site' => $this->site]),
+                    view('ssh.services.webserver.caddy.vhost-blocks.core', ['site' => $this->site]),
+                    view('ssh.services.webserver.caddy.vhost-blocks.load-balancer', ['site' => $this->site]),
+                    view('ssh.services.webserver.caddy.vhost-blocks.redirects', ['site' => $this->site]),
+                ]),
+            ]);
+        }
+
+        return '';
+    }
 }
diff --git a/app/SiteTypes/PHPBlank.php b/app/SiteTypes/PHPBlank.php
index 6895d735..cb67fd51 100755
--- a/app/SiteTypes/PHPBlank.php
+++ b/app/SiteTypes/PHPBlank.php
@@ -2,43 +2,20 @@
 
 namespace App\SiteTypes;
 
-use App\DTOs\DynamicFieldDTO;
-use App\DTOs\DynamicFieldsCollectionDTO;
-use App\Enums\SiteFeature;
 use App\Exceptions\SSHError;
 use App\Models\Site;
 use Illuminate\Validation\Rule;
 
 class PHPBlank extends PHPSite
 {
+    public static function id(): string
+    {
+        return 'php-blank';
+    }
+
     public static function make(): self
     {
-        return new self(new Site(['type' => \App\Enums\SiteType::PHP]));
-    }
-
-    public function supportedFeatures(): array
-    {
-        return [
-            SiteFeature::DEPLOYMENT,
-            SiteFeature::COMMANDS,
-            SiteFeature::ENV,
-            SiteFeature::SSL,
-            SiteFeature::WORKERS,
-        ];
-    }
-
-    public function fields(): DynamicFieldsCollectionDTO
-    {
-        return new DynamicFieldsCollectionDTO([
-            DynamicFieldDTO::make('php_version')
-                ->component()
-                ->label('PHP Version'),
-            DynamicFieldDTO::make('web_directory')
-                ->text()
-                ->label('Web Directory')
-                ->placeholder('For / leave empty')
-                ->description('The relative path of your website from /home/vito/your-domain/'),
-        ]);
+        return new self(new Site(['type' => self::id()]));
     }
 
     public function createRules(array $input): array
diff --git a/app/SiteTypes/PHPMyAdmin.php b/app/SiteTypes/PHPMyAdmin.php
index 79c553ad..0e847ed0 100755
--- a/app/SiteTypes/PHPMyAdmin.php
+++ b/app/SiteTypes/PHPMyAdmin.php
@@ -2,34 +2,20 @@
 
 namespace App\SiteTypes;
 
-use App\DTOs\DynamicFieldDTO;
-use App\DTOs\DynamicFieldsCollectionDTO;
-use App\Enums\SiteFeature;
 use App\Exceptions\SSHError;
 use App\Models\Site;
 use Illuminate\Validation\Rule;
 
 class PHPMyAdmin extends PHPSite
 {
+    public static function id(): string
+    {
+        return 'phpmyadmin';
+    }
+
     public static function make(): self
     {
-        return new self(new Site(['type' => \App\Enums\SiteType::PHPMYADMIN]));
-    }
-
-    public function supportedFeatures(): array
-    {
-        return [
-            SiteFeature::SSL,
-        ];
-    }
-
-    public function fields(): DynamicFieldsCollectionDTO
-    {
-        return new DynamicFieldsCollectionDTO([
-            DynamicFieldDTO::make('php_version')
-                ->component()
-                ->label('PHP Version'),
-        ]);
+        return new self(new Site(['type' => self::id()]));
     }
 
     public function createRules(array $input): array
@@ -65,7 +51,14 @@ public function install(): void
         $this->isolate();
         $this->site->webserver()->createVHost($this->site);
         $this->progress(30);
-        app(\App\SSH\PHPMyAdmin\PHPMyAdmin::class)->install($this->site);
+        $this->site->server->ssh($this->site->user)->exec(
+            view('ssh.phpmyadmin.install', [
+                'version' => $this->site->type_data['version'],
+                'path' => $this->site->path,
+            ]),
+            'install-phpmyadmin',
+            $this->site->id
+        );
         $this->progress(65);
         $this->site->php()?->restart();
     }
diff --git a/app/SiteTypes/PHPSite.php b/app/SiteTypes/PHPSite.php
index ced30584..fba62b3d 100755
--- a/app/SiteTypes/PHPSite.php
+++ b/app/SiteTypes/PHPSite.php
@@ -2,21 +2,18 @@
 
 namespace App\SiteTypes;
 
-use App\DTOs\DynamicFieldDTO;
-use App\DTOs\DynamicFieldsCollectionDTO;
-use App\Enums\SiteFeature;
 use App\Exceptions\FailedToDeployGitKey;
 use App\Exceptions\SSHError;
 use App\Models\Site;
-use App\SSH\Composer\Composer;
-use App\SSH\Git\Git;
+use App\SSH\OS\Composer;
+use App\SSH\OS\Git;
 use Illuminate\Validation\Rule;
 
 class PHPSite extends AbstractSiteType
 {
-    public static function make(): self
+    public static function id(): string
     {
-        return new self(new Site(['type' => \App\Enums\SiteType::PHP]));
+        return 'php';
     }
 
     public function language(): string
@@ -24,44 +21,9 @@ public function language(): string
         return 'php';
     }
 
-    public function supportedFeatures(): array
+    public static function make(): self
     {
-        return [
-            SiteFeature::DEPLOYMENT,
-            SiteFeature::COMMANDS,
-            SiteFeature::ENV,
-            SiteFeature::SSL,
-            SiteFeature::WORKERS,
-        ];
-    }
-
-    public function fields(): DynamicFieldsCollectionDTO
-    {
-        return new DynamicFieldsCollectionDTO([
-            DynamicFieldDTO::make('php_version')
-                ->component()
-                ->label('PHP Version'),
-            DynamicFieldDTO::make('source_control')
-                ->component()
-                ->label('Source Control'),
-            DynamicFieldDTO::make('web_directory')
-                ->text()
-                ->label('Web Directory')
-                ->placeholder('For / leave empty')
-                ->description('The relative path of your website from /home/vito/your-domain/'),
-            DynamicFieldDTO::make('repository')
-                ->text()
-                ->label('Repository')
-                ->placeholder('organization/repository'),
-            DynamicFieldDTO::make('branch')
-                ->text()
-                ->label('Branch')
-                ->default('main'),
-            DynamicFieldDTO::make('composer')
-                ->checkbox()
-                ->label('Run `composer install --no-dev`')
-                ->default(false),
-        ]);
+        return new self(new Site(['type' => self::id()]));
     }
 
     public function createRules(array $input): array
@@ -132,9 +94,40 @@ public function baseCommands(): array
     {
         return [
             [
-                'name' => 'Install Composer Dependencies',
+                'name' => 'composer:install',
                 'command' => 'composer install --no-dev --no-interaction --no-progress',
             ],
         ];
     }
+
+    public function vhost(string $webserver): string
+    {
+        if ($webserver === 'nginx') {
+            return view('ssh.services.webserver.nginx.vhost', [
+                'header' => [
+                    view('ssh.services.webserver.nginx.vhost-blocks.force-ssl', ['site' => $this->site]),
+                ],
+                'main' => [
+                    view('ssh.services.webserver.nginx.vhost-blocks.port', ['site' => $this->site]),
+                    view('ssh.services.webserver.nginx.vhost-blocks.core', ['site' => $this->site]),
+                    view('ssh.services.webserver.nginx.vhost-blocks.php', ['site' => $this->site]),
+                    view('ssh.services.webserver.nginx.vhost-blocks.redirects', ['site' => $this->site]),
+                ],
+            ]);
+        }
+
+        if ($webserver === 'caddy') {
+            return view('ssh.services.webserver.caddy.vhost', [
+                'main' => [
+                    view('ssh.services.webserver.caddy.vhost-blocks.force-ssl', ['site' => $this->site]),
+                    view('ssh.services.webserver.caddy.vhost-blocks.port', ['site' => $this->site]),
+                    view('ssh.services.webserver.caddy.vhost-blocks.core', ['site' => $this->site]),
+                    view('ssh.services.webserver.caddy.vhost-blocks.php', ['site' => $this->site]),
+                    view('ssh.services.webserver.caddy.vhost-blocks.redirects', ['site' => $this->site]),
+                ],
+            ]);
+        }
+
+        return '';
+    }
 }
diff --git a/app/SiteTypes/SiteType.php b/app/SiteTypes/SiteType.php
index 3adbaf59..e9fec442 100755
--- a/app/SiteTypes/SiteType.php
+++ b/app/SiteTypes/SiteType.php
@@ -2,19 +2,12 @@
 
 namespace App\SiteTypes;
 
-use App\DTOs\DynamicFieldsCollectionDTO;
-
 interface SiteType
 {
+    public static function id(): string;
+
     public function language(): string;
 
-    /**
-     * @return array<string>
-     */
-    public function supportedFeatures(): array;
-
-    public function fields(): DynamicFieldsCollectionDTO;
-
     /**
      * @param  array<string, mixed>  $input
      * @return array<string, mixed>
@@ -22,12 +15,16 @@ public function fields(): DynamicFieldsCollectionDTO;
     public function createRules(array $input): array;
 
     /**
+     * The fields here will be replaced in the Site model
+     *
      * @param  array<string, mixed>  $input
      * @return array<string, mixed>
      */
     public function createFields(array $input): array;
 
     /**
+     * The fields here will be replaced in the type_data column as json
+     *
      * @param  array<string, mixed>  $input
      * @return array<string, mixed>
      */
@@ -39,4 +36,6 @@ public function install(): void;
      * @return array<array<string, string>>
      */
     public function baseCommands(): array;
+
+    public function vhost(string $webserver): string;
 }
diff --git a/app/SiteTypes/Wordpress.php b/app/SiteTypes/Wordpress.php
index 9696bf8a..e412893e 100755
--- a/app/SiteTypes/Wordpress.php
+++ b/app/SiteTypes/Wordpress.php
@@ -5,9 +5,6 @@
 use App\Actions\Database\CreateDatabase;
 use App\Actions\Database\CreateDatabaseUser;
 use App\Actions\Database\LinkUser;
-use App\DTOs\DynamicFieldDTO;
-use App\DTOs\DynamicFieldsCollectionDTO;
-use App\Enums\SiteFeature;
 use App\Exceptions\SSHError;
 use App\Models\Database;
 use App\Models\DatabaseUser;
@@ -15,11 +12,16 @@
 use Closure;
 use Illuminate\Validation\Rule;
 
-class Wordpress extends AbstractSiteType
+class Wordpress extends PHPSite
 {
+    public static function id(): string
+    {
+        return 'wordpress';
+    }
+
     public static function make(): self
     {
-        return new self(new Site(['type' => \App\Enums\SiteType::WORDPRESS]));
+        return new self(new Site(['type' => self::id()]));
     }
 
     public function language(): string
@@ -27,48 +29,6 @@ public function language(): string
         return 'php';
     }
 
-    public function supportedFeatures(): array
-    {
-        return [
-            SiteFeature::SSL,
-            SiteFeature::COMMANDS,
-        ];
-    }
-
-    public function fields(): DynamicFieldsCollectionDTO
-    {
-        return new DynamicFieldsCollectionDTO([
-            DynamicFieldDTO::make('php_version')
-                ->component()
-                ->label('PHP Version'),
-            DynamicFieldDTO::make('title')
-                ->text()
-                ->label('Site Title')
-                ->placeholder('My WordPress Site'),
-            DynamicFieldDTO::make('username')
-                ->text()
-                ->label('Admin Username')
-                ->placeholder('admin'),
-            DynamicFieldDTO::make('password')
-                ->text()
-                ->label('Admin Password'),
-            DynamicFieldDTO::make('email')
-                ->text()
-                ->label('Admin Email'),
-            DynamicFieldDTO::make('database')
-                ->text()
-                ->label('Database Name')
-                ->placeholder('wordpress'),
-            DynamicFieldDTO::make('database_user')
-                ->text()
-                ->label('Database User')
-                ->placeholder('wp_user'),
-            DynamicFieldDTO::make('database_password')
-                ->text()
-                ->label('Database Password'),
-        ]);
-    }
-
     public function createRules(array $input): array
     {
         return [
@@ -157,6 +117,25 @@ public function install(): void
 
         $this->site->php()?->restart();
         $this->progress(60);
-        app(\App\SSH\Wordpress\Wordpress::class)->install($this->site);
+
+        $this->site->server->ssh($this->site->user)->exec(
+            view('ssh.wordpress.install', [
+                'path' => $this->site->path,
+                'domain' => $this->site->domain,
+                'isIsolated' => $this->site->isIsolated() ? 'true' : 'false',
+                'isolatedUsername' => $this->site->user,
+                'dbName' => $this->site->type_data['database'],
+                'dbUser' => $this->site->type_data['database_user'],
+                'dbPass' => $this->site->type_data['database_password'],
+                'dbHost' => 'localhost',
+                'dbPrefix' => 'wp_',
+                'username' => $this->site->type_data['username'],
+                'password' => $this->site->type_data['password'],
+                'email' => $this->site->type_data['email'],
+                'title' => $this->site->type_data['title'],
+            ]),
+            'install-wordpress',
+            $this->site->id
+        );
     }
 }
diff --git a/app/SourceControlProviders/Bitbucket.php b/app/SourceControlProviders/Bitbucket.php
index 16940ae8..486dabed 100755
--- a/app/SourceControlProviders/Bitbucket.php
+++ b/app/SourceControlProviders/Bitbucket.php
@@ -13,6 +13,11 @@ class Bitbucket extends AbstractSourceControlProvider
 {
     protected string $apiUrl = 'https://api.bitbucket.org/2.0';
 
+    public static function id(): string
+    {
+        return 'bitbucket';
+    }
+
     public function createRules(array $input): array
     {
         return [
diff --git a/app/SourceControlProviders/Github.php b/app/SourceControlProviders/Github.php
index 5003b7a4..5889d240 100755
--- a/app/SourceControlProviders/Github.php
+++ b/app/SourceControlProviders/Github.php
@@ -12,6 +12,11 @@ class Github extends AbstractSourceControlProvider
 {
     protected string $apiUrl = 'https://api.github.com';
 
+    public static function id(): string
+    {
+        return 'github';
+    }
+
     public function connect(): bool
     {
         try {
diff --git a/app/SourceControlProviders/Gitlab.php b/app/SourceControlProviders/Gitlab.php
index 3df66e58..51d76dd4 100755
--- a/app/SourceControlProviders/Gitlab.php
+++ b/app/SourceControlProviders/Gitlab.php
@@ -14,6 +14,11 @@ class Gitlab extends AbstractSourceControlProvider
 
     protected string $apiVersion = 'api/v4';
 
+    public static function id(): string
+    {
+        return 'gitlab';
+    }
+
     public function createRules(array $input): array
     {
         return [
diff --git a/app/SourceControlProviders/SourceControlProvider.php b/app/SourceControlProviders/SourceControlProvider.php
index b70f14a1..be97c46c 100755
--- a/app/SourceControlProviders/SourceControlProvider.php
+++ b/app/SourceControlProviders/SourceControlProvider.php
@@ -8,6 +8,8 @@
 
 interface SourceControlProvider
 {
+    public static function id(): string;
+
     /**
      * @param  array<string, mixed>  $input
      * @return array<string, mixed>
diff --git a/app/StorageProviders/Dropbox.php b/app/StorageProviders/Dropbox.php
index a2199ab4..18ab6916 100644
--- a/app/StorageProviders/Dropbox.php
+++ b/app/StorageProviders/Dropbox.php
@@ -10,6 +10,11 @@ class Dropbox extends AbstractStorageProvider
 {
     protected string $apiUrl = 'https://api.dropboxapi.com/2';
 
+    public static function id(): string
+    {
+        return 'dropbox';
+    }
+
     public function validationRules(): array
     {
         return [
diff --git a/app/StorageProviders/FTP.php b/app/StorageProviders/FTP.php
index ae5f7796..5f6319a3 100644
--- a/app/StorageProviders/FTP.php
+++ b/app/StorageProviders/FTP.php
@@ -8,6 +8,11 @@
 
 class FTP extends AbstractStorageProvider
 {
+    public static function id(): string
+    {
+        return 'ftp';
+    }
+
     /**
      * @return array<string, mixed>
      */
diff --git a/app/StorageProviders/Local.php b/app/StorageProviders/Local.php
index bfbbd611..b64d516b 100644
--- a/app/StorageProviders/Local.php
+++ b/app/StorageProviders/Local.php
@@ -7,6 +7,11 @@
 
 class Local extends AbstractStorageProvider
 {
+    public static function id(): string
+    {
+        return 'local';
+    }
+
     public function validationRules(): array
     {
         return [
diff --git a/app/StorageProviders/S3.php b/app/StorageProviders/S3.php
index 1ebc4d20..b34df7b1 100644
--- a/app/StorageProviders/S3.php
+++ b/app/StorageProviders/S3.php
@@ -21,6 +21,11 @@ class S3 extends AbstractStorageProvider
      */
     protected array $clientConfig = [];
 
+    public static function id(): string
+    {
+        return 's3';
+    }
+
     public function getApiUrl(): string
     {
         if (isset($this->storageProvider->credentials['api_url']) && $this->storageProvider->credentials['api_url']) {
diff --git a/app/StorageProviders/StorageProvider.php b/app/StorageProviders/StorageProvider.php
index ef70ce8c..81de76fb 100644
--- a/app/StorageProviders/StorageProvider.php
+++ b/app/StorageProviders/StorageProvider.php
@@ -7,6 +7,8 @@
 
 interface StorageProvider
 {
+    public static function id(): string;
+
     /**
      * @return array<string, string>
      */
diff --git a/app/Support/Testing/SSHFake.php b/app/Support/Testing/SSHFake.php
index d2a7670c..b2e106b2 100644
--- a/app/Support/Testing/SSHFake.php
+++ b/app/Support/Testing/SSHFake.php
@@ -5,6 +5,7 @@
 use App\Exceptions\SSHConnectionError;
 use App\Helpers\SSH;
 use App\Models\Server;
+use App\Models\ServerLog;
 use Illuminate\Support\Traits\ReflectsClosures;
 use PHPUnit\Framework\Assert;
 
@@ -53,8 +54,8 @@ public function connect(bool $sftp = false): void
 
     public function exec(string $command, string $log = '', ?int $siteId = null, ?bool $stream = false, ?callable $streamCallback = null): string
     {
-        if (! $this->log instanceof \App\Models\ServerLog && $log) {
-            /** @var \App\Models\ServerLog $log */
+        if (! $this->log instanceof ServerLog && $log) {
+            /** @var ServerLog $log */
             $log = $this->server->logs()->create([
                 'site_id' => $siteId,
                 'name' => $this->server->id.'-'.strtotime('now').'-'.$log.'.log',
diff --git a/app/Traits/Enum.php b/app/Traits/Enum.php
index 5520156a..37e7d45e 100644
--- a/app/Traits/Enum.php
+++ b/app/Traits/Enum.php
@@ -2,6 +2,8 @@
 
 namespace App\Traits;
 
+use ReflectionClass;
+
 trait Enum
 {
     /**
@@ -9,7 +11,7 @@ trait Enum
      */
     public static function all(): array
     {
-        $reflection = new \ReflectionClass(self::class);
+        $reflection = new ReflectionClass(self::class);
 
         return $reflection->getConstants();
     }
diff --git a/app/ValidationRules/CronRule.php b/app/ValidationRules/CronRule.php
index 2a913088..d3914e08 100755
--- a/app/ValidationRules/CronRule.php
+++ b/app/ValidationRules/CronRule.php
@@ -2,6 +2,7 @@
 
 namespace App\ValidationRules;
 
+use Closure;
 use Cron\CronExpression;
 use Illuminate\Contracts\Validation\ValidationRule;
 
@@ -9,7 +10,7 @@ class CronRule implements ValidationRule
 {
     public function __construct(private readonly bool $acceptCustom = false) {}
 
-    public function validate(string $attribute, mixed $value, \Closure $fail): void
+    public function validate(string $attribute, mixed $value, Closure $fail): void
     {
         if (CronExpression::isValidExpression($value)) {
             return;
diff --git a/config/app.php b/config/app.php
index c2e2574e..15a8624e 100644
--- a/config/app.php
+++ b/config/app.php
@@ -193,6 +193,12 @@
         App\Providers\AuthServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
         App\Providers\DemoServiceProvider::class,
+        App\Providers\SiteTypeServiceProvider::class,
+        App\Providers\ServerProviderServiceProvider::class,
+        App\Providers\StorageProviderServiceProvider::class,
+        App\Providers\SourceControlServiceProvider::class,
+        App\Providers\NotificationChannelServiceProvider::class,
+        App\Providers\ServiceTypeServiceProvider::class,
     ],
 
     /*
diff --git a/config/core.php b/config/core.php
index f0512eea..3337acd7 100755
--- a/config/core.php
+++ b/config/core.php
@@ -1,5 +1,11 @@
 <?php
 
+use App\Enums\OperatingSystem;
+use App\Enums\SslType;
+use App\Enums\UserRole;
+use App\Models\Server;
+use App\Models\Site;
+
 return [
     /*
      * SSH
@@ -14,512 +20,14 @@
      * General
      */
     'operating_systems' => [
-        \App\Enums\OperatingSystem::UBUNTU20,
-        \App\Enums\OperatingSystem::UBUNTU22,
-        \App\Enums\OperatingSystem::UBUNTU24,
+        OperatingSystem::UBUNTU20,
+        OperatingSystem::UBUNTU22,
+        OperatingSystem::UBUNTU24,
     ],
     'operating_system_versions' => [
-        \App\Enums\OperatingSystem::UBUNTU20 => '20.04',
-        \App\Enums\OperatingSystem::UBUNTU22 => '22.04',
-        \App\Enums\OperatingSystem::UBUNTU24 => '24.04',
-    ],
-    'webservers' => [
-        \App\Enums\Webserver::NONE,
-        \App\Enums\Webserver::NGINX,
-        \App\Enums\Webserver::CADDY,
-    ],
-    'php_versions' => [
-        \App\Enums\PHP::NONE,
-        \App\Enums\PHP::V70,
-        \App\Enums\PHP::V71,
-        \App\Enums\PHP::V72,
-        \App\Enums\PHP::V73,
-        \App\Enums\PHP::V74,
-        \App\Enums\PHP::V80,
-        \App\Enums\PHP::V81,
-        \App\Enums\PHP::V82,
-        \App\Enums\PHP::V83,
-        \App\Enums\PHP::V84,
-    ],
-    'nodejs_versions' => [
-        \App\Enums\NodeJS::NONE,
-        \App\Enums\NodeJS::V4,
-        \App\Enums\NodeJS::V6,
-        \App\Enums\NodeJS::V8,
-        \App\Enums\NodeJS::V10,
-        \App\Enums\NodeJS::V12,
-        \App\Enums\NodeJS::V14,
-        \App\Enums\NodeJS::V16,
-        \App\Enums\NodeJS::V18,
-        \App\Enums\NodeJS::V20,
-        \App\Enums\NodeJS::V22,
-    ],
-    'databases' => [
-        \App\Enums\Database::NONE,
-        \App\Enums\Database::MYSQL57,
-        \App\Enums\Database::MYSQL80,
-        \App\Enums\Database::MYSQL84,
-        \App\Enums\Database::MARIADB103,
-        \App\Enums\Database::MARIADB104,
-        \App\Enums\Database::MARIADB106,
-        \App\Enums\Database::MARIADB1011,
-        \App\Enums\Database::MARIADB114,
-        \App\Enums\Database::POSTGRESQL12,
-        \App\Enums\Database::POSTGRESQL13,
-        \App\Enums\Database::POSTGRESQL14,
-        \App\Enums\Database::POSTGRESQL15,
-        \App\Enums\Database::POSTGRESQL16,
-    ],
-    'databases_name' => [
-        \App\Enums\Database::NONE => 'none',
-        \App\Enums\Database::MYSQL57 => 'mysql',
-        \App\Enums\Database::MYSQL80 => 'mysql',
-        \App\Enums\Database::MYSQL84 => 'mysql',
-        \App\Enums\Database::MARIADB103 => 'mariadb',
-        \App\Enums\Database::MARIADB104 => 'mariadb',
-        \App\Enums\Database::MARIADB106 => 'mariadb',
-        \App\Enums\Database::MARIADB1011 => 'mariadb',
-        \App\Enums\Database::MARIADB114 => 'mariadb',
-        \App\Enums\Database::POSTGRESQL12 => 'postgresql',
-        \App\Enums\Database::POSTGRESQL13 => 'postgresql',
-        \App\Enums\Database::POSTGRESQL14 => 'postgresql',
-        \App\Enums\Database::POSTGRESQL15 => 'postgresql',
-        \App\Enums\Database::POSTGRESQL16 => 'postgresql',
-    ],
-    'databases_version' => [
-        \App\Enums\Database::NONE => '',
-        \App\Enums\Database::MYSQL57 => '5.7',
-        \App\Enums\Database::MYSQL80 => '8.0',
-        \App\Enums\Database::MYSQL84 => '8.4',
-        \App\Enums\Database::MARIADB103 => '10.3',
-        \App\Enums\Database::MARIADB104 => '10.4',
-        \App\Enums\Database::MARIADB106 => '10.6',
-        \App\Enums\Database::MARIADB1011 => '10.11',
-        \App\Enums\Database::MARIADB114 => '11.4',
-        \App\Enums\Database::POSTGRESQL12 => '12',
-        \App\Enums\Database::POSTGRESQL13 => '13',
-        \App\Enums\Database::POSTGRESQL14 => '14',
-        \App\Enums\Database::POSTGRESQL15 => '15',
-        \App\Enums\Database::POSTGRESQL16 => '16',
-    ],
-    'database_features' => [
-        'remote' => [
-            'mysql',
-            'mariadb',
-        ],
-    ],
-
-    /*
-     * Server
-     */
-    'server_types' => [
-        \App\Enums\ServerType::REGULAR,
-        \App\Enums\ServerType::DATABASE,
-    ],
-    'server_types_class' => [
-        \App\Enums\ServerType::REGULAR => \App\ServerTypes\Regular::class,
-        \App\Enums\ServerType::DATABASE => \App\ServerTypes\Database::class,
-    ],
-    'server_providers' => [
-        \App\Enums\ServerProvider::CUSTOM,
-        \App\Enums\ServerProvider::AWS,
-        \App\Enums\ServerProvider::LINODE,
-        \App\Enums\ServerProvider::DIGITALOCEAN,
-        \App\Enums\ServerProvider::VULTR,
-        \App\Enums\ServerProvider::HETZNER,
-    ],
-    'server_providers_class' => [
-        \App\Enums\ServerProvider::CUSTOM => \App\ServerProviders\Custom::class,
-        \App\Enums\ServerProvider::AWS => \App\ServerProviders\AWS::class,
-        \App\Enums\ServerProvider::LINODE => \App\ServerProviders\Linode::class,
-        \App\Enums\ServerProvider::DIGITALOCEAN => \App\ServerProviders\DigitalOcean::class,
-        \App\Enums\ServerProvider::VULTR => \App\ServerProviders\Vultr::class,
-        \App\Enums\ServerProvider::HETZNER => \App\ServerProviders\Hetzner::class,
-    ],
-    'server_providers_default_user' => [
-        'custom' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => 'root',
-            \App\Enums\OperatingSystem::UBUNTU22 => 'root',
-            \App\Enums\OperatingSystem::UBUNTU24 => 'root',
-        ],
-        'aws' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => 'ubuntu',
-            \App\Enums\OperatingSystem::UBUNTU22 => 'ubuntu',
-            \App\Enums\OperatingSystem::UBUNTU24 => 'ubuntu',
-        ],
-        'linode' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => 'root',
-            \App\Enums\OperatingSystem::UBUNTU22 => 'root',
-            \App\Enums\OperatingSystem::UBUNTU24 => 'root',
-        ],
-        'digitalocean' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => 'root',
-            \App\Enums\OperatingSystem::UBUNTU22 => 'root',
-            \App\Enums\OperatingSystem::UBUNTU24 => 'root',
-        ],
-        'vultr' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => 'root',
-            \App\Enums\OperatingSystem::UBUNTU22 => 'root',
-            \App\Enums\OperatingSystem::UBUNTU24 => 'root',
-        ],
-        'hetzner' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => 'root',
-            \App\Enums\OperatingSystem::UBUNTU22 => 'root',
-            \App\Enums\OperatingSystem::UBUNTU24 => 'root',
-        ],
-    ],
-    'server_providers_custom_fields' => [
-        \App\Enums\ServerProvider::AWS => ['key', 'secret'],
-        \App\Enums\ServerProvider::LINODE => ['token'],
-        \App\Enums\ServerProvider::DIGITALOCEAN => ['token'],
-        \App\Enums\ServerProvider::VULTR => ['token'],
-        \App\Enums\ServerProvider::HETZNER => ['token'],
-    ],
-
-    /*
-     * Service
-     */
-    'service_types' => [
-        'nginx' => 'webserver',
-        'caddy' => 'webserver',
-        'mysql' => 'database',
-        'mariadb' => 'database',
-        'postgresql' => 'database',
-        'redis' => 'memory_database',
-        'php' => 'php',
-        'nodejs' => 'nodejs',
-        'ufw' => 'firewall',
-        'supervisor' => 'process_manager',
-        'vito-agent' => 'monitoring',
-        'remote-monitor' => 'monitoring',
-    ],
-    'service_handlers' => [
-        'nginx' => \App\SSH\Services\Webserver\Nginx::class,
-        'caddy' => \App\SSH\Services\Webserver\Caddy::class,
-        'mysql' => \App\SSH\Services\Database\Mysql::class,
-        'mariadb' => \App\SSH\Services\Database\Mariadb::class,
-        'postgresql' => \App\SSH\Services\Database\Postgresql::class,
-        'redis' => \App\SSH\Services\Redis\Redis::class,
-        'php' => \App\SSH\Services\PHP\PHP::class,
-        'nodejs' => \App\SSH\Services\NodeJS\NodeJS::class,
-        'ufw' => \App\SSH\Services\Firewall\Ufw::class,
-        'supervisor' => \App\SSH\Services\ProcessManager\Supervisor::class,
-        'vito-agent' => \App\SSH\Services\Monitoring\VitoAgent\VitoAgent::class,
-        'remote-monitor' => \App\SSH\Services\Monitoring\RemoteMonitor\RemoteMonitor::class,
-    ],
-    'service_versions' => [
-        'nginx' => [
-            'latest',
-        ],
-        'caddy' => [
-            'latest',
-        ],
-        'mysql' => [
-            '5.7',
-            '8.0',
-            '8.4',
-        ],
-        'mariadb' => [
-            '10.3',
-            '10.4',
-            '10.6',
-            '10.11',
-            '11.4',
-        ],
-        'postgresql' => [
-            '12',
-            '13',
-            '14',
-            '15',
-            '16',
-        ],
-        'redis' => [
-            'latest',
-        ],
-        'nodejs' => [
-            '4',
-            '6',
-            '8',
-            '10',
-            '12',
-            '14',
-            '16',
-            '18',
-            '20',
-            '22',
-        ],
-        'php' => [
-            '5.6',
-            '7.0',
-            '7.1',
-            '7.2',
-            '7.3',
-            '7.4',
-            '8.0',
-            '8.1',
-            '8.2',
-            '8.3',
-            '8.4',
-        ],
-        'ufw' => [
-            'latest',
-        ],
-        'supervisor' => [
-            'latest',
-        ],
-        'vito-agent' => [
-            'latest',
-        ],
-        'remote-monitor' => [
-            'latest',
-        ],
-    ],
-    'service_units' => [
-        'nginx' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => [
-                'latest' => 'nginx',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU22 => [
-                'latest' => 'nginx',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU24 => [
-                'latest' => 'nginx',
-            ],
-        ],
-        'caddy' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => [
-                'latest' => 'caddy',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU22 => [
-                'latest' => 'caddy',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU24 => [
-                'latest' => 'caddy',
-            ],
-        ],
-        'mysql' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => [
-                '5.7' => 'mysql',
-                '8.0' => 'mysql',
-                '8.4' => 'mysql',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU22 => [
-                '5.7' => 'mysql',
-                '8.0' => 'mysql',
-                '8.4' => 'mysql',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU24 => [
-                '5.7' => 'mysql',
-                '8.0' => 'mysql',
-                '8.4' => 'mysql',
-            ],
-        ],
-        'mariadb' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => [
-                '10.3' => 'mariadb',
-                '10.4' => 'mariadb',
-                '10.6' => 'mariadb',
-                '10.11' => 'mariadb',
-                '11.4' => 'mariadb',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU22 => [
-                '10.3' => 'mariadb',
-                '10.4' => 'mariadb',
-                '10.6' => 'mariadb',
-                '10.11' => 'mariadb',
-                '11.4' => 'mariadb',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU24 => [
-                '10.3' => 'mariadb',
-                '10.4' => 'mariadb',
-                '10.6' => 'mariadb',
-                '10.11' => 'mariadb',
-                '11.4' => 'mariadb',
-            ],
-        ],
-        'postgresql' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => [
-                '12' => 'postgresql',
-                '13' => 'postgresql',
-                '14' => 'postgresql',
-                '15' => 'postgresql',
-                '16' => 'postgresql',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU22 => [
-                '12' => 'postgresql',
-                '13' => 'postgresql',
-                '14' => 'postgresql',
-                '15' => 'postgresql',
-                '16' => 'postgresql',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU24 => [
-                '12' => 'postgresql',
-                '13' => 'postgresql',
-                '14' => 'postgresql',
-                '15' => 'postgresql',
-                '16' => 'postgresql',
-            ],
-        ],
-        'php' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => [
-                '5.6' => 'php5.6-fpm',
-                '7.0' => 'php7.0-fpm',
-                '7.1' => 'php7.1-fpm',
-                '7.2' => 'php7.2-fpm',
-                '7.3' => 'php7.3-fpm',
-                '7.4' => 'php7.4-fpm',
-                '8.0' => 'php8.0-fpm',
-                '8.1' => 'php8.1-fpm',
-                '8.3' => 'php8.3-fpm',
-                '8.4' => 'php8.4-fpm',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU22 => [
-                '5.6' => 'php5.6-fpm',
-                '7.0' => 'php7.0-fpm',
-                '7.1' => 'php7.1-fpm',
-                '7.2' => 'php7.2-fpm',
-                '7.3' => 'php7.3-fpm',
-                '7.4' => 'php7.4-fpm',
-                '8.0' => 'php8.0-fpm',
-                '8.1' => 'php8.1-fpm',
-                '8.2' => 'php8.2-fpm',
-                '8.3' => 'php8.3-fpm',
-                '8.4' => 'php8.4-fpm',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU24 => [
-                '5.6' => 'php5.6-fpm',
-                '7.0' => 'php7.0-fpm',
-                '7.1' => 'php7.1-fpm',
-                '7.2' => 'php7.2-fpm',
-                '7.3' => 'php7.3-fpm',
-                '7.4' => 'php7.4-fpm',
-                '8.0' => 'php8.0-fpm',
-                '8.1' => 'php8.1-fpm',
-                '8.2' => 'php8.2-fpm',
-                '8.3' => 'php8.3-fpm',
-                '8.4' => 'php8.4-fpm',
-            ],
-        ],
-        'redis' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => [
-                'latest' => 'redis',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU22 => [
-                'latest' => 'redis',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU24 => [
-                'latest' => 'redis',
-            ],
-        ],
-        'supervisor' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => [
-                'latest' => 'supervisor',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU22 => [
-                'latest' => 'supervisor',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU24 => [
-                'latest' => 'supervisor',
-            ],
-        ],
-        'ufw' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => [
-                'latest' => 'ufw',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU22 => [
-                'latest' => 'ufw',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU24 => [
-                'latest' => 'ufw',
-            ],
-        ],
-        'vito-agent' => [
-            \App\Enums\OperatingSystem::UBUNTU20 => [
-                'latest' => 'vito-agent',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU22 => [
-                'latest' => 'vito-agent',
-            ],
-            \App\Enums\OperatingSystem::UBUNTU24 => [
-                'latest' => 'vito-agent',
-            ],
-        ],
-    ],
-
-    /*
-     * Site
-     */
-    'site_types' => [
-        \App\Enums\SiteType::PHP,
-        \App\Enums\SiteType::PHP_BLANK,
-        \App\Enums\SiteType::LARAVEL,
-        \App\Enums\SiteType::WORDPRESS,
-        \App\Enums\SiteType::PHPMYADMIN,
-        \App\Enums\SiteType::LOAD_BALANCER,
-    ],
-    'site_types_class' => [
-        \App\Enums\SiteType::PHP => \App\SiteTypes\PHPSite::class,
-        \App\Enums\SiteType::PHP_BLANK => \App\SiteTypes\PHPBlank::class,
-        \App\Enums\SiteType::LARAVEL => \App\SiteTypes\Laravel::class,
-        \App\Enums\SiteType::WORDPRESS => \App\SiteTypes\Wordpress::class,
-        \App\Enums\SiteType::PHPMYADMIN => \App\SiteTypes\PHPMyAdmin::class,
-        \App\Enums\SiteType::LOAD_BALANCER => \App\SiteTypes\LoadBalancer::class,
-    ],
-    'site_types_custom_fields' => [
-        \App\Enums\SiteType::PHP => \App\SiteTypes\PHPSite::make()->fields()->toArray(),
-        \App\Enums\SiteType::PHP_BLANK => \App\SiteTypes\PHPBlank::make()->fields()->toArray(),
-        \App\Enums\SiteType::LARAVEL => \App\SiteTypes\Laravel::make()->fields()->toArray(),
-        \App\Enums\SiteType::WORDPRESS => \App\SiteTypes\Wordpress::make()->fields()->toArray(),
-        \App\Enums\SiteType::PHPMYADMIN => \App\SiteTypes\PHPMyAdmin::make()->fields()->toArray(),
-        \App\Enums\SiteType::LOAD_BALANCER => \App\SiteTypes\LoadBalancer::make()->fields()->toArray(),
-    ],
-
-    /*
-     * Source Control
-     */
-    'source_control_providers' => [
-        'github',
-        'gitlab',
-        'bitbucket',
-    ],
-    'source_control_providers_class' => [
-        'github' => \App\SourceControlProviders\Github::class,
-        'gitlab' => \App\SourceControlProviders\Gitlab::class,
-        'bitbucket' => \App\SourceControlProviders\Bitbucket::class,
-    ],
-    'source_control_providers_custom_fields' => [
-        \App\Enums\SourceControl::GITHUB => ['token'],
-        \App\Enums\SourceControl::GITLAB => ['token', 'url'],
-        \App\Enums\SourceControl::BITBUCKET => ['username', 'password'],
-    ],
-
-    /*
-     * available php extensions
-     */
-    'php_extensions' => [
-        'imagick',
-        'exif',
-        'gmagick',
-        'gmp',
-        'intl',
-        'sqlite3',
-        'opcache',
-    ],
-
-    /*
-     * php settings
-     */
-    'php_settings' => [
-        'upload_max_filesize' => '2',
-        'memory_limit' => '128',
-        'max_execution_time' => '30',
-        'post_max_size' => '2',
-    ],
-    'php_settings_unit' => [
-        'upload_max_filesize' => 'M',
-        'memory_limit' => 'M',
-        'max_execution_time' => 'S',
-        'post_max_size' => 'M',
+        OperatingSystem::UBUNTU20 => '20.04',
+        OperatingSystem::UBUNTU22 => '22.04',
+        OperatingSystem::UBUNTU24 => '24.04',
     ],
 
     /*
@@ -530,68 +38,9 @@
         explode(',', (string) env('RESTRICTED_IP_ADDRESSES', ''))
     ),
 
-    /*
-     * Notification channels
-     */
-    'notification_channels_providers' => [
-        \App\Enums\NotificationChannel::SLACK,
-        \App\Enums\NotificationChannel::DISCORD,
-        \App\Enums\NotificationChannel::EMAIL,
-        \App\Enums\NotificationChannel::TELEGRAM,
-    ],
-    'notification_channels_providers_class' => [
-        \App\Enums\NotificationChannel::SLACK => \App\NotificationChannels\Slack::class,
-        \App\Enums\NotificationChannel::DISCORD => \App\NotificationChannels\Discord::class,
-        \App\Enums\NotificationChannel::EMAIL => \App\NotificationChannels\Email::class,
-        \App\Enums\NotificationChannel::TELEGRAM => \App\NotificationChannels\Telegram::class,
-    ],
-    'notification_channels_providers_custom_fields' => [
-        \App\Enums\NotificationChannel::SLACK => ['webhook_url'],
-        \App\Enums\NotificationChannel::DISCORD => ['webhook_url'],
-        \App\Enums\NotificationChannel::EMAIL => ['email'],
-        \App\Enums\NotificationChannel::TELEGRAM => ['bot_token', 'chat_id'],
-    ],
-
-    /*
-     * storage providers
-     */
-    'storage_providers' => [
-        \App\Enums\StorageProvider::DROPBOX,
-        \App\Enums\StorageProvider::FTP,
-        \App\Enums\StorageProvider::LOCAL,
-        \App\Enums\StorageProvider::S3,
-    ],
-    'storage_providers_class' => [
-        \App\Enums\StorageProvider::DROPBOX => \App\StorageProviders\Dropbox::class,
-        \App\Enums\StorageProvider::FTP => \App\StorageProviders\FTP::class,
-        \App\Enums\StorageProvider::LOCAL => \App\StorageProviders\Local::class,
-        \App\Enums\StorageProvider::S3 => \App\StorageProviders\S3::class,
-    ],
-    'storage_providers_custom_fields' => [
-        \App\Enums\StorageProvider::DROPBOX => ['token'],
-        \App\Enums\StorageProvider::FTP => [
-            'host',
-            'port',
-            'path',
-            'username',
-            'password',
-            'ssl',
-            'passive',
-        ],
-        \App\Enums\StorageProvider::S3 => [
-            'api_url',
-            'key',
-            'secret',
-            'region',
-            'bucket',
-            'path',
-        ],
-        \App\Enums\StorageProvider::LOCAL => ['path'],
-    ],
-
     'ssl_types' => [
-        \App\Enums\SslType::LETSENCRYPT,
-        \App\Enums\SslType::CUSTOM,
+        SslType::LETSENCRYPT,
+        SslType::CUSTOM,
     ],
 
     'metrics_data_retention' => [
@@ -602,13 +51,13 @@
     ],
 
     'taggable_types' => [
-        \App\Models\Server::class,
-        \App\Models\Site::class,
+        Server::class,
+        Site::class,
     ],
 
     'user_roles' => [
-        \App\Enums\UserRole::USER,
-        \App\Enums\UserRole::ADMIN,
+        UserRole::USER,
+        UserRole::ADMIN,
     ],
 
     'cronjob_intervals' => [
diff --git a/config/notification-channel.php b/config/notification-channel.php
new file mode 100644
index 00000000..becd8923
--- /dev/null
+++ b/config/notification-channel.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'providers' => [
+        // this will be automatically registered by the StorageServiceProvider
+    ],
+];
diff --git a/config/route-attributes.php b/config/route-attributes.php
index 3356c39b..69f22c0b 100644
--- a/config/route-attributes.php
+++ b/config/route-attributes.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Routing\Middleware\SubstituteBindings;
+
 return [
     /*
      *  Automatic registration of routes will only happen if this setting is `true`
@@ -31,7 +33,7 @@
      * This middleware will be applied to all routes.
      */
     'middleware' => [
-        \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        SubstituteBindings::class,
     ],
 
     /*
diff --git a/config/server-provider.php b/config/server-provider.php
new file mode 100644
index 00000000..ab0afb61
--- /dev/null
+++ b/config/server-provider.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'providers' => [
+        // this will be automatically registered by the ServerServiceProvider
+    ],
+];
diff --git a/config/service.php b/config/service.php
new file mode 100644
index 00000000..d3378ee6
--- /dev/null
+++ b/config/service.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'services' => [
+        // this will be automatically registered by the ServiceTypeServiceProvider
+    ],
+];
diff --git a/config/site.php b/config/site.php
new file mode 100644
index 00000000..5cc30d9f
--- /dev/null
+++ b/config/site.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'types' => [
+        // this will be automatically registered by the SiteTypeServiceProvider
+    ],
+];
diff --git a/config/source-control.php b/config/source-control.php
new file mode 100644
index 00000000..becd8923
--- /dev/null
+++ b/config/source-control.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'providers' => [
+        // this will be automatically registered by the StorageServiceProvider
+    ],
+];
diff --git a/config/storage-provider.php b/config/storage-provider.php
new file mode 100644
index 00000000..becd8923
--- /dev/null
+++ b/config/storage-provider.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'providers' => [
+        // this will be automatically registered by the StorageServiceProvider
+    ],
+];
diff --git a/config/web.php b/config/web.php
index b4460b36..201890e7 100644
--- a/config/web.php
+++ b/config/web.php
@@ -1,9 +1,11 @@
 <?php
 
+use App\Http\Controllers\ServerController;
+
 return [
     'pagination_size' => 10,
 
     'controllers' => [
-        'servers' => \App\Http\Controllers\ServerController::class,
+        'servers' => ServerController::class,
     ],
 ];
diff --git a/database/factories/BackupFactory.php b/database/factories/BackupFactory.php
index 3d92feec..c3b4c839 100644
--- a/database/factories/BackupFactory.php
+++ b/database/factories/BackupFactory.php
@@ -3,10 +3,11 @@
 namespace Database\Factories;
 
 use App\Enums\BackupStatus;
+use App\Models\Backup;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\Backup>
+ * @extends Factory<Backup>
  */
 class BackupFactory extends Factory
 {
diff --git a/database/factories/BackupFileFactory.php b/database/factories/BackupFileFactory.php
index 9521403a..68565637 100644
--- a/database/factories/BackupFileFactory.php
+++ b/database/factories/BackupFileFactory.php
@@ -2,10 +2,11 @@
 
 namespace Database\Factories;
 
+use App\Models\BackupFile;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\BackupFile>
+ * @extends Factory<BackupFile>
  */
 class BackupFileFactory extends Factory
 {
diff --git a/database/factories/CommandExecutionFactory.php b/database/factories/CommandExecutionFactory.php
index eb93d4d4..edca3697 100644
--- a/database/factories/CommandExecutionFactory.php
+++ b/database/factories/CommandExecutionFactory.php
@@ -8,7 +8,7 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\CommandExecution>
+ * @extends Factory<CommandExecution>
  */
 class CommandExecutionFactory extends Factory
 {
diff --git a/database/factories/CommandFactory.php b/database/factories/CommandFactory.php
index 70099a7e..dbee0a5a 100644
--- a/database/factories/CommandFactory.php
+++ b/database/factories/CommandFactory.php
@@ -8,7 +8,7 @@
 use Illuminate\Support\Carbon;
 
 /**
- * @extends Factory<\App\Models\Command>
+ * @extends Factory<Command>
  */
 class CommandFactory extends Factory
 {
diff --git a/database/factories/CronJobFactory.php b/database/factories/CronJobFactory.php
index c4693c23..f2421f23 100644
--- a/database/factories/CronJobFactory.php
+++ b/database/factories/CronJobFactory.php
@@ -7,7 +7,7 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\CronJob>
+ * @extends Factory<CronJob>
  */
 class CronJobFactory extends Factory
 {
diff --git a/database/factories/DatabaseFactory.php b/database/factories/DatabaseFactory.php
index 491e0e17..fb66e509 100755
--- a/database/factories/DatabaseFactory.php
+++ b/database/factories/DatabaseFactory.php
@@ -7,7 +7,7 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\Database>
+ * @extends Factory<Database>
  */
 class DatabaseFactory extends Factory
 {
diff --git a/database/factories/DatabaseUserFactory.php b/database/factories/DatabaseUserFactory.php
index d2f54384..65443d80 100755
--- a/database/factories/DatabaseUserFactory.php
+++ b/database/factories/DatabaseUserFactory.php
@@ -6,7 +6,7 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\DatabaseUser>
+ * @extends Factory<DatabaseUser>
  */
 class DatabaseUserFactory extends Factory
 {
diff --git a/database/factories/DeploymentFactory.php b/database/factories/DeploymentFactory.php
index b2198b95..e006bdaa 100755
--- a/database/factories/DeploymentFactory.php
+++ b/database/factories/DeploymentFactory.php
@@ -6,7 +6,7 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\Deployment>
+ * @extends Factory<Deployment>
  */
 class DeploymentFactory extends Factory
 {
diff --git a/database/factories/DeploymentScriptFactory.php b/database/factories/DeploymentScriptFactory.php
index da711fdf..2a4a866c 100644
--- a/database/factories/DeploymentScriptFactory.php
+++ b/database/factories/DeploymentScriptFactory.php
@@ -8,7 +8,7 @@
 use Illuminate\Support\Carbon;
 
 /**
- * @extends Factory<\App\Models\DeploymentScript>
+ * @extends Factory<DeploymentScript>
  */
 class DeploymentScriptFactory extends Factory
 {
diff --git a/database/factories/FileFactory.php b/database/factories/FileFactory.php
index b0f57f18..fce3df7d 100644
--- a/database/factories/FileFactory.php
+++ b/database/factories/FileFactory.php
@@ -7,7 +7,7 @@
 use Illuminate\Support\Carbon;
 
 /**
- * @extends Factory<\App\Models\File>
+ * @extends Factory<File>
  */
 class FileFactory extends Factory
 {
diff --git a/database/factories/FirewallRuleFactory.php b/database/factories/FirewallRuleFactory.php
index 917a7a62..9f9d1083 100644
--- a/database/factories/FirewallRuleFactory.php
+++ b/database/factories/FirewallRuleFactory.php
@@ -6,7 +6,7 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\FirewallRule>
+ * @extends Factory<FirewallRule>
  */
 class FirewallRuleFactory extends Factory
 {
diff --git a/database/factories/GitHookFactory.php b/database/factories/GitHookFactory.php
index 5d8e81da..1a5b91cc 100644
--- a/database/factories/GitHookFactory.php
+++ b/database/factories/GitHookFactory.php
@@ -9,7 +9,7 @@
 use Illuminate\Support\Carbon;
 
 /**
- * @extends Factory<\App\Models\GitHook>
+ * @extends Factory<GitHook>
  */
 class GitHookFactory extends Factory
 {
diff --git a/database/factories/LoadBalancerServerFactory.php b/database/factories/LoadBalancerServerFactory.php
index 83e025e9..d9aad9db 100644
--- a/database/factories/LoadBalancerServerFactory.php
+++ b/database/factories/LoadBalancerServerFactory.php
@@ -7,7 +7,7 @@
 use Illuminate\Support\Carbon;
 
 /**
- * @extends Factory<\App\Models\LoadBalancerServer>
+ * @extends Factory<LoadBalancerServer>
  */
 class LoadBalancerServerFactory extends Factory
 {
diff --git a/database/factories/MetricFactory.php b/database/factories/MetricFactory.php
index a6640072..9e6c5620 100644
--- a/database/factories/MetricFactory.php
+++ b/database/factories/MetricFactory.php
@@ -2,10 +2,11 @@
 
 namespace Database\Factories;
 
+use App\Models\Metric;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\Metric>
+ * @extends Factory<Metric>
  */
 class MetricFactory extends Factory
 {
diff --git a/database/factories/NotificationChannelFactory.php b/database/factories/NotificationChannelFactory.php
index dc09a3ad..3e10abcc 100644
--- a/database/factories/NotificationChannelFactory.php
+++ b/database/factories/NotificationChannelFactory.php
@@ -2,10 +2,11 @@
 
 namespace Database\Factories;
 
+use App\Models\NotificationChannel;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\NotificationChannel>
+ * @extends Factory<NotificationChannel>
  */
 class NotificationChannelFactory extends Factory
 {
diff --git a/database/factories/ProjectFactory.php b/database/factories/ProjectFactory.php
index db6b1cde..239a96a0 100644
--- a/database/factories/ProjectFactory.php
+++ b/database/factories/ProjectFactory.php
@@ -7,7 +7,7 @@
 use Illuminate\Support\Carbon;
 
 /**
- * @extends Factory<\App\Models\Project>
+ * @extends Factory<Project>
  */
 class ProjectFactory extends Factory
 {
diff --git a/database/factories/ScriptExecutionFactory.php b/database/factories/ScriptExecutionFactory.php
index 3c9ac54a..a33a8d8e 100644
--- a/database/factories/ScriptExecutionFactory.php
+++ b/database/factories/ScriptExecutionFactory.php
@@ -8,7 +8,7 @@
 use Illuminate\Support\Carbon;
 
 /**
- * @extends Factory<\App\Models\ScriptExecution>
+ * @extends Factory<ScriptExecution>
  */
 class ScriptExecutionFactory extends Factory
 {
diff --git a/database/factories/ScriptFactory.php b/database/factories/ScriptFactory.php
index 239cff93..3609a56f 100644
--- a/database/factories/ScriptFactory.php
+++ b/database/factories/ScriptFactory.php
@@ -7,7 +7,7 @@
 use Illuminate\Support\Carbon;
 
 /**
- * @extends Factory<\App\Models\Script>
+ * @extends Factory<Script>
  */
 class ScriptFactory extends Factory
 {
diff --git a/database/factories/ServerFactory.php b/database/factories/ServerFactory.php
index 06d2a48c..f9d1030a 100755
--- a/database/factories/ServerFactory.php
+++ b/database/factories/ServerFactory.php
@@ -3,14 +3,13 @@
 namespace Database\Factories;
 
 use App\Enums\OperatingSystem;
-use App\Enums\ServerProvider;
 use App\Enums\ServerStatus;
-use App\Enums\ServerType;
 use App\Models\Server;
+use App\ServerProviders\Custom;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\Server>
+ * @extends Factory<Server>
  */
 class ServerFactory extends Factory
 {
@@ -27,8 +26,7 @@ public function definition(): array
             'local_ip' => $this->faker->ipv4(),
             'port' => 22,
             'os' => OperatingSystem::UBUNTU22,
-            'type' => ServerType::REGULAR,
-            'provider' => ServerProvider::CUSTOM,
+            'provider' => Custom::id(),
             'authentication' => [
                 'user' => 'vito',
                 'pass' => 'password',
diff --git a/database/factories/ServerLogFactory.php b/database/factories/ServerLogFactory.php
index 412c6274..e07aa3d0 100644
--- a/database/factories/ServerLogFactory.php
+++ b/database/factories/ServerLogFactory.php
@@ -6,7 +6,7 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\ServerLog>
+ * @extends Factory<ServerLog>
  */
 class ServerLogFactory extends Factory
 {
diff --git a/database/factories/ServerProviderFactory.php b/database/factories/ServerProviderFactory.php
index 8dcbf296..3fe59e05 100644
--- a/database/factories/ServerProviderFactory.php
+++ b/database/factories/ServerProviderFactory.php
@@ -7,7 +7,7 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\ServerProvider>
+ * @extends Factory<ServerProvider>
  */
 class ServerProviderFactory extends Factory
 {
@@ -17,7 +17,7 @@ public function definition(): array
     {
         return [
             'profile' => $this->faker->word(),
-            'provider' => $this->faker->randomElement(config('core.server_providers')),
+            'provider' => $this->faker->randomElement(array_keys(config('server-provider.providers'))),
             'credentials' => [],
             'connected' => 1,
             'user_id' => User::factory(),
diff --git a/database/factories/ServiceFactory.php b/database/factories/ServiceFactory.php
index 9a922e7d..0c9cf108 100644
--- a/database/factories/ServiceFactory.php
+++ b/database/factories/ServiceFactory.php
@@ -7,7 +7,7 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\Service>
+ * @extends Factory<Service>
  */
 class ServiceFactory extends Factory
 {
diff --git a/database/factories/SiteFactory.php b/database/factories/SiteFactory.php
index dd9e9c57..12b3a630 100644
--- a/database/factories/SiteFactory.php
+++ b/database/factories/SiteFactory.php
@@ -2,12 +2,12 @@
 
 namespace Database\Factories;
 
-use App\Enums\SiteType;
 use App\Models\Site;
+use App\SiteTypes\Laravel;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\Site>
+ * @extends Factory<Site>
  */
 class SiteFactory extends Factory
 {
@@ -17,7 +17,7 @@ public function definition(): array
     {
         return [
             'server_id' => 1,
-            'type' => SiteType::LARAVEL,
+            'type' => Laravel::id(),
             'domain' => 'test.com',
             'web_directory' => '/',
             'path' => '/home',
diff --git a/database/factories/SourceControlFactory.php b/database/factories/SourceControlFactory.php
index 942e9c4c..f4a6f172 100644
--- a/database/factories/SourceControlFactory.php
+++ b/database/factories/SourceControlFactory.php
@@ -3,11 +3,14 @@
 namespace Database\Factories;
 
 use App\Models\SourceControl;
+use App\SourceControlProviders\Bitbucket;
+use App\SourceControlProviders\Github;
+use App\SourceControlProviders\Gitlab;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Str;
 
 /**
- * @extends Factory<\App\Models\SourceControl>
+ * @extends Factory<SourceControl>
  */
 class SourceControlFactory extends Factory
 {
@@ -17,39 +20,39 @@ public function definition(): array
     {
         return [
             'access_token' => Str::random(10),
-            'provider' => \App\Enums\SourceControl::GITHUB,
+            'provider' => Github::id(),
             'profile' => $this->faker->name,
             'project_id' => null,
         ];
     }
 
     /**
-     * @return Factory<\App\Models\SourceControl>
+     * @return Factory<SourceControl>
      */
     public function gitlab(): Factory
     {
         return $this->state(fn (array $attributes): array => [
-            'provider' => \App\Enums\SourceControl::GITLAB,
+            'provider' => Gitlab::id(),
         ]);
     }
 
     /**
-     * @return Factory<\App\Models\SourceControl>
+     * @return Factory<SourceControl>
      */
     public function github(): Factory
     {
         return $this->state(fn (array $attributes): array => [
-            'provider' => \App\Enums\SourceControl::GITHUB,
+            'provider' => Github::id(),
         ]);
     }
 
     /**
-     * @return Factory<\App\Models\SourceControl>
+     * @return Factory<SourceControl>
      */
     public function bitbucket(): Factory
     {
         return $this->state(fn (array $attributes): array => [
-            'provider' => \App\Enums\SourceControl::BITBUCKET,
+            'provider' => Bitbucket::id(),
         ]);
     }
 }
diff --git a/database/factories/SshKeyFactory.php b/database/factories/SshKeyFactory.php
index c3af514f..e6b3c76b 100644
--- a/database/factories/SshKeyFactory.php
+++ b/database/factories/SshKeyFactory.php
@@ -6,7 +6,7 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\SshKey>
+ * @extends Factory<SshKey>
  */
 class SshKeyFactory extends Factory
 {
diff --git a/database/factories/SslFactory.php b/database/factories/SslFactory.php
index b30bc2e1..ae66c892 100644
--- a/database/factories/SslFactory.php
+++ b/database/factories/SslFactory.php
@@ -8,7 +8,7 @@
 use Illuminate\Support\Carbon;
 
 /**
- * @extends Factory<\App\Models\Ssl>
+ * @extends Factory<Ssl>
  */
 class SslFactory extends Factory
 {
diff --git a/database/factories/StorageProviderFactory.php b/database/factories/StorageProviderFactory.php
index 1a9b9170..b9b1980b 100644
--- a/database/factories/StorageProviderFactory.php
+++ b/database/factories/StorageProviderFactory.php
@@ -2,11 +2,12 @@
 
 namespace Database\Factories;
 
+use App\Models\StorageProvider;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<\App\Models\StorageProvider>
+ * @extends Factory<StorageProvider>
  */
 class StorageProviderFactory extends Factory
 {
@@ -14,7 +15,7 @@ public function definition(): array
     {
         return [
             'profile' => $this->faker->word(),
-            'provider' => $this->faker->randomElement(config('core.storage_providers')),
+            'provider' => $this->faker->randomElement(array_keys(config('storage-provider.providers'))),
             'credentials' => [
                 'token' => 'test-token',
             ],
diff --git a/database/factories/TagFactory.php b/database/factories/TagFactory.php
index df2476ba..0cc2c518 100644
--- a/database/factories/TagFactory.php
+++ b/database/factories/TagFactory.php
@@ -7,7 +7,7 @@
 use Illuminate\Support\Carbon;
 
 /**
- * @extends Factory<\App\Models\Tag>
+ * @extends Factory<Tag>
  */
 class TagFactory extends Factory
 {
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index e33b62cd..a9acaaa3 100755
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -8,7 +8,7 @@
 use Illuminate\Support\Str;
 
 /**
- * @extends Factory<\App\Models\User>
+ * @extends Factory<User>
  */
 class UserFactory extends Factory
 {
diff --git a/database/factories/WorkerFactory.php b/database/factories/WorkerFactory.php
index e4485cde..404c404f 100644
--- a/database/factories/WorkerFactory.php
+++ b/database/factories/WorkerFactory.php
@@ -16,6 +16,7 @@ class WorkerFactory extends Factory
     public function definition(): array
     {
         return [
+            'name' => $this->faker->name,
             'command' => 'php artisan queue:work',
             'user' => 'vito',
             'auto_start' => 1,
diff --git a/database/migrations/2024_12_22_134221_deprecate_wasabi_storage_provider.php b/database/migrations/2024_12_22_134221_deprecate_wasabi_storage_provider.php
index f296af41..2d987778 100644
--- a/database/migrations/2024_12_22_134221_deprecate_wasabi_storage_provider.php
+++ b/database/migrations/2024_12_22_134221_deprecate_wasabi_storage_provider.php
@@ -1,19 +1,20 @@
 <?php
 
-use App\Enums\StorageProvider;
+use App\Models\StorageProvider;
+use App\StorageProviders\S3;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
 {
     public function up(): void
     {
-        $wasabiProviders = \App\Models\StorageProvider::query()
+        $wasabiProviders = StorageProvider::query()
             ->where('provider', 'wasabi')
             ->get();
 
-        /** @var \App\Models\StorageProvider $provider */
+        /** @var StorageProvider $provider */
         foreach ($wasabiProviders as $provider) {
-            $provider->provider = StorageProvider::S3;
+            $provider->provider = S3::id();
             $credentials = $provider->credentials;
             $credentials['api_url'] = "https://{$credentials['bucket']}.s3.{$credentials['region']}.wasabisys.com";
             $provider->credentials = $credentials;
diff --git a/database/migrations/2025_06_13_162729_update_servers_table.php b/database/migrations/2025_06_13_162729_update_servers_table.php
new file mode 100644
index 00000000..20c8250a
--- /dev/null
+++ b/database/migrations/2025_06_13_162729_update_servers_table.php
@@ -0,0 +1,23 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropColumn('type');
+            $table->dropColumn('type_data');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            //
+        });
+    }
+};
diff --git a/database/migrations/2025_06_14_111059_add_name_to_workers_table.php b/database/migrations/2025_06_14_111059_add_name_to_workers_table.php
new file mode 100644
index 00000000..197e84f4
--- /dev/null
+++ b/database/migrations/2025_06_14_111059_add_name_to_workers_table.php
@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('workers', function (Blueprint $table) {
+            $table->string('name')->nullable()->index();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('workers', function (Blueprint $table) {
+            $table->dropColumn('name');
+        });
+    }
+};
diff --git a/database/seeders/NotificationChannelsSeeder.php b/database/seeders/NotificationChannelsSeeder.php
index 066a4632..594972d6 100644
--- a/database/seeders/NotificationChannelsSeeder.php
+++ b/database/seeders/NotificationChannelsSeeder.php
@@ -3,6 +3,10 @@
 namespace Database\Seeders;
 
 use App\Models\NotificationChannel;
+use App\NotificationChannels\Discord;
+use App\NotificationChannels\Email;
+use App\NotificationChannels\Slack;
+use App\NotificationChannels\Telegram;
 use Illuminate\Database\Seeder;
 
 class NotificationChannelsSeeder extends Seeder
@@ -11,7 +15,7 @@ public function run(): void
     {
         NotificationChannel::factory()->create([
             'label' => 'Slack',
-            'provider' => \App\Enums\NotificationChannel::SLACK,
+            'provider' => Slack::id(),
             'data' => [
                 'webhook' => 'slack_webhook',
             ],
@@ -20,7 +24,7 @@ public function run(): void
 
         NotificationChannel::factory()->create([
             'label' => 'Discord',
-            'provider' => \App\Enums\NotificationChannel::DISCORD,
+            'provider' => Discord::id(),
             'data' => [
                 'webhook' => 'discord_webhook',
             ],
@@ -29,7 +33,7 @@ public function run(): void
 
         NotificationChannel::factory()->create([
             'label' => 'Telegram',
-            'provider' => \App\Enums\NotificationChannel::TELEGRAM,
+            'provider' => Telegram::id(),
             'data' => [
                 'token' => 'telegram_token',
                 'chat_id' => 'telegram_chat_id',
@@ -39,7 +43,7 @@ public function run(): void
 
         NotificationChannel::factory()->create([
             'label' => 'Email',
-            'provider' => \App\Enums\NotificationChannel::EMAIL,
+            'provider' => Email::id(),
             'data' => [
                 'email' => 'email@vitodeploy.com',
             ],
diff --git a/database/seeders/ServersSeeder.php b/database/seeders/ServersSeeder.php
index 71e5b202..37a8b713 100644
--- a/database/seeders/ServersSeeder.php
+++ b/database/seeders/ServersSeeder.php
@@ -71,8 +71,8 @@ private function database(Server $server): void
         Service::query()->create([
             'server_id' => $server->id,
             'type' => 'database',
-            'name' => config('core.databases_name.mysql80'),
-            'version' => config('core.databases_version.mysql80'),
+            'name' => 'mysql',
+            'version' => '8.4',
             'status' => ServiceStatus::READY,
         ]);
     }
diff --git a/database/seeders/SitesSeeder.php b/database/seeders/SitesSeeder.php
index b080e687..d394ab77 100644
--- a/database/seeders/SitesSeeder.php
+++ b/database/seeders/SitesSeeder.php
@@ -2,7 +2,6 @@
 
 namespace Database\Seeders;
 
-use App\Enums\SiteType;
 use App\Enums\SslStatus;
 use App\Enums\SslType;
 use App\Enums\WorkerStatus;
@@ -11,6 +10,8 @@
 use App\Models\SourceControl;
 use App\Models\Ssl;
 use App\Models\Worker;
+use App\SiteTypes\Laravel;
+use App\SiteTypes\Wordpress;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Seeder;
 
@@ -31,7 +32,7 @@ public function run(): void
                 'server_id' => $server->id,
                 'domain' => $server->project->name.'.com',
                 'source_control_id' => $sourceControls->random()->id,
-                'type' => SiteType::LARAVEL,
+                'type' => Laravel::id(),
                 'path' => '/home/vito/'.$server->project->name.'.com',
                 'aliases' => ['www.'.$server->project->name.'.com'],
             ]);
@@ -52,7 +53,7 @@ public function run(): void
             $blog = Site::factory()->create([
                 'server_id' => $server->id,
                 'domain' => 'blog.'.$server->project->name.'.com',
-                'type' => SiteType::WORDPRESS,
+                'type' => Wordpress::id(),
                 'path' => '/home/vito/blog.'.$server->project->name.'.com',
                 'aliases' => ['www.blog.'.$server->project->name.'.com'],
             ]);
diff --git a/database/seeders/SourceControlsSeeder.php b/database/seeders/SourceControlsSeeder.php
index f7062a33..f558eded 100644
--- a/database/seeders/SourceControlsSeeder.php
+++ b/database/seeders/SourceControlsSeeder.php
@@ -3,6 +3,9 @@
 namespace Database\Seeders;
 
 use App\Models\SourceControl;
+use App\SourceControlProviders\Bitbucket;
+use App\SourceControlProviders\Github;
+use App\SourceControlProviders\Gitlab;
 use Illuminate\Database\Seeder;
 
 class SourceControlsSeeder extends Seeder
@@ -11,7 +14,7 @@ public function run(): void
     {
         SourceControl::factory()->create([
             'profile' => 'GitHub',
-            'provider' => \App\Enums\SourceControl::GITHUB,
+            'provider' => Github::id(),
             'provider_data' => [
                 'token' => 'github_token',
             ],
@@ -19,7 +22,7 @@ public function run(): void
 
         SourceControl::factory()->create([
             'profile' => 'GitLab',
-            'provider' => \App\Enums\SourceControl::GITLAB,
+            'provider' => Gitlab::id(),
             'provider_data' => [
                 'token' => 'gitlab_token',
             ],
@@ -27,7 +30,7 @@ public function run(): void
 
         SourceControl::factory()->create([
             'profile' => 'Bitbucket',
-            'provider' => \App\Enums\SourceControl::BITBUCKET,
+            'provider' => Bitbucket::id(),
             'provider_data' => [
                 'username' => 'bitbucket_username',
                 'password' => 'bitbucket_password',
diff --git a/database/seeders/StorageProvidersSeeder.php b/database/seeders/StorageProvidersSeeder.php
index 288de8e8..074c23d7 100644
--- a/database/seeders/StorageProvidersSeeder.php
+++ b/database/seeders/StorageProvidersSeeder.php
@@ -3,6 +3,8 @@
 namespace Database\Seeders;
 
 use App\Models\StorageProvider;
+use App\StorageProviders\FTP;
+use App\StorageProviders\S3;
 use Illuminate\Database\Seeder;
 
 class StorageProvidersSeeder extends Seeder
@@ -11,7 +13,7 @@ public function run(): void
     {
         StorageProvider::factory()->create([
             'profile' => 'FTP',
-            'provider' => \App\Enums\StorageProvider::FTP,
+            'provider' => FTP::id(),
             'credentials' => [
                 'host' => 'ftp.example.com',
                 'username' => 'ftp_user',
@@ -21,7 +23,7 @@ public function run(): void
 
         StorageProvider::factory()->create([
             'profile' => 'S3',
-            'provider' => \App\Enums\StorageProvider::S3,
+            'provider' => S3::id(),
             'credentials' => [
                 'secret' => 's3_secret',
             ],
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 38395deb..90fe4817 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,6 +22,7 @@ RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - \
 
 # php
 COPY docker/php.ini /etc/php/8.4/cli/conf.d/99-vito.ini
+COPY docker/php.ini /etc/php/8.4/fpm/conf.d/99-vito.ini
 
 # composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
diff --git a/docker/nginx.conf b/docker/nginx.conf
index 5a20f7d9..6eea9eb0 100644
--- a/docker/nginx.conf
+++ b/docker/nginx.conf
@@ -20,6 +20,8 @@ server {
         fastcgi_pass unix:/var/run/php/php8.4-fpm.sock;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         include fastcgi_params;
+        fastcgi_buffers 16 16k;
+        fastcgi_buffer_size 32k;
     }
 
     location ~ /\.(?!well-known).* {
diff --git a/docker/php.ini b/docker/php.ini
index e51988e1..51c9de49 100644
--- a/docker/php.ini
+++ b/docker/php.ini
@@ -1,3 +1,4 @@
 [PHP]
-post_max_size = 100M
-upload_max_filesize = 100M
+post_max_size = 2G
+upload_max_filesize = 1G
+memory_limit = 2G
diff --git a/resources/js/components/server-switch.tsx b/resources/js/components/server-switch.tsx
index 3f105efc..3c3ee06a 100644
--- a/resources/js/components/server-switch.tsx
+++ b/resources/js/components/server-switch.tsx
@@ -54,8 +54,8 @@ export function ServerSwitch() {
           </Button>
         </DropdownMenuTrigger>
         <DropdownMenuContent className="w-56" align="start">
-          {page.props.projectServers.length > 0 ? (
-            page.props.projectServers.map((server) => (
+          {page.props.project_servers.length > 0 ? (
+            page.props.project_servers.map((server) => (
               <DropdownMenuCheckboxItem
                 key={`server-${server.id.toString()}`}
                 checked={selectedServer?.id === server.id}
diff --git a/resources/js/components/site-switch.tsx b/resources/js/components/site-switch.tsx
index 11056270..7c04bb1f 100644
--- a/resources/js/components/site-switch.tsx
+++ b/resources/js/components/site-switch.tsx
@@ -28,7 +28,7 @@ export function SiteSwitch() {
     siteHelper.storeSite(page.props.site);
   }
 
-  if (storedSite && page.props.serverSites && !page.props.serverSites.find((site) => site.id === storedSite.id)) {
+  if (storedSite && page.props.server_sites && !page.props.server_sites.find((site) => site.id === storedSite.id)) {
     siteHelper.storeSite();
   }
 
@@ -40,7 +40,7 @@ export function SiteSwitch() {
 
   return (
     page.props.server &&
-    page.props.serverSites && (
+    page.props.server_sites && (
       <div className="flex items-center">
         <DropdownMenu modal={false}>
           <DropdownMenuTrigger asChild>
@@ -67,8 +67,8 @@ export function SiteSwitch() {
             </Button>
           </DropdownMenuTrigger>
           <DropdownMenuContent className="w-56" align="start">
-            {page.props.serverSites.length > 0 ? (
-              page.props.serverSites.map((site) => (
+            {page.props.server_sites.length > 0 ? (
+              page.props.server_sites.map((site) => (
                 <DropdownMenuCheckboxItem
                   key={`site-${site.id.toString()}`}
                   checked={selectedSite?.id === site.id}
diff --git a/resources/js/components/ui/dialog.tsx b/resources/js/components/ui/dialog.tsx
index b2a5b668..f8da66c7 100644
--- a/resources/js/components/ui/dialog.tsx
+++ b/resources/js/components/ui/dialog.tsx
@@ -40,7 +40,7 @@ function DialogContent({ className, children, ...props }: React.ComponentProps<t
       <DialogPrimitive.Content
         data-slot="dialog-content"
         className={cn(
-          'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] overflow-x-hidden rounded-lg border shadow-lg duration-200 sm:max-w-lg',
+          'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid max-h-screen w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] overflow-x-hidden rounded-lg border shadow-lg duration-200 sm:max-w-lg',
           className,
         )}
         {...props}
diff --git a/resources/js/components/ui/dynamic-field.tsx b/resources/js/components/ui/dynamic-field.tsx
index 506874dc..3a164a2b 100644
--- a/resources/js/components/ui/dynamic-field.tsx
+++ b/resources/js/components/ui/dynamic-field.tsx
@@ -1,4 +1,4 @@
-import { InputHTMLAttributes } from 'react';
+import { InputHTMLAttributes, useEffect, useState } from 'react';
 import { Label } from '@/components/ui/label';
 import { Input } from '@/components/ui/input';
 import { Switch } from '@/components/ui/switch';
@@ -6,6 +6,7 @@ import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectVa
 import { DynamicFieldConfig } from '@/types/dynamic-field-config';
 import InputError from '@/components/ui/input-error';
 import { FormField } from '@/components/ui/form';
+import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
 
 interface DynamicFieldProps {
   value: string | number | boolean | string[] | undefined;
@@ -17,17 +18,41 @@ interface DynamicFieldProps {
 export default function DynamicField({ value, onChange, config, error }: DynamicFieldProps) {
   const defaultLabel = config.name.replaceAll('_', ' ');
   const label = config?.label || defaultLabel;
+  const [initialValue, setInitialValue] = useState(false);
 
   if (!value) {
     value = config?.default || '';
   }
 
+  useEffect(() => {
+    if (!initialValue) {
+      if (config.type === 'checkbox') {
+        onChange((value as boolean) || false);
+      } else {
+        onChange(value);
+      }
+      setInitialValue(true);
+    }
+  }, [initialValue, setInitialValue, onChange, value, config]);
+
+  // Handle alert
+  if (config?.type === 'alert') {
+    return (
+      <FormField>
+        <Alert>
+          <AlertTitle>{config.label}</AlertTitle>
+          <AlertDescription>{config.description}</AlertDescription>
+        </Alert>
+      </FormField>
+    );
+  }
+
   // Handle checkbox
   if (config?.type === 'checkbox') {
     return (
       <FormField>
         <div className="flex items-center space-x-2">
-          <Switch id={`switch-${config.name}`} checked={value as boolean} onCheckedChange={onChange} />
+          <Switch id={`switch-${config.name}`} defaultChecked={value as boolean} onCheckedChange={onChange} />
           <Label htmlFor={`switch-${config.name}`}>{label}</Label>
           {config.description && <p className="text-muted-foreground text-xs">{config.description}</p>}
           <InputError message={error} />
@@ -40,11 +65,11 @@ export default function DynamicField({ value, onChange, config, error }: Dynamic
   if (config?.type === 'select' && config.options) {
     return (
       <FormField>
-        <Label htmlFor={config.name} className="capitalize">
+        <Label htmlFor={`field-${config.name}`} className="capitalize">
           {label}
         </Label>
         <Select defaultValue={value as string} onValueChange={onChange}>
-          <SelectTrigger id={config.name}>
+          <SelectTrigger id={`field-${config.name}`}>
             <SelectValue placeholder={config.placeholder || `Select ${label}`} />
           </SelectTrigger>
           <SelectContent>
@@ -71,7 +96,7 @@ export default function DynamicField({ value, onChange, config, error }: Dynamic
 
   return (
     <FormField>
-      <Label htmlFor={config.name} className="capitalize">
+      <Label htmlFor={`field-${config.name}`} className="capitalize">
         {label}
       </Label>
       <Input
diff --git a/resources/js/layouts/app/layout.tsx b/resources/js/layouts/app/layout.tsx
index 632f9771..60905bc2 100644
--- a/resources/js/layouts/app/layout.tsx
+++ b/resources/js/layouts/app/layout.tsx
@@ -19,13 +19,6 @@ export default function Layout({
   secondNavTitle?: string;
 }>) {
   const page = usePage<SharedData>();
-  // const [sidebarOpen, setSidebarOpen] = useState(
-  //   (localStorage.getItem('sidebar') === 'true' || false) && !!(secondNavItems && secondNavItems.length > 0),
-  // );
-  // const sidebarOpenChange = (open: boolean) => {
-  //   setSidebarOpen(open);
-  //   localStorage.setItem('sidebar', String(open));
-  // };
 
   if (page.props.flash && page.props.flash.success) {
     toast(
diff --git a/resources/js/layouts/server/layout.tsx b/resources/js/layouts/server/layout.tsx
index 55d200bc..04aadfb4 100644
--- a/resources/js/layouts/server/layout.tsx
+++ b/resources/js/layouts/server/layout.tsx
@@ -1,5 +1,6 @@
 import { type NavItem } from '@/types';
 import {
+  BoxIcon,
   ChartLineIcon,
   ClockIcon,
   CloudIcon,
@@ -59,6 +60,7 @@ export default function ServerLayout({ children }: { children: ReactNode }) {
       href: route('databases', { server: page.props.server.id }),
       icon: DatabaseIcon,
       isDisabled: isMenuDisabled,
+      hidden: !page.props.server.services['database'],
       children: [
         {
           title: 'Databases',
@@ -98,6 +100,11 @@ export default function ServerLayout({ children }: { children: ReactNode }) {
               onlyActivePath: route('application', { server: page.props.server.id, site: site.id }),
               icon: RocketIcon,
             },
+            {
+              title: 'Features',
+              href: route('site-features', { server: page.props.server.id, site: site.id }),
+              icon: BoxIcon,
+            },
             {
               title: 'Commands',
               href: route('commands', { server: page.props.server.id, site: site.id }),
diff --git a/resources/js/pages/notification-channels/components/connect-notification-channel.tsx b/resources/js/pages/notification-channels/components/connect-notification-channel.tsx
index 3d396dcf..9df0ec22 100644
--- a/resources/js/pages/notification-channels/components/connect-notification-channel.tsx
+++ b/resources/js/pages/notification-channels/components/connect-notification-channel.tsx
@@ -19,6 +19,8 @@ import { Form, FormField, FormFields } from '@/components/ui/form';
 import { Input } from '@/components/ui/input';
 import { SharedData } from '@/types';
 import { Checkbox } from '@/components/ui/checkbox';
+import { DynamicFieldConfig } from '@/types/dynamic-field-config';
+import DynamicField from '@/components/ui/dynamic-field';
 
 type NotificationChannelForm = {
   provider: string;
@@ -27,12 +29,10 @@ type NotificationChannelForm = {
 };
 
 export default function ConnectNotificationChannel({
-  providers,
   defaultProvider,
   onProviderAdded,
   children,
 }: {
-  providers: string[];
   defaultProvider?: string;
   onProviderAdded?: () => void;
   children: ReactNode;
@@ -62,7 +62,7 @@ export default function ConnectNotificationChannel({
   return (
     <Dialog open={open} onOpenChange={setOpen}>
       <DialogTrigger asChild>{children}</DialogTrigger>
-      <DialogContent className="max-h-screen overflow-y-auto sm:max-w-2xl">
+      <DialogContent className="max-h-screen overflow-y-auto sm:max-w-lg">
         <DialogHeader>
           <DialogTitle>Connect to notification channel</DialogTitle>
           <DialogDescription className="sr-only">Connect to a new notification channel</DialogDescription>
@@ -83,9 +83,9 @@ export default function ConnectNotificationChannel({
                 </SelectTrigger>
                 <SelectContent>
                   <SelectGroup>
-                    {providers.map((provider) => (
-                      <SelectItem key={provider} value={provider}>
-                        {provider}
+                    {Object.entries(page.props.configs.notification_channel.providers).map(([key, provider]) => (
+                      <SelectItem key={key} value={key}>
+                        {provider.label}
                       </SelectItem>
                     ))}
                   </SelectGroup>
@@ -105,29 +105,18 @@ export default function ConnectNotificationChannel({
               />
               <InputError message={form.errors.name} />
             </FormField>
-            <div
-              className={
-                page.props.configs.notification_channels_providers_custom_fields[form.data.provider].length > 1
-                  ? 'grid grid-cols-2 items-start gap-6'
-                  : ''
-              }
-            >
-              {page.props.configs.notification_channels_providers_custom_fields[form.data.provider]?.map((item: string) => (
-                <FormField key={item}>
-                  <Label htmlFor={item} className="capitalize">
-                    {item.replaceAll('_', ' ')}
-                  </Label>
-                  <Input
-                    type="text"
-                    name={item}
-                    id={item}
-                    value={(form.data[item as keyof NotificationChannelForm] as string) ?? ''}
-                    onChange={(e) => form.setData(item as keyof NotificationChannelForm, e.target.value)}
-                  />
-                  <InputError message={form.errors[item as keyof NotificationChannelForm]} />
-                </FormField>
-              ))}
-            </div>
+            {page.props.configs.notification_channel.providers[form.data.provider]?.form?.map((field: DynamicFieldConfig) => (
+              <DynamicField
+                key={`field-${field.name}`}
+                /*@ts-expect-error dynamic types*/
+                value={form.data[field.name]}
+                /*@ts-expect-error dynamic types*/
+                onChange={(value) => form.setData(field.name, value)}
+                config={field}
+                /*@ts-expect-error dynamic types*/
+                error={form.errors[field.name]}
+              />
+            ))}
             <FormField>
               <div className="flex items-center space-x-3">
                 <Checkbox id="global" name="global" checked={form.data.global} onClick={() => form.setData('global', !form.data.global)} />
diff --git a/resources/js/pages/notification-channels/index.tsx b/resources/js/pages/notification-channels/index.tsx
index f44a8fca..e4c21b2a 100644
--- a/resources/js/pages/notification-channels/index.tsx
+++ b/resources/js/pages/notification-channels/index.tsx
@@ -24,7 +24,7 @@ export default function NotificationChannels() {
         <div className="flex items-start justify-between">
           <Heading title="Notification Channels" description="Here you can manage all of the notification channel connectinos" />
           <div className="flex items-center gap-2">
-            <ConnectNotificationChannel providers={page.props.configs.notification_channels_providers}>
+            <ConnectNotificationChannel>
               <Button>Connect</Button>
             </ConnectNotificationChannel>
           </div>
diff --git a/resources/js/pages/php/components/extensions.tsx b/resources/js/pages/php/components/extensions.tsx
index a00ece73..a4541f0a 100644
--- a/resources/js/pages/php/components/extensions.tsx
+++ b/resources/js/pages/php/components/extensions.tsx
@@ -30,6 +30,7 @@ export default function Extensions({ service }: { service: Service }) {
     extension: '',
     version: service.version,
   });
+  const [, php] = Object.entries(page.props.configs.service.services).filter(([key]) => key === 'php')[0] || null;
 
   const submit = (e: FormEvent) => {
     e.preventDefault();
@@ -40,6 +41,10 @@ export default function Extensions({ service }: { service: Service }) {
     });
   };
 
+  if (!php) {
+    return null;
+  }
+
   return (
     <Dialog open={open} onOpenChange={setOpen}>
       <DialogTrigger asChild>
@@ -60,7 +65,7 @@ export default function Extensions({ service }: { service: Service }) {
                 </SelectTrigger>
                 <SelectContent>
                   <SelectGroup>
-                    {page.props.configs.php_extensions.map((extension: string) => (
+                    {php.data?.extensions?.map((extension: string) => (
                       <SelectItem key={`extension-${extension}`} value={extension} disabled={service.type_data.extensions?.includes(extension)}>
                         {extension} {service.type_data.extensions?.includes(extension) && <span>(installed)</span>}
                       </SelectItem>
diff --git a/resources/js/pages/server-providers/components/connect-server-provider.tsx b/resources/js/pages/server-providers/components/connect-server-provider.tsx
index 1fb088b8..de4783bf 100644
--- a/resources/js/pages/server-providers/components/connect-server-provider.tsx
+++ b/resources/js/pages/server-providers/components/connect-server-provider.tsx
@@ -19,6 +19,8 @@ import { Form, FormField, FormFields } from '@/components/ui/form';
 import { Input } from '@/components/ui/input';
 import { SharedData } from '@/types';
 import { Checkbox } from '@/components/ui/checkbox';
+import { DynamicFieldConfig } from '@/types/dynamic-field-config';
+import DynamicField from '@/components/ui/dynamic-field';
 
 type ServerProviderForm = {
   provider: string;
@@ -81,11 +83,11 @@ export default function ConnectServerProvider({
                 </SelectTrigger>
                 <SelectContent>
                   <SelectGroup>
-                    {page.props.configs.server_providers.map(
-                      (provider) =>
-                        provider !== 'custom' && (
-                          <SelectItem key={provider} value={provider}>
-                            {provider}
+                    {Object.entries(page.props.configs.server_provider.providers).map(
+                      ([key, provider]) =>
+                        key !== 'custom' && (
+                          <SelectItem key={key} value={key}>
+                            {provider.label}
                           </SelectItem>
                         ),
                     )}
@@ -106,25 +108,18 @@ export default function ConnectServerProvider({
               />
               <InputError message={form.errors.name} />
             </FormField>
-            <div
-              className={page.props.configs.server_providers_custom_fields[form.data.provider].length > 1 ? 'grid grid-cols-2 items-start gap-6' : ''}
-            >
-              {page.props.configs.server_providers_custom_fields[form.data.provider]?.map((item: string) => (
-                <FormField key={item}>
-                  <Label htmlFor={item} className="capitalize">
-                    {item.replaceAll('_', ' ')}
-                  </Label>
-                  <Input
-                    type="text"
-                    name={item}
-                    id={item}
-                    value={(form.data[item as keyof ServerProviderForm] as string) ?? ''}
-                    onChange={(e) => form.setData(item as keyof ServerProviderForm, e.target.value)}
-                  />
-                  <InputError message={form.errors[item as keyof ServerProviderForm]} />
-                </FormField>
-              ))}
-            </div>
+            {page.props.configs.server_provider.providers[form.data.provider]?.form?.map((field: DynamicFieldConfig) => (
+              <DynamicField
+                key={`field-${field.name}`}
+                /*@ts-expect-error dynamic types*/
+                value={form.data[field.name]}
+                /*@ts-expect-error dynamic types*/
+                onChange={(value) => form.setData(field.name, value)}
+                config={field}
+                /*@ts-expect-error dynamic types*/
+                error={form.errors[field.name]}
+              />
+            ))}
             <FormField>
               <div className="flex items-center space-x-3">
                 <Checkbox id="global" name="global" checked={form.data.global} onClick={() => form.setData('global', !form.data.global)} />
diff --git a/resources/js/pages/servers/components/create-server.tsx b/resources/js/pages/servers/components/create-server.tsx
index ce35f210..447000cc 100644
--- a/resources/js/pages/servers/components/create-server.tsx
+++ b/resources/js/pages/servers/components/create-server.tsx
@@ -23,9 +23,6 @@ type CreateServerForm = {
   port: number;
   region: string;
   plan: string;
-  webserver: string;
-  database: string;
-  php: string;
 };
 
 export default function CreateServer({ children }: { children: React.ReactNode }) {
@@ -40,9 +37,6 @@ export default function CreateServer({ children }: { children: React.ReactNode }
     port: 22,
     region: '',
     plan: '',
-    webserver: 'nginx',
-    database: 'none',
-    php: 'none',
   });
 
   const submit: FormEventHandler = (e) => {
@@ -52,7 +46,7 @@ export default function CreateServer({ children }: { children: React.ReactNode }
 
   const [copySuccess, setCopySuccess] = useState(false);
   const copyToClipboard = () => {
-    navigator.clipboard.writeText(page.props.publicKeyText).then(() => {
+    navigator.clipboard.writeText(page.props.public_key_text).then(() => {
       setCopySuccess(true);
       setTimeout(() => {
         setCopySuccess(false);
@@ -119,9 +113,9 @@ export default function CreateServer({ children }: { children: React.ReactNode }
                 </SelectTrigger>
                 <SelectContent>
                   <SelectGroup>
-                    {page.props.configs.server_providers.map((provider) => (
-                      <SelectItem key={provider} value={provider}>
-                        {provider}
+                    {Object.entries(page.props.configs.server_provider.providers).map(([key, provider]) => (
+                      <SelectItem key={key} value={key}>
+                        {provider.label}
                       </SelectItem>
                     ))}
                   </SelectGroup>
@@ -218,10 +212,10 @@ export default function CreateServer({ children }: { children: React.ReactNode }
                     variant="outline"
                     id="public_key"
                     type="button"
-                    value={page.props.publicKeyText}
+                    value={page.props.public_key_text}
                     className="justify-between truncate font-normal"
                   >
-                    <span className="w-full max-w-2/3 overflow-x-hidden overflow-ellipsis">{page.props.publicKeyText}</span>
+                    <span className="w-full max-w-2/3 overflow-x-hidden overflow-ellipsis">{page.props.public_key_text}</span>
                     {copySuccess ? <ClipboardCheckIcon size={5} className="text-success!" /> : <ClipboardIcon size={5} />}
                   </Button>
                 </FormField>
@@ -275,63 +269,6 @@ export default function CreateServer({ children }: { children: React.ReactNode }
                 </FormField>
               </div>
             )}
-
-            <div className="grid grid-cols-3 items-start gap-6">
-              <FormField>
-                <Label htmlFor="webserver">Webserver</Label>
-                <Select value={form.data.webserver} onValueChange={(value) => form.setData('webserver', value)}>
-                  <SelectTrigger id="webserver">
-                    <SelectValue placeholder="Select webserver" />
-                  </SelectTrigger>
-                  <SelectContent>
-                    <SelectGroup>
-                      {page.props.configs.webservers.map((value) => (
-                        <SelectItem key={`webserver-${value}`} value={value}>
-                          {value}
-                        </SelectItem>
-                      ))}
-                    </SelectGroup>
-                  </SelectContent>
-                </Select>
-                <InputError message={form.errors.webserver} />
-              </FormField>
-              <FormField>
-                <Label htmlFor="database">Database</Label>
-                <Select value={form.data.database} onValueChange={(value) => form.setData('database', value)}>
-                  <SelectTrigger id="database">
-                    <SelectValue placeholder="Select database" />
-                  </SelectTrigger>
-                  <SelectContent>
-                    <SelectGroup>
-                      {page.props.configs.databases.map((value) => (
-                        <SelectItem key={`database-${value}`} value={value}>
-                          {value}
-                        </SelectItem>
-                      ))}
-                    </SelectGroup>
-                  </SelectContent>
-                </Select>
-                <InputError message={form.errors.database} />
-              </FormField>
-              <FormField>
-                <Label htmlFor="php">PHP</Label>
-                <Select value={form.data.php} onValueChange={(value) => form.setData('php', value)}>
-                  <SelectTrigger id="php">
-                    <SelectValue placeholder="Select PHP version" />
-                  </SelectTrigger>
-                  <SelectContent>
-                    <SelectGroup>
-                      {page.props.configs.php_versions.map((value) => (
-                        <SelectItem key={`php-${value}`} value={value}>
-                          {value}
-                        </SelectItem>
-                      ))}
-                    </SelectGroup>
-                  </SelectContent>
-                </Select>
-                <InputError message={form.errors.php} />
-              </FormField>
-            </div>
           </FormFields>
         </Form>
         <SheetFooter>
diff --git a/resources/js/pages/services/components/action.tsx b/resources/js/pages/services/components/action.tsx
index 06e5af09..3298f6a6 100644
--- a/resources/js/pages/services/components/action.tsx
+++ b/resources/js/pages/services/components/action.tsx
@@ -15,6 +15,7 @@ import { DropdownMenuItem } from '@/components/ui/dropdown-menu';
 import { Button } from '@/components/ui/button';
 import { LoaderCircleIcon } from 'lucide-react';
 import FormSuccessful from '@/components/form-successful';
+import InputError from '@/components/ui/input-error';
 
 export function Action({ type, service }: { type: 'start' | 'stop' | 'restart' | 'enable' | 'disable'; service: Service }) {
   const [open, setOpen] = useState(false);
@@ -41,7 +42,12 @@ export function Action({ type, service }: { type: 'start' | 'stop' | 'restart' |
           </DialogTitle>
           <DialogDescription className="sr-only">{type} service</DialogDescription>
         </DialogHeader>
-        <p className="p-4">Are you sure you want to {type} the service?</p>
+        <div className="space-y-2 p-4">
+          <p>Are you sure you want to {type} the service?</p>
+          {Object.entries(form.errors).map(([key, value]) => (
+            <InputError key={key} message={value} />
+          ))}
+        </div>
         <DialogFooter>
           <DialogClose asChild>
             <Button variant="outline">Cancel</Button>
diff --git a/resources/js/pages/services/components/install.tsx b/resources/js/pages/services/components/install.tsx
index e0cce077..9b9ef4a8 100644
--- a/resources/js/pages/services/components/install.tsx
+++ b/resources/js/pages/services/components/install.tsx
@@ -73,9 +73,9 @@ export default function InstallService({ name, children }: { name?: string; chil
                   </SelectTrigger>
                   <SelectContent>
                     <SelectGroup>
-                      {Object.entries(page.props.configs.service_types).map(([key]) => (
+                      {Object.entries(page.props.configs.service.services).map(([key, service]) => (
                         <SelectItem key={`service-${key}`} value={key}>
-                          {key}
+                          {service.label}
                         </SelectItem>
                       ))}
                     </SelectGroup>
@@ -95,7 +95,7 @@ export default function InstallService({ name, children }: { name?: string; chil
                 <SelectContent>
                   <SelectGroup>
                     {form.data.name &&
-                      page.props.configs.service_versions[form.data.name].map((version) => (
+                      page.props.configs.service.services[form.data.name].versions.map((version) => (
                         <SelectItem key={`version-${form.data.name}-${version}`} value={version}>
                           {version}
                         </SelectItem>
diff --git a/resources/js/pages/site-features/components/feature-action.tsx b/resources/js/pages/site-features/components/feature-action.tsx
new file mode 100644
index 00000000..89ce99e5
--- /dev/null
+++ b/resources/js/pages/site-features/components/feature-action.tsx
@@ -0,0 +1,94 @@
+import { Site, SiteFeatureAction } from '@/types/site';
+import React, { FormEvent, ReactNode, useState } from 'react';
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@/components/ui/dialog';
+import { Form, FormField, FormFields } from '@/components/ui/form';
+import { Button } from '@/components/ui/button';
+import { useForm } from '@inertiajs/react';
+import { DynamicFieldConfig } from '@/types/dynamic-field-config';
+import DynamicField from '@/components/ui/dynamic-field';
+import { LoaderCircleIcon } from 'lucide-react';
+
+export default function FeatureAction({
+  site,
+  featureId,
+  actionId,
+  action,
+  children,
+}: {
+  site: Site;
+  featureId: string;
+  actionId: string;
+  action: SiteFeatureAction;
+  children: ReactNode;
+}) {
+  const [open, setOpen] = useState(false);
+  const form = useForm();
+
+  const submit = (e: FormEvent) => {
+    e.preventDefault();
+    form.post(
+      route('site-features.action', {
+        server: site.server_id,
+        site: site.id,
+        feature: featureId,
+        action: actionId,
+      }),
+      {
+        onSuccess: () => {
+          setOpen(false);
+          form.reset();
+        },
+      },
+    );
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger asChild>{children}</DialogTrigger>
+      <DialogContent className="sm:max-w-xl">
+        <DialogHeader>
+          <DialogTitle>{action.label}</DialogTitle>
+          <DialogDescription className="sr-only">action {action.label}</DialogDescription>
+        </DialogHeader>
+        <Form id="action-form" onSubmit={submit} className="p-4">
+          <FormFields>
+            <FormField>
+              <p className="text-muted-foreground">
+                You're performing action <b className="text-foreground">[{action.label}]</b> on site{' '}
+                <b className="text-foreground">[{site.domain}]</b>
+              </p>
+            </FormField>
+            {action.form?.map((field: DynamicFieldConfig) => (
+              <DynamicField
+                key={`field-${field.name}`}
+                /*@ts-expect-error dynamic types*/
+                value={form.data[field.name]}
+                onChange={(value) => form.setData(field.name, value)}
+                config={field}
+                error={form.errors[field.name]}
+              />
+            ))}
+          </FormFields>
+        </Form>
+        <DialogFooter>
+          <DialogClose asChild>
+            <Button variant="outline">Cancel</Button>
+          </DialogClose>
+          <Button form="action-form" disabled={form.processing} onClick={submit}>
+            {form.processing && <LoaderCircleIcon className="animate-spin" />}
+            {action.label}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/resources/js/pages/site-features/index.tsx b/resources/js/pages/site-features/index.tsx
new file mode 100644
index 00000000..e026cffc
--- /dev/null
+++ b/resources/js/pages/site-features/index.tsx
@@ -0,0 +1,83 @@
+import { Head, usePage } from '@inertiajs/react';
+import { Server } from '@/types/server';
+import Container from '@/components/container';
+import HeaderContainer from '@/components/header-container';
+import Heading from '@/components/heading';
+import { Button } from '@/components/ui/button';
+import ServerLayout from '@/layouts/server/layout';
+import { BookOpenIcon, MoreVerticalIcon } from 'lucide-react';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import React from 'react';
+import { Site, SiteFeature } from '@/types/site';
+import { Separator } from '@/components/ui/separator';
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@/components/ui/dropdown-menu';
+import FeatureAction from '@/pages/site-features/components/feature-action';
+
+export default function SiteFeatures() {
+  const page = usePage<{
+    server: Server;
+    site: Site;
+    features: {
+      [key: string]: SiteFeature;
+    };
+  }>();
+
+  return (
+    <ServerLayout>
+      <Head title={`Features - ${page.props.site.domain}`} />
+
+      <Container className="max-w-5xl">
+        <HeaderContainer>
+          <Heading title="Features" description="Your site has some features enabled by Vito or other plugins" />
+          <div className="flex items-center gap-2">
+            <a href="https://vitodeploy.com/docs/sites/features" target="_blank">
+              <Button variant="outline">
+                <BookOpenIcon />
+                <span className="hidden lg:block">Docs</span>
+              </Button>
+            </a>
+          </div>
+        </HeaderContainer>
+
+        <Card>
+          <CardHeader className="flex-row items-center justify-between gap-2">
+            <div className="space-y-2">
+              <CardTitle>Site features</CardTitle>
+              <CardDescription>Here you can see the list of features and their actions</CardDescription>
+            </div>
+          </CardHeader>
+          <CardContent>
+            {Object.entries(page.props.features).map(([key, feature], index) => (
+              <div key={`feature-${key}`}>
+                <div className="flex items-center justify-between p-4">
+                  <div className="space-y-1">
+                    <p>{feature.label}</p>
+                    <p className="text-muted-foreground text-sm">{feature.description}</p>
+                  </div>
+                  <DropdownMenu modal={false}>
+                    <DropdownMenuTrigger asChild>
+                      <Button variant="outline">
+                        Actions
+                        <MoreVerticalIcon />
+                      </Button>
+                    </DropdownMenuTrigger>
+                    <DropdownMenuContent align="end">
+                      {Object.entries(feature.actions || {}).map(([actionKey, action]) => (
+                        <FeatureAction key={`action-${actionKey}`} site={page.props.site} featureId={key} actionId={actionKey} action={action}>
+                          <DropdownMenuItem onSelect={(e) => e.preventDefault()} disabled={!action.active}>
+                            {action.label}
+                          </DropdownMenuItem>
+                        </FeatureAction>
+                      ))}
+                    </DropdownMenuContent>
+                  </DropdownMenu>
+                </div>
+                {index < Object.keys(page.props.features).length - 1 && <Separator />}
+              </div>
+            ))}
+          </CardContent>
+        </Card>
+      </Container>
+    </ServerLayout>
+  );
+}
diff --git a/resources/js/pages/site-settings/components/vhost.tsx b/resources/js/pages/site-settings/components/vhost.tsx
index ebef2f3c..5adae532 100644
--- a/resources/js/pages/site-settings/components/vhost.tsx
+++ b/resources/js/pages/site-settings/components/vhost.tsx
@@ -25,7 +25,7 @@ export default function VHost({ site, children }: { site: Site; children: ReactN
 
   const submit = (e: FormEvent) => {
     e.preventDefault();
-    form.patch(route('site-settings.update-vhost', { server: site.server_id, site: site.id }), {
+    form.put(route('site-settings.update-vhost', { server: site.server_id, site: site.id }), {
       onSuccess: () => {
         setOpen(false);
       },
diff --git a/resources/js/pages/sites/components/create-site.tsx b/resources/js/pages/sites/components/create-site.tsx
index e84ab3fa..b40fad73 100644
--- a/resources/js/pages/sites/components/create-site.tsx
+++ b/resources/js/pages/sites/components/create-site.tsx
@@ -25,7 +25,6 @@ type CreateSiteForm = {
   php_version: string;
   source_control: string;
   user: string;
-  port: string;
 };
 
 export default function CreateSite({ server, children }: { server?: Server; children: ReactNode }) {
@@ -40,7 +39,6 @@ export default function CreateSite({ server, children }: { server?: Server; chil
     php_version: '',
     source_control: '',
     user: '',
-    port: '',
   });
 
   const submit: FormEventHandler = (e) => {
@@ -121,9 +119,9 @@ export default function CreateSite({ server, children }: { server?: Server; chil
                     </SelectTrigger>
                     <SelectContent>
                       <SelectGroup>
-                        {page.props.configs.site_types.map((type) => (
-                          <SelectItem key={`type-${type}`} value={type}>
-                            {type}
+                        {Object.entries(page.props.configs.site.types).map(([key, type]) => (
+                          <SelectItem key={`type-${key}`} value={key}>
+                            {type.label}
                           </SelectItem>
                         ))}
                       </SelectGroup>
@@ -156,16 +154,7 @@ export default function CreateSite({ server, children }: { server?: Server; chil
                   <InputError message={form.errors.aliases} />
                 </FormField>
 
-                <FormField>
-                  <Label htmlFor="port">Reverse proxy port</Label>
-                  <Input id="port" type="text" value={form.data.port} onChange={(e) => form.setData('port', e.target.value)} placeholder="3000" />
-                  <p className="text-muted-foreground text-xs">
-                    This port will be used for reverse proxying the site. It should be unique across all sites on the server.
-                  </p>
-                  <InputError message={form.errors.port} />
-                </FormField>
-
-                {page.props.configs.site_types_custom_fields[form.data.type].map((config) => getFormField(config))}
+                {page.props.configs.site.types[form.data.type].form?.map((config) => getFormField(config))}
 
                 <FormField>
                   <Label htmlFor="user">Isolated User (Optional)</Label>
diff --git a/resources/js/pages/source-controls/components/columns.tsx b/resources/js/pages/source-controls/components/columns.tsx
index 53050203..61e3fa3c 100644
--- a/resources/js/pages/source-controls/components/columns.tsx
+++ b/resources/js/pages/source-controls/components/columns.tsx
@@ -33,7 +33,11 @@ function Edit({ sourceControl }: { sourceControl: SourceControl }) {
 
   const submit = (e: FormEvent) => {
     e.preventDefault();
-    form.patch(route('source-controls.update', sourceControl.id));
+    form.patch(route('source-controls.update', sourceControl.id), {
+      onSuccess: () => {
+        setOpen(false);
+      },
+    });
   };
   return (
     <Dialog open={open} onOpenChange={setOpen}>
diff --git a/resources/js/pages/source-controls/components/connect-source-control.tsx b/resources/js/pages/source-controls/components/connect-source-control.tsx
index e1668d5d..164a0e2b 100644
--- a/resources/js/pages/source-controls/components/connect-source-control.tsx
+++ b/resources/js/pages/source-controls/components/connect-source-control.tsx
@@ -19,6 +19,8 @@ import { Form, FormField, FormFields } from '@/components/ui/form';
 import { Input } from '@/components/ui/input';
 import { SharedData } from '@/types';
 import { Checkbox } from '@/components/ui/checkbox';
+import { DynamicFieldConfig } from '@/types/dynamic-field-config';
+import DynamicField from '@/components/ui/dynamic-field';
 
 type SourceControlForm = {
   provider: string;
@@ -81,9 +83,9 @@ export default function ConnectSourceControl({
                 </SelectTrigger>
                 <SelectContent>
                   <SelectGroup>
-                    {page.props.configs.source_control_providers.map((provider) => (
-                      <SelectItem key={provider} value={provider}>
-                        {provider}
+                    {Object.entries(page.props.configs.source_control.providers).map(([key, provider]) => (
+                      <SelectItem key={key} value={key}>
+                        {provider.label}
                       </SelectItem>
                     ))}
                   </SelectGroup>
@@ -103,20 +105,17 @@ export default function ConnectSourceControl({
               />
               <InputError message={form.errors.name} />
             </FormField>
-            {page.props.configs.source_control_providers_custom_fields[form.data.provider]?.map((item: string) => (
-              <FormField key={item}>
-                <Label htmlFor={item} className="capitalize">
-                  {item}
-                </Label>
-                <Input
-                  type="text"
-                  name={item}
-                  id={item}
-                  value={(form.data[item as keyof SourceControlForm] as string) ?? ''}
-                  onChange={(e) => form.setData(item as keyof SourceControlForm, e.target.value)}
-                />
-                <InputError message={form.errors[item as keyof SourceControlForm]} />
-              </FormField>
+            {page.props.configs.source_control.providers[form.data.provider]?.form?.map((field: DynamicFieldConfig) => (
+              <DynamicField
+                key={`field-${field.name}`}
+                /*@ts-expect-error dynamic types*/
+                value={form.data[field.name]}
+                /*@ts-expect-error dynamic types*/
+                onChange={(value) => form.setData(field.name, value)}
+                config={field}
+                /*@ts-expect-error dynamic types*/
+                error={form.errors[field.name]}
+              />
             ))}
             <FormField>
               <div className="flex items-center space-x-3">
diff --git a/resources/js/pages/storage-providers/components/connect-storage-provider.tsx b/resources/js/pages/storage-providers/components/connect-storage-provider.tsx
index 73d7f068..ea5b4989 100644
--- a/resources/js/pages/storage-providers/components/connect-storage-provider.tsx
+++ b/resources/js/pages/storage-providers/components/connect-storage-provider.tsx
@@ -19,6 +19,8 @@ import { Form, FormField, FormFields } from '@/components/ui/form';
 import { Input } from '@/components/ui/input';
 import { SharedData } from '@/types';
 import { Checkbox } from '@/components/ui/checkbox';
+import { DynamicFieldConfig } from '@/types/dynamic-field-config';
+import DynamicField from '@/components/ui/dynamic-field';
 
 type StorageProviderForm = {
   provider: string;
@@ -40,7 +42,7 @@ export default function ConnectStorageProvider({
   const page = usePage<SharedData>();
 
   const form = useForm<Required<StorageProviderForm>>({
-    provider: defaultProvider || 's3',
+    provider: defaultProvider || 'local',
     name: '',
     global: false,
   });
@@ -60,7 +62,7 @@ export default function ConnectStorageProvider({
   return (
     <Dialog open={open} onOpenChange={setOpen}>
       <DialogTrigger asChild>{children}</DialogTrigger>
-      <DialogContent className="max-h-screen overflow-y-auto sm:max-w-2xl">
+      <DialogContent className="max-h-screen overflow-y-auto sm:max-w-lg">
         <DialogHeader>
           <DialogTitle>Connect to storage provider</DialogTitle>
           <DialogDescription className="sr-only">Connect to a new storage provider</DialogDescription>
@@ -81,9 +83,9 @@ export default function ConnectStorageProvider({
                 </SelectTrigger>
                 <SelectContent>
                   <SelectGroup>
-                    {page.props.configs.storage_providers.map((provider) => (
-                      <SelectItem key={provider} value={provider}>
-                        {provider}
+                    {Object.entries(page.props.configs.storage_provider.providers).map(([key, provider]) => (
+                      <SelectItem key={key} value={key}>
+                        {provider.label}
                       </SelectItem>
                     ))}
                   </SelectGroup>
@@ -95,7 +97,7 @@ export default function ConnectStorageProvider({
               <Label htmlFor="name">Name</Label>
               <Input
                 type="text"
-                name="name"
+                name="host"
                 id="name"
                 placeholder="Name"
                 value={form.data.name}
@@ -103,27 +105,18 @@ export default function ConnectStorageProvider({
               />
               <InputError message={form.errors.name} />
             </FormField>
-            <div
-              className={
-                page.props.configs.storage_providers_custom_fields[form.data.provider].length > 1 ? 'grid grid-cols-2 items-start gap-6' : ''
-              }
-            >
-              {page.props.configs.storage_providers_custom_fields[form.data.provider]?.map((item: string) => (
-                <FormField key={item}>
-                  <Label htmlFor={item} className="capitalize">
-                    {item.replaceAll('_', ' ')}
-                  </Label>
-                  <Input
-                    type="text"
-                    name={item}
-                    id={item}
-                    value={(form.data[item as keyof StorageProviderForm] as string) ?? ''}
-                    onChange={(e) => form.setData(item as keyof StorageProviderForm, e.target.value)}
-                  />
-                  <InputError message={form.errors[item as keyof StorageProviderForm]} />
-                </FormField>
-              ))}
-            </div>
+            {page.props.configs.storage_provider.providers[form.data.provider]?.form?.map((field: DynamicFieldConfig) => (
+              <DynamicField
+                key={`field-${field.name}`}
+                /*@ts-expect-error dynamic types*/
+                value={form.data[field.name]}
+                /*@ts-expect-error dynamic types*/
+                onChange={(value) => form.setData(field.name, value)}
+                config={field}
+                /*@ts-expect-error dynamic types*/
+                error={form.errors[field.name]}
+              />
+            ))}
             <FormField>
               <div className="flex items-center space-x-3">
                 <Checkbox id="global" name="global" checked={form.data.global} onClick={() => form.setData('global', !form.data.global)} />
diff --git a/resources/js/pages/workers/components/columns.tsx b/resources/js/pages/workers/components/columns.tsx
index f3324adc..fc62871b 100644
--- a/resources/js/pages/workers/components/columns.tsx
+++ b/resources/js/pages/workers/components/columns.tsx
@@ -139,6 +139,12 @@ function Logs({ worker }: { worker: Worker }) {
 }
 
 export const columns: ColumnDef<Worker>[] = [
+  {
+    accessorKey: 'name',
+    header: 'Name',
+    enableColumnFilter: true,
+    enableSorting: true,
+  },
   {
     accessorKey: 'command',
     header: 'Command',
@@ -154,24 +160,6 @@ export const columns: ColumnDef<Worker>[] = [
     enableColumnFilter: true,
     enableSorting: true,
   },
-  {
-    accessorKey: 'auto_start',
-    header: 'Auto start',
-    enableColumnFilter: true,
-    enableSorting: true,
-    cell: ({ row }) => {
-      return <Badge variant={row.original.auto_start ? 'success' : 'outline'}>{row.original.auto_start ? 'Yes' : 'No'}</Badge>;
-    },
-  },
-  {
-    accessorKey: 'auto_restart',
-    header: 'Auto restart',
-    enableColumnFilter: true,
-    enableSorting: true,
-    cell: ({ row }) => {
-      return <Badge variant={row.original.auto_restart ? 'success' : 'outline'}>{row.original.auto_restart ? 'Yes' : 'No'}</Badge>;
-    },
-  },
   {
     accessorKey: 'numprocs',
     header: 'Numprocs',
diff --git a/resources/js/pages/workers/components/form.tsx b/resources/js/pages/workers/components/form.tsx
index 1c053a0f..e49032a4 100644
--- a/resources/js/pages/workers/components/form.tsx
+++ b/resources/js/pages/workers/components/form.tsx
@@ -27,12 +27,14 @@ export default function WorkerForm({ serverId, site, worker, children }: { serve
   const page = usePage<SharedData & { server: Server }>();
   const [open, setOpen] = useState(false);
   const form = useForm<{
+    name: string;
     command: string;
     user: string;
     auto_start: boolean;
     auto_restart: boolean;
     numprocs: string;
   }>({
+    name: worker?.name || '',
     command: worker?.command || '',
     user: worker?.user || '',
     auto_start: worker?.auto_start || true,
@@ -69,6 +71,13 @@ export default function WorkerForm({ serverId, site, worker, children }: { serve
         </DialogHeader>
         <Form id="worker-form" onSubmit={submit} className="p-4">
           <FormFields>
+            {/*name*/}
+            <FormField>
+              <Label htmlFor="name">Name</Label>
+              <Input type="text" id="name" value={form.data.name} onChange={(e) => form.setData('name', e.target.value)} />
+              <InputError message={form.errors.name} />
+            </FormField>
+
             {/*command*/}
             <FormField>
               <Label htmlFor="command">Command</Label>
diff --git a/resources/js/types/dynamic-field-config.d.ts b/resources/js/types/dynamic-field-config.d.ts
index 7f201fb1..97cd53c0 100644
--- a/resources/js/types/dynamic-field-config.d.ts
+++ b/resources/js/types/dynamic-field-config.d.ts
@@ -1,5 +1,5 @@
 export interface DynamicFieldConfig {
-  type: 'text' | 'select' | 'checkbox' | 'component';
+  type: 'text' | 'select' | 'checkbox' | 'component' | 'alert';
   name: string;
   options?: string[];
   placeholder?: string;
diff --git a/resources/js/types/index.d.ts b/resources/js/types/index.d.ts
index a0397261..d0fce0c1 100644
--- a/resources/js/types/index.d.ts
+++ b/resources/js/types/index.d.ts
@@ -3,7 +3,7 @@ import type { Config } from 'ziggy-js';
 import type { Server } from '@/types/server';
 import { Project } from '@/types/project';
 import { User } from '@/types/user';
-import { Site } from '@/types/site';
+import { Site, SiteType } from '@/types/site';
 import { DynamicFieldConfig } from './dynamic-field-config';
 
 export interface Auth {
@@ -34,42 +34,69 @@ export interface NavItem {
 }
 
 export interface Configs {
-  server_providers: string[];
-  server_providers_custom_fields: {
-    [provider: string]: string[];
-  };
-  source_control_providers: string[];
-  source_control_providers_custom_fields: {
-    [provider: string]: string[];
-  };
-  storage_providers: string[];
-  storage_providers_custom_fields: {
-    [provider: string]: string[];
-  };
-  notification_channels_providers: string[];
-  notification_channels_providers_custom_fields: {
-    [provider: string]: string[];
-  };
   operating_systems: string[];
-  service_versions: {
-    [service: string]: string[];
-  };
-  service_types: {
-    [service: string]: string;
-  };
   colors: string[];
-  webservers: string[];
   databases: string[];
-  php_versions: string[];
-  site_types: string[];
-  site_types_custom_fields: {
-    [type: string]: DynamicFieldConfig[];
-  };
   cronjob_intervals: {
     [key: string]: string;
   };
   metrics_periods: string[];
-  php_extensions: string[];
+
+  server_provider: {
+    providers: {
+      [provider: string]: {
+        label: string;
+        handler: string;
+        form?: DynamicFieldConfig[];
+      };
+    };
+  };
+  storage_provider: {
+    providers: {
+      [provider: string]: {
+        label: string;
+        handler: string;
+        form?: DynamicFieldConfig[];
+      };
+    };
+  };
+  source_control: {
+    providers: {
+      [provider: string]: {
+        label: string;
+        handler: string;
+        form?: DynamicFieldConfig[];
+      };
+    };
+  };
+  notification_channel: {
+    providers: {
+      [channel: string]: {
+        label: string;
+        handler: string;
+        form?: DynamicFieldConfig[];
+      };
+    };
+  };
+  service: {
+    services: {
+      [name: string]: {
+        label: string;
+        type: string;
+        handler: string;
+        form?: DynamicFieldConfig[];
+        versions: string[];
+        data?: {
+          extensions?: string[];
+        };
+      };
+    };
+  };
+  site: {
+    types: {
+      [type: string]: SiteType;
+    };
+  };
 
   [key: string]: unknown;
 }
@@ -79,13 +106,12 @@ export interface SharedData {
   quote: { message: string; author: string };
   auth: Auth;
   ziggy: Config & { location: string };
-  sidebarOpen: boolean;
   configs: Configs;
-  projectServers: Server[];
-  serverSites?: Site[];
+  project_servers: Server[];
+  server_sites?: Site[];
   server?: Server;
   site?: Site;
-  publicKeyText: string;
+  public_key_text: string;
   flash?: {
     success: string;
     error: string;
diff --git a/resources/js/types/site.d.ts b/resources/js/types/site.d.ts
index a8cf4c5a..f77422cf 100644
--- a/resources/js/types/site.d.ts
+++ b/resources/js/types/site.d.ts
@@ -1,4 +1,5 @@
 import { Server } from '@/types/server';
+import { DynamicFieldConfig } from '@/types/dynamic-field-config';
 
 export interface Site {
   id: number;
@@ -10,7 +11,6 @@ export interface Site {
     method?: 'round-robin' | 'least-connections' | 'ip-hash';
     [key: string]: unknown;
   };
-  features: string[];
   domain: string;
   aliases?: string[];
   web_directory: string;
@@ -32,3 +32,25 @@ export interface Site {
 
   [key: string]: unknown;
 }
+
+export interface SiteType {
+  label: string;
+  handler: string;
+  form?: DynamicFieldConfig[];
+  features?: SiteFeature[];
+}
+
+export interface SiteFeature {
+  label: string;
+  description?: string;
+  actions?: {
+    [key: string]: SiteFeatureAction;
+  };
+}
+
+export interface SiteFeatureAction {
+  label: string;
+  handler: string;
+  form?: DynamicFieldConfig[];
+  active?: boolean;
+}
diff --git a/resources/js/types/worker.d.ts b/resources/js/types/worker.d.ts
index 24a3fbd7..a510d90e 100644
--- a/resources/js/types/worker.d.ts
+++ b/resources/js/types/worker.d.ts
@@ -1,6 +1,7 @@
 export interface Worker {
   id: number;
   server_id: number;
+  name: string;
   command: string;
   user: string;
   auto_start: boolean;
diff --git a/resources/views/ssh/services/webserver/caddy/redirects.blade.php b/resources/views/ssh/services/webserver/caddy/redirects.blade.php
deleted file mode 100644
index d07111d0..00000000
--- a/resources/views/ssh/services/webserver/caddy/redirects.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-@foreach($site->activeRedirects as $redirect)
-        redir {{ $redirect->from }} {{ $redirect->to }} {{ $redirect->mode }}
-@endforeach
diff --git a/resources/views/ssh/services/webserver/caddy/vhost-blocks/core.blade.php b/resources/views/ssh/services/webserver/caddy/vhost-blocks/core.blade.php
new file mode 100644
index 00000000..428797a9
--- /dev/null
+++ b/resources/views/ssh/services/webserver/caddy/vhost-blocks/core.blade.php
@@ -0,0 +1,5 @@
+#[core]
+import access_log {{ $site->domain }}
+import compression
+import security_headers
+#[/core]
diff --git a/resources/views/ssh/services/webserver/caddy/vhost-blocks/force-ssl.blade.php b/resources/views/ssh/services/webserver/caddy/vhost-blocks/force-ssl.blade.php
new file mode 100644
index 00000000..e372123a
--- /dev/null
+++ b/resources/views/ssh/services/webserver/caddy/vhost-blocks/force-ssl.blade.php
@@ -0,0 +1,5 @@
+#[force-ssl]
+@if ($site->activeSsl && $site->force_ssl)
+    redir @http https://{host}{uri} permanent
+@endif
+#[/force-ssl]
diff --git a/resources/views/ssh/services/webserver/caddy/vhost-blocks/load-balancer.blade.php b/resources/views/ssh/services/webserver/caddy/vhost-blocks/load-balancer.blade.php
new file mode 100644
index 00000000..9590491e
--- /dev/null
+++ b/resources/views/ssh/services/webserver/caddy/vhost-blocks/load-balancer.blade.php
@@ -0,0 +1,23 @@
+#[load-balancer]
+reverse_proxy {
+    @if ($site->loadBalancerServers()->count() > 0)
+        @foreach($site->loadBalancerServers as $server)
+            to {{ $server->ip }}:{{ $server->port }}
+        @endforeach
+    @else
+        to 127.0.0.1
+    @endif
+    @switch($site->type_data['method'] ?? LoadBalancerMethod::ROUND_ROBIN)
+        @case(LoadBalancerMethod::LEAST_CONNECTIONS)
+            lb_policy least_conn
+            @break
+        @case(LoadBalancerMethod::IP_HASH)
+            lb_policy ip_hash
+            @break
+        @default
+            lb_policy round_robin
+    @endswitch
+    header_up Host {host}
+    header_up X-Real-IP {remote}
+}
+#[/load-balancer]
diff --git a/resources/views/ssh/services/webserver/caddy/vhost-blocks/php.blade.php b/resources/views/ssh/services/webserver/caddy/vhost-blocks/php.blade.php
new file mode 100644
index 00000000..20ce1536
--- /dev/null
+++ b/resources/views/ssh/services/webserver/caddy/vhost-blocks/php.blade.php
@@ -0,0 +1,12 @@
+#[php]
+root * {{ $site->getWebDirectoryPath() }}
+@php
+    $phpSocket = "unix//var/run/php/php{$site->php_version}-fpm.sock";
+    if ($site->isIsolated()) {
+        $phpSocket = "unix//run/php/php{$site->php_version}-fpm-{$site->user}.sock";
+    }
+@endphp
+try_files {path} {path}/ /index.php?{query}
+php_fastcgi {{ $phpSocket }}
+file_server
+#[/php]
diff --git a/resources/views/ssh/services/webserver/caddy/vhost-blocks/port.blade.php b/resources/views/ssh/services/webserver/caddy/vhost-blocks/port.blade.php
new file mode 100644
index 00000000..8c3fea2a
--- /dev/null
+++ b/resources/views/ssh/services/webserver/caddy/vhost-blocks/port.blade.php
@@ -0,0 +1,5 @@
+#[port]
+@if ($site->activeSsl)
+    tls {{ $site->activeSsl->certificate_path }} {{ $site->activeSsl->pk_path }}
+@endif
+#[/port]
diff --git a/resources/views/ssh/services/webserver/nginx/redirects.blade.php b/resources/views/ssh/services/webserver/caddy/vhost-blocks/redirects.blade.php
similarity index 85%
rename from resources/views/ssh/services/webserver/nginx/redirects.blade.php
rename to resources/views/ssh/services/webserver/caddy/vhost-blocks/redirects.blade.php
index e065d678..6ee2c3ad 100644
--- a/resources/views/ssh/services/webserver/nginx/redirects.blade.php
+++ b/resources/views/ssh/services/webserver/caddy/vhost-blocks/redirects.blade.php
@@ -1,5 +1,7 @@
+#[redirects]
 @foreach($site->activeRedirects as $redirect)
     location = {{ $redirect->from }} {
         return {{ $redirect->mode }} {{ $redirect->to }};
     }
 @endforeach
+#[/redirects]
diff --git a/resources/views/ssh/services/webserver/caddy/vhost.blade.php b/resources/views/ssh/services/webserver/caddy/vhost.blade.php
index 677573c6..fbe233b2 100755
--- a/resources/views/ssh/services/webserver/caddy/vhost.blade.php
+++ b/resources/views/ssh/services/webserver/caddy/vhost.blade.php
@@ -1,51 +1,7 @@
 {{ $site->domain }} {{ $site->getAliasesString() }} {
-    @if ($site->activeSsl)
-    tls {{ $site->activeSsl->certificate_path }} {{ $site->activeSsl->pk_path }}
-    @endif
-    @if ($site->activeSsl && $site->force_ssl)
-    redir @http https://{host}{uri} permanent
-    @endif
-    import access_log {{ $site->domain }}
-    import compression
-    import security_headers
-    @if ($site->port)
-        reverse_proxy 127.0.0.1:{{ $site->port }}
-    @else
-        @if ($site->type()->language() === 'php')
-            root * {{ $site->getWebDirectoryPath() }}
-            @php
-                $phpSocket = "unix//var/run/php/php{$site->php_version}-fpm.sock";
-                if ($site->isIsolated()) {
-                    $phpSocket = "unix//run/php/php{$site->php_version}-fpm-{$site->user}.sock";
-                }
-            @endphp
-            try_files {path} {path}/ /index.php?{query}
-            php_fastcgi {{ $phpSocket }}
-            file_server
-        @endif
-    @endif
-    @if ($site->type === \App\Enums\SiteType::LOAD_BALANCER)
-        reverse_proxy {
-            @if ($site->loadBalancerServers()->count() > 0)
-                @foreach($site->loadBalancerServers as $server)
-                    to {{ $server->ip }}:{{ $server->port }}
-                @endforeach
-            @else
-                to 127.0.0.1
-            @endif
-            @switch($site->type_data['method'] ?? \App\Enums\LoadBalancerMethod::ROUND_ROBIN)
-                @case(\App\Enums\LoadBalancerMethod::LEAST_CONNECTIONS)
-                    lb_policy least_conn
-                    @break
-                @case(\App\Enums\LoadBalancerMethod::IP_HASH)
-                    lb_policy ip_hash
-                    @break
-                @default
-                    lb_policy round_robin
-            @endswitch
-            header_up Host {host}
-            header_up X-Real-IP {remote}
-        }
-    @endif
-    @include('ssh.services.webserver.caddy.redirects', ['site' => $site])
+#[main]
+@foreach($main ?? [] as $main)
+{{ $main }}
+@endforeach
+#[/main]
 }
diff --git a/resources/views/ssh/services/webserver/nginx/vhost-blocks/core.blade.php b/resources/views/ssh/services/webserver/nginx/vhost-blocks/core.blade.php
new file mode 100644
index 00000000..0931f7a5
--- /dev/null
+++ b/resources/views/ssh/services/webserver/nginx/vhost-blocks/core.blade.php
@@ -0,0 +1,12 @@
+#[core]
+server_name {{ $site->domain }} {{ $site->getAliasesString() }};
+root {{ $site->getWebDirectoryPath() }};
+add_header X-Frame-Options "SAMEORIGIN";
+add_header X-Content-Type-Options "nosniff";
+charset utf-8;
+access_log off;
+error_log  /var/log/nginx/{{ $site->domain }}-error.log error;
+location ~ /\.(?!well-known).* {
+    deny all;
+}
+#[/core]
diff --git a/resources/views/ssh/services/webserver/nginx/vhost-blocks/force-ssl.blade.php b/resources/views/ssh/services/webserver/nginx/vhost-blocks/force-ssl.blade.php
new file mode 100644
index 00000000..b8bcb140
--- /dev/null
+++ b/resources/views/ssh/services/webserver/nginx/vhost-blocks/force-ssl.blade.php
@@ -0,0 +1,9 @@
+#[force-ssl]
+@if ($site->activeSsl && $site->force_ssl)
+    server {
+        listen 80;
+        server_name {{ $site->domain }} {{ $site->getAliasesString() }};
+        return 301 https://$host$request_uri;
+    }
+@endif
+#[/force-ssl]
diff --git a/resources/views/ssh/services/webserver/nginx/vhost-blocks/laravel-octane-map.blade.php b/resources/views/ssh/services/webserver/nginx/vhost-blocks/laravel-octane-map.blade.php
new file mode 100644
index 00000000..0e15bd33
--- /dev/null
+++ b/resources/views/ssh/services/webserver/nginx/vhost-blocks/laravel-octane-map.blade.php
@@ -0,0 +1,6 @@
+#[laravel-octane-map]
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ''      close;
+}
+#[/laravel-octane-map]
diff --git a/resources/views/ssh/services/webserver/nginx/vhost-blocks/laravel-octane.blade.php b/resources/views/ssh/services/webserver/nginx/vhost-blocks/laravel-octane.blade.php
new file mode 100644
index 00000000..68e571db
--- /dev/null
+++ b/resources/views/ssh/services/webserver/nginx/vhost-blocks/laravel-octane.blade.php
@@ -0,0 +1,25 @@
+#[laravel-octane]
+index index.php index.html;
+error_page 404 /index.php;
+location /index.php {
+    try_files /not_exists @octane;
+}
+location / {
+    try_files $uri $uri/ @octane;
+}
+location @octane {
+    set $suffix "";
+    if ($uri = /index.php) {
+        set $suffix ?$query_string;
+    }
+    proxy_http_version 1.1;
+    proxy_set_header Host $http_host;
+    proxy_set_header Scheme $scheme;
+    proxy_set_header SERVER_PORT $server_port;
+    proxy_set_header REMOTE_ADDR $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection $connection_upgrade;
+    proxy_pass http://127.0.0.1:{{ data_get($site->type_data, 'octane_port', 8000) }}$suffix;
+}
+#[/laravel-octane]
diff --git a/resources/views/ssh/services/webserver/nginx/vhost-blocks/load-balancer-upstream.blade.php b/resources/views/ssh/services/webserver/nginx/vhost-blocks/load-balancer-upstream.blade.php
new file mode 100644
index 00000000..6aaeb105
--- /dev/null
+++ b/resources/views/ssh/services/webserver/nginx/vhost-blocks/load-balancer-upstream.blade.php
@@ -0,0 +1,23 @@
+#[load-balancer-upstream]
+@php
+    use App\Enums\LoadBalancerMethod;$backendName = preg_replace("/[^A-Za-z0-9 ]/", '', $site->domain).'_backend';
+@endphp
+upstream {{ $backendName }} {
+@switch($site->type_data['method'] ?? LoadBalancerMethod::ROUND_ROBIN)
+    @case(LoadBalancerMethod::LEAST_CONNECTIONS)
+        least_conn;
+        @break
+    @case(LoadBalancerMethod::IP_HASH)
+        ip_hash;
+        @break
+    @default
+@endswitch
+@if ($site->loadBalancerServers()->count() > 0)
+    @foreach($site->loadBalancerServers as $server)
+        server {{ $server->ip }}:{{ $server->port }} {{ $server->backup ? 'backup' : '' }} {{ $server->weight ? 'weight='.$server->weight : '' }};
+    @endforeach
+@else
+    server 127.0.0.1;
+@endif
+}
+#[/load-balancer-upstream]
diff --git a/resources/views/ssh/services/webserver/nginx/vhost-blocks/load-balancer.blade.php b/resources/views/ssh/services/webserver/nginx/vhost-blocks/load-balancer.blade.php
new file mode 100644
index 00000000..aa532f2c
--- /dev/null
+++ b/resources/views/ssh/services/webserver/nginx/vhost-blocks/load-balancer.blade.php
@@ -0,0 +1,13 @@
+#[load-balancer]
+@php
+    $backendName = preg_replace("/[^A-Za-z0-9 ]/", '', $site->domain).'_backend';
+@endphp
+location / {
+    proxy_pass http://{{ $backendName }}$request_uri;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+}
+error_page 404 /index.html;
+#[/load-balancer]
diff --git a/resources/views/ssh/services/webserver/nginx/vhost-blocks/php.blade.php b/resources/views/ssh/services/webserver/nginx/vhost-blocks/php.blade.php
new file mode 100644
index 00000000..bbfd4ddf
--- /dev/null
+++ b/resources/views/ssh/services/webserver/nginx/vhost-blocks/php.blade.php
@@ -0,0 +1,19 @@
+#[php]
+@php
+    $phpSocket = "unix:/var/run/php/php{$site->php_version}-fpm.sock";
+    if ($site->isIsolated()) {
+        $phpSocket = "unix:/run/php/php{$site->php_version}-fpm-{$site->user}.sock";
+    }
+@endphp
+location / {
+    try_files $uri $uri/ /index.php?$query_string;
+}
+location ~ \.php$ {
+    fastcgi_pass {{ $phpSocket }};
+    fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+    include fastcgi_params;
+    fastcgi_hide_header X-Powered-By;
+}
+index index.php index.html;
+error_page 404 /index.php;
+#[/php]
diff --git a/resources/views/ssh/services/webserver/nginx/vhost-blocks/port.blade.php b/resources/views/ssh/services/webserver/nginx/vhost-blocks/port.blade.php
new file mode 100644
index 00000000..99551469
--- /dev/null
+++ b/resources/views/ssh/services/webserver/nginx/vhost-blocks/port.blade.php
@@ -0,0 +1,12 @@
+#[port]
+@if (!$site->activeSsl || !$site->force_ssl)
+    listen 80;
+    listen [::]:80;
+@endif
+@if ($site->activeSsl)
+    listen 443 ssl;
+    listen [::]:443 ssl;
+    ssl_certificate {{ $site->activeSsl->certificate_path }};
+    ssl_certificate_key {{ $site->activeSsl->pk_path }};
+@endif
+#[/port]
diff --git a/resources/views/ssh/services/webserver/nginx/vhost-blocks/redirects.blade.php b/resources/views/ssh/services/webserver/nginx/vhost-blocks/redirects.blade.php
new file mode 100644
index 00000000..6ee2c3ad
--- /dev/null
+++ b/resources/views/ssh/services/webserver/nginx/vhost-blocks/redirects.blade.php
@@ -0,0 +1,7 @@
+#[redirects]
+@foreach($site->activeRedirects as $redirect)
+    location = {{ $redirect->from }} {
+        return {{ $redirect->mode }} {{ $redirect->to }};
+    }
+@endforeach
+#[/redirects]
diff --git a/resources/views/ssh/services/webserver/nginx/vhost.blade.php b/resources/views/ssh/services/webserver/nginx/vhost.blade.php
old mode 100755
new mode 100644
index 77e7ac1f..97a2ffe2
--- a/resources/views/ssh/services/webserver/nginx/vhost.blade.php
+++ b/resources/views/ssh/services/webserver/nginx/vhost.blade.php
@@ -1,102 +1,19 @@
-@if ($site->activeSsl && $site->force_ssl)
-server {
-    listen 80;
-    server_name {{ $site->domain }} {{ $site->getAliasesString() }};
-    return 301 https://$host$request_uri;
-}
-@endif
-
-@php
-    $backendName = preg_replace("/[^A-Za-z0-9 ]/", '', $site->domain).'_backend';
-@endphp
-
-@if ($site->type === \App\Enums\SiteType::LOAD_BALANCER)
-    upstream {{ $backendName }} {
-    @switch($site->type_data['method'] ?? \App\Enums\LoadBalancerMethod::ROUND_ROBIN)
-        @case(\App\Enums\LoadBalancerMethod::LEAST_CONNECTIONS)
-            least_conn;
-            @break
-        @case(\App\Enums\LoadBalancerMethod::IP_HASH)
-            ip_hash;
-            @break
-        @default
-    @endswitch
-    @if ($site->loadBalancerServers()->count() > 0)
-        @foreach($site->loadBalancerServers as $server)
-            server {{ $server->ip }}:{{ $server->port }} {{ $server->backup ? 'backup' : '' }} {{ $server->weight ? 'weight='.$server->weight : '' }};
-        @endforeach
-    @else
-        server 127.0.0.1;
-    @endif
-    }
-@endif
+#[header]
+@foreach($header ?? [] as $header)
+{{ $header }}
+@endforeach
+#[/header]
 
 server {
-    @if (!$site->activeSsl || !$site->force_ssl)
-        listen 80;
-    @endif
-    @if ($site->activeSsl)
-        listen 443 ssl;
-        ssl_certificate {{ $site->activeSsl->certificate_path }};
-        ssl_certificate_key {{ $site->activeSsl->pk_path }};
-    @endif
-
-    server_name {{ $site->domain }} {{ $site->getAliasesString() }};
-    root {{ $site->getWebDirectoryPath() }};
-
-    add_header X-Frame-Options "SAMEORIGIN";
-    add_header X-Content-Type-Options "nosniff";
-
-    index index.html index.php;
-
-    charset utf-8;
-
-    @if ($site->port)
-        location / {
-            proxy_pass http://127.0.0.1:{{ $site->port }};
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-        }
-    @else
-        @if ($site->type()->language() === 'php')
-            @php
-                $phpSocket = "unix:/var/run/php/php{$site->php_version}-fpm.sock";
-                if ($site->isIsolated()) {
-                    $phpSocket = "unix:/run/php/php{$site->php_version}-fpm-{$site->user}.sock";
-                }
-            @endphp
-            location / {
-                try_files $uri $uri/ /index.php?$query_string;
-            }
-            location ~ \.php$ {
-                fastcgi_pass {{ $phpSocket }};
-                fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
-                include fastcgi_params;
-                fastcgi_hide_header X-Powered-By;
-            }
-        @endif
-    @endif
-
-    @if ($site->type === \App\Enums\SiteType::LOAD_BALANCER)
-        location / {
-            proxy_pass http://{{ $backendName }}$request_uri;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-        }
-    @endif
-
-    location = /favicon.ico { access_log off; log_not_found off; }
-    location = /robots.txt  { access_log off; log_not_found off; }
-
-    error_page 404 /index.html;
-
-    location ~ /\.(?!well-known).* {
-        deny all;
-    }
-
-    @include('ssh.services.webserver.nginx.redirects', ['site' => $site])
+    #[main]
+    @foreach($main ?? [] as $main)
+    {{ $main }}
+    @endforeach
+    #[/main]
 }
+
+#[footer]
+@foreach($footer ?? [] as $footer)
+{{ $footer }}
+@endforeach
+#[/footer]
diff --git a/tests/Feature/API/ServerProvidersTest.php b/tests/Feature/API/ServerProvidersTest.php
index 9ab0c63c..a58d4e2e 100644
--- a/tests/Feature/API/ServerProvidersTest.php
+++ b/tests/Feature/API/ServerProvidersTest.php
@@ -2,7 +2,11 @@
 
 namespace Tests\Feature\API;
 
-use App\Enums\ServerProvider;
+use App\Models\ServerProvider;
+use App\ServerProviders\DigitalOcean;
+use App\ServerProviders\Hetzner;
+use App\ServerProviders\Linode;
+use App\ServerProviders\Vultr;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Http;
 use Laravel\Sanctum\Sanctum;
@@ -70,8 +74,8 @@ public function test_see_providers_list(): void
     {
         Sanctum::actingAs($this->user, ['read', 'write']);
 
-        /** @var \App\Models\ServerProvider $provider */
-        $provider = \App\Models\ServerProvider::factory()->create([
+        /** @var ServerProvider $provider */
+        $provider = ServerProvider::factory()->create([
             'user_id' => $this->user->id,
         ]);
 
@@ -90,8 +94,8 @@ public function test_delete_provider(string $provider): void
     {
         Sanctum::actingAs($this->user, ['read', 'write']);
 
-        /** @var \App\Models\ServerProvider $provider */
-        $provider = \App\Models\ServerProvider::factory()->create([
+        /** @var ServerProvider $provider */
+        $provider = ServerProvider::factory()->create([
             'user_id' => $this->user->id,
             'provider' => $provider,
         ]);
@@ -108,8 +112,8 @@ public function test_cannot_delete_provider(string $provider): void
     {
         Sanctum::actingAs($this->user, ['read', 'write']);
 
-        /** @var \App\Models\ServerProvider $provider */
-        $provider = \App\Models\ServerProvider::factory()->create([
+        /** @var ServerProvider $provider */
+        $provider = ServerProvider::factory()->create([
             'user_id' => $this->user->id,
             'provider' => $provider,
         ]);
@@ -141,32 +145,32 @@ public static function data(): array
             //     ],
             // ],
             [
-                ServerProvider::LINODE,
+                Linode::id(),
                 [
                     'token' => 'token',
                 ],
             ],
             [
-                ServerProvider::LINODE,
+                Linode::id(),
                 [
                     'token' => 'token',
                     'global' => 1,
                 ],
             ],
             [
-                ServerProvider::DIGITALOCEAN,
+                DigitalOcean::id(),
                 [
                     'token' => 'token',
                 ],
             ],
             [
-                ServerProvider::VULTR,
+                Vultr::id(),
                 [
                     'token' => 'token',
                 ],
             ],
             [
-                ServerProvider::HETZNER,
+                Hetzner::id(),
                 [
                     'token' => 'token',
                 ],
diff --git a/tests/Feature/API/ServerTest.php b/tests/Feature/API/ServerTest.php
index 73d46194..7677ae61 100644
--- a/tests/Feature/API/ServerTest.php
+++ b/tests/Feature/API/ServerTest.php
@@ -2,12 +2,9 @@
 
 namespace Tests\Feature\API;
 
-use App\Enums\Database;
 use App\Enums\OperatingSystem;
-use App\Enums\ServerProvider;
-use App\Enums\ServerType;
-use App\Enums\Webserver;
 use App\Facades\SSH;
+use App\ServerProviders\Custom;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Sanctum\Sanctum;
 use Tests\TestCase;
@@ -52,44 +49,15 @@ public function test_create_server(): void
         $this->json('POST', route('api.projects.servers.create', [
             'project' => $this->user->current_project_id,
         ]), [
-            'provider' => ServerProvider::CUSTOM,
+            'provider' => Custom::id(),
             'name' => 'test',
             'ip' => '1.1.1.1',
             'port' => '22',
             'os' => OperatingSystem::UBUNTU22,
-            'webserver' => Webserver::NGINX,
-            'database' => Database::MYSQL80,
-            'php' => '8.2',
         ])
             ->assertSuccessful()
             ->assertJsonFragment([
                 'name' => 'test',
-                'type' => ServerType::REGULAR,
-            ]);
-    }
-
-    public function test_create_server_with_caddy(): void
-    {
-        Sanctum::actingAs($this->user, ['read', 'write']);
-
-        SSH::fake('Active: active'); // fake output for service installations
-
-        $this->json('POST', route('api.projects.servers.create', [
-            'project' => $this->user->current_project_id,
-        ]), [
-            'provider' => ServerProvider::CUSTOM,
-            'name' => 'test',
-            'ip' => '1.1.1.1',
-            'port' => '22',
-            'os' => OperatingSystem::UBUNTU22,
-            'webserver' => Webserver::CADDY,
-            'database' => Database::MYSQL80,
-            'php' => '8.2',
-        ])
-            ->assertSuccessful()
-            ->assertJsonFragment([
-                'name' => 'test',
-                'type' => ServerType::REGULAR,
             ]);
     }
 
diff --git a/tests/Feature/API/SitesTest.php b/tests/Feature/API/SitesTest.php
index e68cc885..781cb9eb 100644
--- a/tests/Feature/API/SitesTest.php
+++ b/tests/Feature/API/SitesTest.php
@@ -4,10 +4,11 @@
 
 use App\Enums\DeploymentStatus;
 use App\Enums\LoadBalancerMethod;
-use App\Enums\SourceControl;
 use App\Facades\SSH;
 use App\Models\Server;
 use App\Models\Site;
+use App\Models\SourceControl;
+use App\SourceControlProviders\Github;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Http;
 use Laravel\Sanctum\Sanctum;
@@ -42,9 +43,9 @@ public function test_create_site(array $inputs): void
 
         Sanctum::actingAs($this->user, ['read', 'write']);
 
-        /** @var \App\Models\SourceControl $sourceControl */
-        $sourceControl = \App\Models\SourceControl::factory()->create([
-            'provider' => SourceControl::GITHUB,
+        /** @var SourceControl $sourceControl */
+        $sourceControl = SourceControl::factory()->create([
+            'provider' => Github::id(),
         ]);
 
         $inputs['source_control'] = $sourceControl->id;
diff --git a/tests/Feature/API/SourceControlsTest.php b/tests/Feature/API/SourceControlsTest.php
index 766bcb20..7e408207 100644
--- a/tests/Feature/API/SourceControlsTest.php
+++ b/tests/Feature/API/SourceControlsTest.php
@@ -3,6 +3,9 @@
 namespace Tests\Feature\API;
 
 use App\Models\SourceControl;
+use App\SourceControlProviders\Bitbucket;
+use App\SourceControlProviders\Github;
+use App\SourceControlProviders\Gitlab;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Http;
 use Laravel\Sanctum\Sanctum;
@@ -137,11 +140,11 @@ public function test_edit_source_control(string $provider, array $input): void
     public static function data(): array
     {
         return [
-            ['github', ['token' => 'test']],
-            ['github', ['token' => 'test', 'global' => '1']],
-            ['gitlab', ['token' => 'test']],
-            ['gitlab', ['token' => 'test', 'url' => 'https://git.example.com/']],
-            ['bitbucket', ['username' => 'test', 'password' => 'test']],
+            [Github::id(), ['token' => 'test']],
+            [Github::id(), ['token' => 'test', 'global' => '1']],
+            [Gitlab::id(), ['token' => 'test']],
+            [Gitlab::id(), ['token' => 'test', 'url' => 'https://git.example.com/']],
+            [Bitbucket::id(), ['username' => 'test', 'password' => 'test']],
         ];
     }
 }
diff --git a/tests/Feature/API/StorageProvidersTest.php b/tests/Feature/API/StorageProvidersTest.php
index cc93102b..eb66e490 100644
--- a/tests/Feature/API/StorageProvidersTest.php
+++ b/tests/Feature/API/StorageProvidersTest.php
@@ -2,11 +2,12 @@
 
 namespace Tests\Feature\API;
 
-use App\Enums\StorageProvider;
 use App\Facades\FTP;
 use App\Models\Backup;
 use App\Models\Database;
 use App\Models\StorageProvider as StorageProviderModel;
+use App\StorageProviders\Dropbox;
+use App\StorageProviders\Local;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Http;
 use Laravel\Sanctum\Sanctum;
@@ -25,11 +26,11 @@ public function test_create(array $input): void
     {
         Sanctum::actingAs($this->user, ['read', 'write']);
 
-        if ($input['provider'] === StorageProvider::DROPBOX) {
+        if ($input['provider'] === Dropbox::id()) {
             Http::fake();
         }
 
-        if ($input['provider'] === StorageProvider::FTP) {
+        if ($input['provider'] === \App\StorageProviders\FTP::id()) {
             FTP::fake();
         }
 
@@ -50,7 +51,7 @@ public function test_see_providers_list(): void
         /** @var StorageProviderModel $provider */
         $provider = StorageProviderModel::factory()->create([
             'user_id' => $this->user->id,
-            'provider' => StorageProvider::DROPBOX,
+            'provider' => Dropbox::id(),
         ]);
 
         $this->json('GET', route('api.projects.storage-providers', [
@@ -115,14 +116,14 @@ public static function createData(): array
         return [
             [
                 [
-                    'provider' => StorageProvider::LOCAL,
+                    'provider' => Local::id(),
                     'name' => 'local-test',
                     'path' => '/home/vito/backups',
                 ],
             ],
             [
                 [
-                    'provider' => StorageProvider::LOCAL,
+                    'provider' => Local::id(),
                     'name' => 'local-test',
                     'path' => '/home/vito/backups',
                     'global' => 1,
@@ -130,7 +131,7 @@ public static function createData(): array
             ],
             [
                 [
-                    'provider' => StorageProvider::FTP,
+                    'provider' => \App\StorageProviders\FTP::id(),
                     'name' => 'ftp-test',
                     'host' => '1.2.3.4',
                     'port' => '22',
@@ -143,7 +144,7 @@ public static function createData(): array
             ],
             [
                 [
-                    'provider' => StorageProvider::FTP,
+                    'provider' => \App\StorageProviders\FTP::id(),
                     'name' => 'ftp-test',
                     'host' => '1.2.3.4',
                     'port' => '22',
@@ -157,14 +158,14 @@ public static function createData(): array
             ],
             [
                 [
-                    'provider' => StorageProvider::DROPBOX,
+                    'provider' => Dropbox::id(),
                     'name' => 'dropbox-test',
                     'token' => 'token',
                 ],
             ],
             [
                 [
-                    'provider' => StorageProvider::DROPBOX,
+                    'provider' => Dropbox::id(),
                     'name' => 'dropbox-test',
                     'token' => 'token',
                     'global' => 1,
diff --git a/tests/Feature/DatabaseBackupTest.php b/tests/Feature/DatabaseBackupTest.php
index e54f55ae..4babaedd 100644
--- a/tests/Feature/DatabaseBackupTest.php
+++ b/tests/Feature/DatabaseBackupTest.php
@@ -9,10 +9,10 @@
 use App\Models\Backup;
 use App\Models\Database;
 use App\Models\StorageProvider;
+use App\StorageProviders\Dropbox;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\Http;
-use JsonException;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\TestCase;
 
@@ -21,12 +21,12 @@ class DatabaseBackupTest extends TestCase
     use RefreshDatabase;
 
     #[DataProvider('data')]
-    public function test_create_backup(string $db): void
+    public function test_create_backup(string $db, string $version): void
     {
         SSH::fake();
         Http::fake();
 
-        $this->setupDatabase($db);
+        $this->setupDatabase($db, $version);
 
         $this->actingAs($this->user);
 
@@ -36,7 +36,7 @@ public function test_create_backup(string $db): void
 
         $storage = StorageProvider::factory()->create([
             'user_id' => $this->user->id,
-            'provider' => \App\Enums\StorageProvider::DROPBOX,
+            'provider' => Dropbox::id(),
         ]);
 
         $this->post(route('backups.store', [
@@ -47,7 +47,7 @@ public function test_create_backup(string $db): void
             'interval' => '0 * * * *',
             'keep' => '10',
         ])
-            ->assertSessionHasNoErrors();
+            ->assertSessionDoesntHaveErrors();
 
         $this->assertDatabaseHas('backups', [
             'status' => BackupStatus::RUNNING,
@@ -58,9 +58,6 @@ public function test_create_backup(string $db): void
         ]);
     }
 
-    /**
-     * @throws JsonException
-     */
     public function test_create_custom_interval_backup(): void
     {
         Bus::fake();
@@ -73,7 +70,7 @@ public function test_create_custom_interval_backup(): void
 
         $storage = StorageProvider::factory()->create([
             'user_id' => $this->user->id,
-            'provider' => \App\Enums\StorageProvider::DROPBOX,
+            'provider' => Dropbox::id(),
         ]);
 
         $this->post(route('backups.store', ['server' => $this->server]), [
@@ -83,7 +80,7 @@ public function test_create_custom_interval_backup(): void
             'custom_interval' => '* * * * *',
             'keep' => '10',
         ])
-            ->assertSessionHasNoErrors();
+            ->assertSessionDoesntHaveErrors();
 
         $this->assertDatabaseHas('backups', [
             'status' => BackupStatus::RUNNING,
@@ -100,7 +97,7 @@ public function test_see_backups_list(): void
 
         $storage = StorageProvider::factory()->create([
             'user_id' => $this->user->id,
-            'provider' => \App\Enums\StorageProvider::DROPBOX,
+            'provider' => Dropbox::id(),
         ]);
 
         Backup::factory()->create([
@@ -113,9 +110,6 @@ public function test_see_backups_list(): void
             ->assertSuccessful();
     }
 
-    /**
-     * @throws JsonException
-     */
     public function test_update_backup(): void
     {
         $this->actingAs($this->user);
@@ -126,7 +120,7 @@ public function test_update_backup(): void
 
         $storage = StorageProvider::factory()->create([
             'user_id' => $this->user->id,
-            'provider' => \App\Enums\StorageProvider::DROPBOX,
+            'provider' => Dropbox::id(),
         ]);
 
         $backup = Backup::factory()->create([
@@ -144,7 +138,7 @@ public function test_update_backup(): void
             'interval' => '0 0 * * *',
             'keep' => 10,
         ])
-            ->assertSessionHasNoErrors();
+            ->assertSessionDoesntHaveErrors();
 
         $this->assertDatabaseHas('backups', [
             'id' => $backup->id,
@@ -154,9 +148,9 @@ public function test_update_backup(): void
     }
 
     #[DataProvider('data')]
-    public function test_delete_backup(string $db): void
+    public function test_delete_backup(string $db, string $version): void
     {
-        $this->setupDatabase($db);
+        $this->setupDatabase($db, $version);
 
         $this->actingAs($this->user);
 
@@ -166,7 +160,7 @@ public function test_delete_backup(string $db): void
 
         $storage = StorageProvider::factory()->create([
             'user_id' => $this->user->id,
-            'provider' => \App\Enums\StorageProvider::DROPBOX,
+            'provider' => Dropbox::id(),
         ]);
 
         $backup = Backup::factory()->create([
@@ -176,7 +170,7 @@ public function test_delete_backup(string $db): void
         ]);
 
         $this->delete(route('backups.destroy', ['server' => $this->server, 'backup' => $backup]))
-            ->assertSessionHasNoErrors();
+            ->assertSessionDoesntHaveErrors();
 
         $this->assertDatabaseMissing('backups', [
             'id' => $backup->id,
@@ -184,12 +178,12 @@ public function test_delete_backup(string $db): void
     }
 
     #[DataProvider('data')]
-    public function test_restore_backup(string $db): void
+    public function test_restore_backup(string $db, string $version): void
     {
         Http::fake();
         SSH::fake();
 
-        $this->setupDatabase($db);
+        $this->setupDatabase($db, $version);
 
         $this->actingAs($this->user);
 
@@ -199,7 +193,7 @@ public function test_restore_backup(string $db): void
 
         $storage = StorageProvider::factory()->create([
             'user_id' => $this->user->id,
-            'provider' => \App\Enums\StorageProvider::DROPBOX,
+            'provider' => Dropbox::id(),
         ]);
 
         $backup = Backup::factory()->create([
@@ -217,7 +211,7 @@ public function test_restore_backup(string $db): void
         ]), [
             'database' => $database->id,
         ])
-            ->assertSessionHasNoErrors();
+            ->assertSessionDoesntHaveErrors();
 
         $this->assertDatabaseHas('backup_files', [
             'id' => $backupFile->id,
@@ -225,14 +219,14 @@ public function test_restore_backup(string $db): void
         ]);
     }
 
-    private function setupDatabase(string $database): void
+    private function setupDatabase(string $database, string $version): void
     {
         $this->server->services()->where('type', 'database')->delete();
 
         $this->server->services()->create([
             'type' => 'database',
-            'name' => config('core.databases_name.'.$database),
-            'version' => config('core.databases_version.'.$database),
+            'name' => $database,
+            'version' => $version,
         ]);
     }
 
@@ -242,9 +236,9 @@ private function setupDatabase(string $database): void
     public static function data(): array
     {
         return [
-            [\App\Enums\Database::MYSQL80],
-            [\App\Enums\Database::MARIADB104],
-            [\App\Enums\Database::POSTGRESQL16],
+            ['mysql', '8.4'],
+            ['mariadb', '10.4'],
+            ['postgresql', '16'],
         ];
     }
 }
diff --git a/tests/Feature/NodeJSTest.php b/tests/Feature/NodeJSTest.php
index 1cbab054..9ceae7d8 100644
--- a/tests/Feature/NodeJSTest.php
+++ b/tests/Feature/NodeJSTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests\Feature;
 
-use App\Enums\NodeJS;
 use App\Enums\ServiceStatus;
 use App\Facades\SSH;
 use App\Models\Service;
@@ -25,7 +24,7 @@ public function test_change_default_nodejs_cli(): void
             'type' => 'nodejs',
             'type_data' => [],
             'name' => 'nodejs',
-            'version' => NodeJS::V16,
+            'version' => '16',
             'status' => ServiceStatus::READY,
             'is_default' => false,
         ]);
@@ -34,7 +33,7 @@ public function test_change_default_nodejs_cli(): void
             'server' => $this->server->id,
             'service' => $service->id,
         ]), [
-            'version' => NodeJS::V16,
+            'version' => '16',
         ])
             ->assertSessionDoesntHaveErrors();
 
diff --git a/tests/Feature/NotificationChannelsTest.php b/tests/Feature/NotificationChannelsTest.php
index 91635f5e..9dc2d125 100644
--- a/tests/Feature/NotificationChannelsTest.php
+++ b/tests/Feature/NotificationChannelsTest.php
@@ -2,7 +2,11 @@
 
 namespace Tests\Feature;
 
-use App\Enums\NotificationChannel;
+use App\Models\NotificationChannel;
+use App\NotificationChannels\Discord;
+use App\NotificationChannels\Email;
+use App\NotificationChannels\Slack;
+use App\NotificationChannels\Telegram;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Support\Facades\Http;
@@ -19,16 +23,16 @@ public function test_add_email_channel(): void
         $this->actingAs($this->user);
 
         $this->post(route('notification-channels.store'), [
-            'provider' => NotificationChannel::EMAIL,
+            'provider' => Email::id(),
             'email' => 'email@example.com',
             'name' => 'Email',
             'global' => true,
         ])
             ->assertSessionDoesntHaveErrors();
 
-        /** @var \App\Models\NotificationChannel $channel */
-        $channel = \App\Models\NotificationChannel::query()
-            ->where('provider', NotificationChannel::EMAIL)
+        /** @var NotificationChannel $channel */
+        $channel = NotificationChannel::query()
+            ->where('provider', Email::id())
             ->where('label', 'Email')
             ->whereNull('project_id')
             ->first();
@@ -45,15 +49,15 @@ public function test_cannot_add_email_channel(): void
         $this->actingAs($this->user);
 
         $this->post(route('notification-channels.store'), [
-            'provider' => NotificationChannel::EMAIL,
+            'provider' => Email::id(),
             'email' => 'email@example.com',
             'name' => 'Email',
             'global' => true,
         ]);
 
-        /** @var ?\App\Models\NotificationChannel $channel */
-        $channel = \App\Models\NotificationChannel::query()
-            ->where('provider', NotificationChannel::EMAIL)
+        /** @var ?NotificationChannel $channel */
+        $channel = NotificationChannel::query()
+            ->where('provider', Email::id())
             ->where('label', 'Email')
             ->first();
 
@@ -67,15 +71,15 @@ public function test_add_slack_channel(): void
         Http::fake();
 
         $this->post(route('notification-channels.store'), [
-            'provider' => NotificationChannel::SLACK,
+            'provider' => Slack::id(),
             'webhook_url' => 'https://hooks.slack.com/services/123/token',
             'name' => 'Slack',
         ])
             ->assertSessionDoesntHaveErrors();
 
-        /** @var \App\Models\NotificationChannel $channel */
-        $channel = \App\Models\NotificationChannel::query()
-            ->where('provider', NotificationChannel::SLACK)
+        /** @var NotificationChannel $channel */
+        $channel = NotificationChannel::query()
+            ->where('provider', Slack::id())
             ->first();
 
         $this->assertEquals('https://hooks.slack.com/services/123/token', $channel->data['webhook_url']);
@@ -91,7 +95,7 @@ public function test_cannot_add_slack_channel(): void
         ]);
 
         $this->post(route('notification-channels.store'), [
-            'provider' => NotificationChannel::SLACK,
+            'provider' => Slack::id(),
             'webhook_url' => 'https://hooks.slack.com/services/123/token',
             'name' => 'Slack',
         ])
@@ -99,9 +103,9 @@ public function test_cannot_add_slack_channel(): void
                 'provider' => 'Could not connect',
             ]);
 
-        /** @var ?\App\Models\NotificationChannel $channel */
-        $channel = \App\Models\NotificationChannel::query()
-            ->where('provider', NotificationChannel::SLACK)
+        /** @var ?NotificationChannel $channel */
+        $channel = NotificationChannel::query()
+            ->where('provider', Slack::id())
             ->first();
 
         $this->assertNull($channel);
@@ -114,15 +118,15 @@ public function test_add_discord_channel(): void
         Http::fake();
 
         $this->post(route('notification-channels.store'), [
-            'provider' => NotificationChannel::DISCORD,
+            'provider' => Discord::id(),
             'webhook_url' => 'https://discord.com/api/webhooks/123/token',
             'name' => 'Discord',
         ])
             ->assertSessionDoesntHaveErrors();
 
-        /** @var \App\Models\NotificationChannel $channel */
-        $channel = \App\Models\NotificationChannel::query()
-            ->where('provider', NotificationChannel::DISCORD)
+        /** @var NotificationChannel $channel */
+        $channel = NotificationChannel::query()
+            ->where('provider', Discord::id())
             ->first();
 
         $this->assertEquals('https://discord.com/api/webhooks/123/token', $channel->data['webhook_url']);
@@ -138,7 +142,7 @@ public function test_cannot_add_discord_channel(): void
         ]);
 
         $this->post(route('notification-channels.store'), [
-            'provider' => NotificationChannel::DISCORD,
+            'provider' => Discord::id(),
             'webhook_url' => 'https://discord.com/api/webhooks/123/token',
             'name' => 'Slack',
         ])
@@ -146,9 +150,9 @@ public function test_cannot_add_discord_channel(): void
                 'provider' => 'Could not connect',
             ]);
 
-        /** @var ?\App\Models\NotificationChannel $channel */
-        $channel = \App\Models\NotificationChannel::query()
-            ->where('provider', NotificationChannel::DISCORD)
+        /** @var ?NotificationChannel $channel */
+        $channel = NotificationChannel::query()
+            ->where('provider', Discord::id())
             ->first();
 
         $this->assertNull($channel);
@@ -161,16 +165,16 @@ public function test_add_telegram_channel(): void
         Http::fake();
 
         $this->post(route('notification-channels.store'), [
-            'provider' => NotificationChannel::TELEGRAM,
+            'provider' => Telegram::id(),
             'bot_token' => 'token',
             'chat_id' => '123',
             'name' => 'Telegram',
         ])
             ->assertSessionDoesntHaveErrors();
 
-        /** @var \App\Models\NotificationChannel $channel */
-        $channel = \App\Models\NotificationChannel::query()
-            ->where('provider', NotificationChannel::TELEGRAM)
+        /** @var NotificationChannel $channel */
+        $channel = NotificationChannel::query()
+            ->where('provider', Telegram::id())
             ->first();
 
         $this->assertEquals('123', $channel->data['chat_id']);
@@ -187,7 +191,7 @@ public function test_cannot_add_telegram_channel(): void
         ]);
 
         $this->post(route('notification-channels.store'), [
-            'provider' => NotificationChannel::TELEGRAM,
+            'provider' => Telegram::id(),
             'bot_token' => 'token',
             'chat_id' => '123',
             'name' => 'Telegram',
@@ -196,9 +200,9 @@ public function test_cannot_add_telegram_channel(): void
                 'provider' => 'Could not connect',
             ]);
 
-        /** @var ?\App\Models\NotificationChannel $channel */
-        $channel = \App\Models\NotificationChannel::query()
-            ->where('provider', NotificationChannel::TELEGRAM)
+        /** @var ?NotificationChannel $channel */
+        $channel = NotificationChannel::query()
+            ->where('provider', Telegram::id())
             ->first();
 
         $this->assertNull($channel);
@@ -208,7 +212,7 @@ public function test_see_channels_list(): void
     {
         $this->actingAs($this->user);
 
-        \App\Models\NotificationChannel::factory()->create();
+        NotificationChannel::factory()->create();
 
         $this->get(route('notification-channels'))
             ->assertInertia(fn (AssertableInertia $page) => $page->component('notification-channels/index'));
@@ -218,7 +222,7 @@ public function test_delete_channel(): void
     {
         $this->actingAs($this->user);
 
-        $channel = \App\Models\NotificationChannel::factory()->create();
+        $channel = NotificationChannel::factory()->create();
 
         $this->delete(route('notification-channels.destroy', [
             'notificationChannel' => $channel->id,
diff --git a/tests/Feature/ServerProvidersTest.php b/tests/Feature/ServerProvidersTest.php
index bb40a535..613a1ea0 100644
--- a/tests/Feature/ServerProvidersTest.php
+++ b/tests/Feature/ServerProvidersTest.php
@@ -2,11 +2,14 @@
 
 namespace Tests\Feature;
 
-use App\Enums\ServerProvider;
+use App\Models\ServerProvider;
+use App\ServerProviders\DigitalOcean;
+use App\ServerProviders\Hetzner;
+use App\ServerProviders\Linode;
+use App\ServerProviders\Vultr;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Http;
 use Inertia\Testing\AssertableInertia;
-use JsonException;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\TestCase;
 
@@ -16,8 +19,6 @@ class ServerProvidersTest extends TestCase
 
     /**
      * @param  array<string, mixed>  $input
-     *
-     * @throws JsonException
      */
     #[DataProvider('data')]
     public function test_connect_provider(string $provider, array $input): void
@@ -34,7 +35,7 @@ public function test_connect_provider(string $provider, array $input): void
             $input
         );
         $this->post(route('server-providers.store'), $data)
-            ->assertSessionHasNoErrors();
+            ->assertSessionDoesntHaveErrors();
 
         $this->assertDatabaseHas('server_providers', [
             'provider' => $provider,
@@ -75,7 +76,7 @@ public function test_see_providers_list(): void
     {
         $this->actingAs($this->user);
 
-        \App\Models\ServerProvider::factory()->create([
+        ServerProvider::factory()->create([
             'user_id' => $this->user->id,
         ]);
 
@@ -84,21 +85,18 @@ public function test_see_providers_list(): void
             ->assertInertia(fn (AssertableInertia $page) => $page->component('server-providers/index'));
     }
 
-    /**
-     * @throws JsonException
-     */
     #[DataProvider('data')]
     public function test_delete_provider(string $provider): void
     {
         $this->actingAs($this->user);
 
-        $provider = \App\Models\ServerProvider::factory()->create([
+        $provider = ServerProvider::factory()->create([
             'user_id' => $this->user->id,
             'provider' => $provider,
         ]);
 
         $this->delete(route('server-providers.destroy', $provider))
-            ->assertSessionHasNoErrors()
+            ->assertSessionDoesntHaveErrors()
             ->assertRedirect(route('server-providers'));
 
         $this->assertDatabaseMissing('server_providers', [
@@ -111,7 +109,7 @@ public function test_cannot_delete_provider(string $provider): void
     {
         $this->actingAs($this->user);
 
-        $provider = \App\Models\ServerProvider::factory()->create([
+        $provider = ServerProvider::factory()->create([
             'user_id' => $this->user->id,
             'provider' => $provider,
         ]);
@@ -144,32 +142,32 @@ public static function data(): array
             //     ],
             // ],
             [
-                ServerProvider::LINODE,
+                Linode::id(),
                 [
                     'token' => 'token',
                 ],
             ],
             [
-                ServerProvider::LINODE,
+                Linode::id(),
                 [
                     'token' => 'token',
                     'global' => 1,
                 ],
             ],
             [
-                ServerProvider::DIGITALOCEAN,
+                DigitalOcean::id(),
                 [
                     'token' => 'token',
                 ],
             ],
             [
-                ServerProvider::VULTR,
+                Vultr::id(),
                 [
                     'token' => 'token',
                 ],
             ],
             [
-                ServerProvider::HETZNER,
+                Hetzner::id(),
                 [
                     'token' => 'token',
                 ],
diff --git a/tests/Feature/ServerTest.php b/tests/Feature/ServerTest.php
index cf95aa29..a1fa318d 100644
--- a/tests/Feature/ServerTest.php
+++ b/tests/Feature/ServerTest.php
@@ -2,38 +2,37 @@
 
 namespace Tests\Feature;
 
-use App\Enums\Database;
 use App\Enums\OperatingSystem;
-use App\Enums\ServerProvider;
 use App\Enums\ServerStatus;
 use App\Enums\ServiceStatus;
-use App\Enums\Webserver;
 use App\Facades\SSH;
+use App\Models\ServerProvider;
 use App\NotificationChannels\Email\NotificationMail;
+use App\ServerProviders\Custom;
+use App\ServerProviders\Hetzner;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Storage;
 use Tests\TestCase;
 
 class ServerTest extends TestCase
 {
     use RefreshDatabase;
 
-    public function test_create_regular_server(): void
+    public function test_create_server(): void
     {
         $this->actingAs($this->user);
 
+        Storage::fake();
         SSH::fake('Active: active'); // fake output for service installations
 
         $this->post(route('servers.store', [
-            'provider' => ServerProvider::CUSTOM,
+            'provider' => Custom::id(),
             'name' => 'test',
             'ip' => '1.1.1.1',
             'port' => '22',
             'os' => OperatingSystem::UBUNTU22,
-            'webserver' => Webserver::NGINX,
-            'database' => Database::MYSQL80,
-            'php' => '8.2',
         ]))
             ->assertSessionDoesntHaveErrors();
 
@@ -45,85 +44,6 @@ public function test_create_regular_server(): void
 
         $this->assertDatabaseHas('services', [
             'server_id' => 1,
-            'type' => 'php',
-            'version' => '8.2',
-            'status' => ServiceStatus::READY,
-        ]);
-
-        $this->assertDatabaseHas('services', [
-            'server_id' => 1,
-            'type' => 'webserver',
-            'name' => 'nginx',
-            'version' => 'latest',
-            'status' => ServiceStatus::READY,
-        ]);
-
-        $this->assertDatabaseHas('services', [
-            'server_id' => 1,
-            'type' => 'database',
-            'name' => 'mysql',
-            'version' => '8.0',
-            'status' => ServiceStatus::READY,
-        ]);
-
-        $this->assertDatabaseHas('services', [
-            'server_id' => 1,
-            'type' => 'firewall',
-            'name' => 'ufw',
-            'version' => 'latest',
-            'status' => ServiceStatus::READY,
-        ]);
-    }
-
-    public function test_create_regular_server_with_caddy(): void
-    {
-        $this->actingAs($this->user);
-
-        SSH::fake('Active: active'); // fake output for service installations
-
-        $this->post(route('servers.store', [
-            'provider' => ServerProvider::CUSTOM,
-            'name' => 'caddy-test',
-            'ip' => '2.2.2.2',
-            'port' => '22',
-            'os' => OperatingSystem::UBUNTU22,
-            'webserver' => Webserver::CADDY,
-            'database' => Database::MYSQL80,
-            'php' => '8.2',
-        ]))
-            ->assertSessionDoesntHaveErrors();
-
-        $this->assertDatabaseHas('servers', [
-            'name' => 'caddy-test',
-            'ip' => '2.2.2.2',
-            'status' => ServerStatus::READY,
-        ]);
-
-        $this->assertDatabaseHas('services', [
-            'server_id' => 2,
-            'type' => 'php',
-            'version' => '8.2',
-            'status' => ServiceStatus::READY,
-        ]);
-
-        $this->assertDatabaseHas('services', [
-            'server_id' => 2,
-            'type' => 'webserver',
-            'name' => 'caddy',
-            'version' => 'latest',
-            'status' => ServiceStatus::READY,
-        ]);
-
-        $this->assertDatabaseHas('services', [
-            'server_id' => 2,
-            'type' => 'database',
-            'name' => 'mysql',
-            'version' => '8.0',
-            'status' => ServiceStatus::READY,
-        ]);
-
-        $this->assertDatabaseHas('services', [
-            'server_id' => 2,
             'type' => 'firewall',
             'name' => 'ufw',
             'version' => 'latest',
@@ -156,16 +76,16 @@ public function test_cannot_delete_on_provider(): void
 
         $this->actingAs($this->user);
 
-        $provider = \App\Models\ServerProvider::factory()->create([
+        $provider = ServerProvider::factory()->create([
             'user_id' => $this->user->id,
-            'provider' => ServerProvider::HETZNER,
+            'provider' => Hetzner::id(),
             'credentials' => [
                 'token' => 'token',
             ],
         ]);
 
         $this->server->update([
-            'provider' => ServerProvider::HETZNER,
+            'provider' => Hetzner::id(),
             'provider_id' => $provider->id,
             'provider_data' => [
                 'hetzner_id' => 1,
diff --git a/tests/Feature/SitesTest.php b/tests/Feature/SitesTest.php
index fa544c8e..ec45cd54 100644
--- a/tests/Feature/SitesTest.php
+++ b/tests/Feature/SitesTest.php
@@ -4,10 +4,15 @@
 
 use App\Enums\LoadBalancerMethod;
 use App\Enums\SiteStatus;
-use App\Enums\SiteType;
-use App\Enums\SourceControl;
 use App\Facades\SSH;
 use App\Models\Site;
+use App\Models\SourceControl;
+use App\SiteTypes\Laravel;
+use App\SiteTypes\LoadBalancer;
+use App\SiteTypes\PHPBlank;
+use App\SiteTypes\PHPMyAdmin;
+use App\SiteTypes\Wordpress;
+use App\SourceControlProviders\Github;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Http;
 use Inertia\Testing\AssertableInertia;
@@ -33,9 +38,9 @@ public function test_create_site(array $inputs): void
 
         $this->actingAs($this->user);
 
-        /** @var \App\Models\SourceControl $sourceControl */
-        $sourceControl = \App\Models\SourceControl::factory()->create([
-            'provider' => SourceControl::GITHUB,
+        /** @var SourceControl $sourceControl */
+        $sourceControl = SourceControl::factory()->create([
+            'provider' => Github::id(),
         ]);
 
         $inputs['source_control'] = $sourceControl->id;
@@ -70,7 +75,7 @@ public function test_isolated_user_failure(array $inputs): void
     public function test_create_site_failed_due_to_source_control(int $status): void
     {
         $inputs = [
-            'type' => SiteType::LARAVEL,
+            'type' => Laravel::id(),
             'domain' => 'example.com',
             'aliases' => ['www.example.com'],
             'php_version' => '8.2',
@@ -89,9 +94,9 @@ public function test_create_site_failed_due_to_source_control(int $status): void
 
         $this->actingAs($this->user);
 
-        /** @var \App\Models\SourceControl $sourceControl */
-        $sourceControl = \App\Models\SourceControl::factory()->create([
-            'provider' => SourceControl::GITHUB,
+        /** @var SourceControl $sourceControl */
+        $sourceControl = SourceControl::factory()->create([
+            'provider' => Github::id(),
         ]);
 
         $inputs['source_control'] = $sourceControl->id;
@@ -177,9 +182,9 @@ public function test_update_source_control(): void
             ], 201),
         ]);
 
-        /** @var \App\Models\SourceControl $sourceControl */
-        $sourceControl = \App\Models\SourceControl::factory()->create([
-            'provider' => SourceControl::GITHUB,
+        /** @var SourceControl $sourceControl */
+        $sourceControl = SourceControl::factory()->create([
+            'provider' => Github::id(),
         ]);
 
         $this->patch(route('site-settings.update-source-control', [
@@ -206,9 +211,9 @@ public function test_failed_to_update_source_control(): void
             ], 404),
         ]);
 
-        /** @var \App\Models\SourceControl $sourceControl */
-        $sourceControl = \App\Models\SourceControl::factory()->create([
-            'provider' => SourceControl::GITHUB,
+        /** @var SourceControl $sourceControl */
+        $sourceControl = SourceControl::factory()->create([
+            'provider' => Github::id(),
         ]);
 
         $this->patch(route('site-settings.update-source-control', [
@@ -279,7 +284,7 @@ public static function failure_create_data(): array
         return [
             [
                 [
-                    'type' => SiteType::PHP_BLANK,
+                    'type' => PHPBlank::id(),
                     'domain' => 'example.com',
                     'aliases' => ['www.example.com'],
                     'php_version' => '8.2',
@@ -289,7 +294,7 @@ public static function failure_create_data(): array
             ],
             [
                 [
-                    'type' => SiteType::PHP_BLANK,
+                    'type' => PHPBlank::id(),
                     'domain' => 'example.com',
                     'aliases' => ['www.example.com'],
                     'php_version' => '8.2',
@@ -299,7 +304,7 @@ public static function failure_create_data(): array
             ],
             [
                 [
-                    'type' => SiteType::PHP_BLANK,
+                    'type' => PHPBlank::id(),
                     'domain' => 'example.com',
                     'aliases' => ['www.example.com'],
                     'php_version' => '8.2',
@@ -309,7 +314,7 @@ public static function failure_create_data(): array
             ],
             [
                 [
-                    'type' => SiteType::PHP_BLANK,
+                    'type' => PHPBlank::id(),
                     'domain' => 'example.com',
                     'aliases' => ['www.example.com'],
                     'php_version' => '8.2',
@@ -319,7 +324,7 @@ public static function failure_create_data(): array
             ],
             [
                 [
-                    'type' => SiteType::PHP_BLANK,
+                    'type' => PHPBlank::id(),
                     'domain' => 'example.com',
                     'aliases' => ['www.example.com'],
                     'php_version' => '8.2',
@@ -338,7 +343,7 @@ public static function create_data(): array
         return [
             [
                 [
-                    'type' => SiteType::LARAVEL,
+                    'type' => Laravel::id(),
                     'domain' => 'example.com',
                     'aliases' => ['www.example.com', 'www2.example.com'],
                     'php_version' => '8.2',
@@ -350,7 +355,7 @@ public static function create_data(): array
             ],
             [
                 [
-                    'type' => SiteType::LARAVEL,
+                    'type' => Laravel::id(),
                     'domain' => 'example.com',
                     'aliases' => ['www.example.com', 'www2.example.com'],
                     'php_version' => '8.2',
@@ -363,7 +368,7 @@ public static function create_data(): array
             ],
             [
                 [
-                    'type' => SiteType::WORDPRESS,
+                    'type' => Wordpress::id(),
                     'domain' => 'example.com',
                     'aliases' => ['www.example.com'],
                     'php_version' => '8.2',
@@ -380,7 +385,7 @@ public static function create_data(): array
             ],
             [
                 [
-                    'type' => SiteType::WORDPRESS,
+                    'type' => Wordpress::id(),
                     'domain' => 'example.com',
                     'aliases' => ['www.example.com'],
                     'php_version' => '8.2',
@@ -398,7 +403,7 @@ public static function create_data(): array
             ],
             [
                 [
-                    'type' => SiteType::PHP_BLANK,
+                    'type' => PHPBlank::id(),
                     'domain' => 'example.com',
                     'aliases' => ['www.example.com'],
                     'php_version' => '8.2',
@@ -407,7 +412,7 @@ public static function create_data(): array
             ],
             [
                 [
-                    'type' => SiteType::PHP_BLANK,
+                    'type' => PHPBlank::id(),
                     'domain' => 'example.com',
                     'aliases' => ['www.example.com'],
                     'php_version' => '8.2',
@@ -417,7 +422,7 @@ public static function create_data(): array
             ],
             [
                 [
-                    'type' => SiteType::PHPMYADMIN,
+                    'type' => PHPMyAdmin::id(),
                     'domain' => 'example.com',
                     'aliases' => ['www.example.com'],
                     'php_version' => '8.2',
@@ -426,7 +431,7 @@ public static function create_data(): array
             ],
             [
                 [
-                    'type' => SiteType::PHPMYADMIN,
+                    'type' => PHPMyAdmin::id(),
                     'domain' => 'example.com',
                     'aliases' => ['www.example.com'],
                     'php_version' => '8.2',
@@ -436,7 +441,7 @@ public static function create_data(): array
             ],
             [
                 [
-                    'type' => SiteType::LOAD_BALANCER,
+                    'type' => LoadBalancer::id(),
                     'domain' => 'example.com',
                     'aliases' => ['www.example.com'],
                     'user' => 'example',
diff --git a/tests/Feature/SourceControlsTest.php b/tests/Feature/SourceControlsTest.php
index dfca5642..00221c24 100644
--- a/tests/Feature/SourceControlsTest.php
+++ b/tests/Feature/SourceControlsTest.php
@@ -3,6 +3,9 @@
 namespace Tests\Feature;
 
 use App\Models\SourceControl;
+use App\SourceControlProviders\Bitbucket;
+use App\SourceControlProviders\Github;
+use App\SourceControlProviders\Gitlab;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Http;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -38,7 +41,7 @@ public function test_connect_provider(string $provider, ?string $customUrl, arra
             'url' => $customUrl,
         ]);
 
-        if (isset($input['global'])) {
+        if (isset($input['global']) && $input['global']) {
             $this->assertDatabaseHas('source_controls', [
                 'provider' => $provider,
                 'url' => $customUrl,
@@ -132,11 +135,11 @@ public function test_edit_source_control(string $provider, ?string $url, array $
     public static function data(): array
     {
         return [
-            ['github', null, ['token' => 'test']],
-            ['github', null, ['token' => 'test', 'global' => '1']],
-            ['gitlab', null, ['token' => 'test']],
-            ['gitlab', 'https://git.example.com/', ['token' => 'test']],
-            ['bitbucket', null, ['username' => 'test', 'password' => 'test']],
+            [Github::id(), null, ['token' => 'test']],
+            [Github::id(), null, ['token' => 'test', 'global' => true]],
+            [Gitlab::id(), null, ['token' => 'test']],
+            [Gitlab::id(), 'https://git.example.com/', ['token' => 'test']],
+            [Bitbucket::id(), null, ['username' => 'test', 'password' => 'test']],
         ];
     }
 }
diff --git a/tests/Feature/StorageProvidersTest.php b/tests/Feature/StorageProvidersTest.php
index 8d15ddcf..55736ff1 100644
--- a/tests/Feature/StorageProvidersTest.php
+++ b/tests/Feature/StorageProvidersTest.php
@@ -2,11 +2,12 @@
 
 namespace Tests\Feature;
 
-use App\Enums\StorageProvider;
 use App\Facades\FTP;
 use App\Models\Backup;
 use App\Models\Database;
 use App\Models\StorageProvider as StorageProviderModel;
+use App\StorageProviders\Dropbox;
+use App\StorageProviders\Local;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Http;
 use Inertia\Testing\AssertableInertia;
@@ -25,17 +26,17 @@ public function test_create(array $input): void
     {
         $this->actingAs($this->user);
 
-        if ($input['provider'] === StorageProvider::DROPBOX) {
+        if ($input['provider'] === Dropbox::id()) {
             Http::fake();
         }
 
-        if ($input['provider'] === StorageProvider::FTP) {
+        if ($input['provider'] === \App\StorageProviders\FTP::id()) {
             FTP::fake();
         }
 
         $this->post(route('storage-providers.store'), $input);
 
-        if ($input['provider'] === StorageProvider::FTP) {
+        if ($input['provider'] === \App\StorageProviders\FTP::id()) {
             FTP::assertConnected($input['host']);
         }
 
@@ -52,7 +53,7 @@ public function test_see_providers_list(): void
 
         StorageProviderModel::factory()->create([
             'user_id' => $this->user->id,
-            'provider' => StorageProvider::DROPBOX,
+            'provider' => Dropbox::id(),
         ]);
 
         $this->get(route('storage-providers'))
@@ -111,14 +112,14 @@ public static function createData(): array
         return [
             [
                 [
-                    'provider' => StorageProvider::LOCAL,
+                    'provider' => Local::id(),
                     'name' => 'local-test',
                     'path' => '/home/vito/backups',
                 ],
             ],
             [
                 [
-                    'provider' => StorageProvider::LOCAL,
+                    'provider' => Local::id(),
                     'name' => 'local-test',
                     'path' => '/home/vito/backups',
                     'global' => 1,
@@ -126,7 +127,7 @@ public static function createData(): array
             ],
             [
                 [
-                    'provider' => StorageProvider::FTP,
+                    'provider' => \App\StorageProviders\FTP::id(),
                     'name' => 'ftp-test',
                     'host' => '1.2.3.4',
                     'port' => '22',
@@ -139,7 +140,7 @@ public static function createData(): array
             ],
             [
                 [
-                    'provider' => StorageProvider::FTP,
+                    'provider' => \App\StorageProviders\FTP::id(),
                     'name' => 'ftp-test',
                     'host' => '1.2.3.4',
                     'port' => '22',
@@ -153,14 +154,14 @@ public static function createData(): array
             ],
             [
                 [
-                    'provider' => StorageProvider::DROPBOX,
+                    'provider' => Dropbox::id(),
                     'name' => 'dropbox-test',
                     'token' => 'token',
                 ],
             ],
             [
                 [
-                    'provider' => StorageProvider::DROPBOX,
+                    'provider' => Dropbox::id(),
                     'name' => 'dropbox-test',
                     'token' => 'token',
                     'global' => 1,
diff --git a/tests/Feature/WorkersTest.php b/tests/Feature/WorkersTest.php
index 51b0182c..61dc5a01 100644
--- a/tests/Feature/WorkersTest.php
+++ b/tests/Feature/WorkersTest.php
@@ -62,6 +62,7 @@ public function test_create_worker(): void
         $this->post(route('workers.store', [
             'server' => $this->server,
         ]), [
+            'name' => 'Test Worker',
             'command' => 'php artisan worker:work',
             'user' => 'vito',
             'auto_start' => 1,
@@ -72,6 +73,7 @@ public function test_create_worker(): void
 
         $this->assertDatabaseHas('workers', [
             'server_id' => $this->server->id,
+            'name' => 'Test Worker',
             'command' => 'php artisan worker:work',
             'user' => 'vito',
             'auto_start' => 1,
@@ -94,6 +96,7 @@ public function test_create_worker_as_isolated_user(): void
             'server' => $this->server,
             'site' => $this->site,
         ]), [
+            'name' => 'Test Worker',
             'command' => 'php artisan worker:work',
             'user' => 'example',
             'auto_start' => 1,
@@ -124,6 +127,7 @@ public function test_cannot_create_worker_as_invalid_user(): void
             'server' => $this->server,
             'site' => $this->site,
         ]), [
+            'name' => 'Test Worker',
             'command' => 'php artisan worker:work',
             'user' => 'example',
             'auto_start' => 1,
@@ -154,6 +158,7 @@ public function test_cannot_create_worker_on_another_sites_user(): void
             'server' => $this->server,
             'site' => $this->site,
         ]), [
+            'name' => 'Test Worker',
             'command' => 'php artisan worker:work',
             'user' => 'example',
             'auto_start' => 1,
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 072a107c..889c4a5a 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -2,16 +2,21 @@
 
 namespace Tests;
 
-use App\Enums\Database;
 use App\Enums\ServiceStatus;
 use App\Enums\UserRole;
-use App\Enums\Webserver;
 use App\Models\NotificationChannel;
 use App\Models\Redirect;
 use App\Models\Server;
 use App\Models\Site;
 use App\Models\SourceControl;
 use App\Models\User;
+use App\NotificationChannels\Email;
+use App\Services\Database\Mysql;
+use App\Services\Firewall\Ufw;
+use App\Services\PHP\PHP;
+use App\Services\ProcessManager\Supervisor;
+use App\Services\Redis\Redis;
+use App\Services\Webserver\Nginx;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
 use Illuminate\Support\Facades\File;
 
@@ -46,7 +51,7 @@ protected function setUp(): void
         $this->user->createDefaultProject();
 
         $this->notificationChannel = NotificationChannel::factory()->create([
-            'provider' => \App\Enums\NotificationChannel::EMAIL,
+            'provider' => Email::id(),
             'connected' => true,
             'data' => [
                 'email' => 'user@example.com',
@@ -81,10 +86,35 @@ private function setupServer(): void
             $this->server->provider()->generateKeyPair();
         }
 
-        $this->server->type()->createServices([
-            'webserver' => Webserver::NGINX,
-            'database' => Database::MYSQL80,
-            'php' => '8.2',
+        $this->server->services()->create([
+            'type' => Nginx::type(),
+            'name' => Nginx::id(),
+            'version' => 'latest',
+        ]);
+        $this->server->services()->create([
+            'type' => Mysql::type(),
+            'name' => Mysql::id(),
+            'version' => '8.0',
+        ]);
+        $this->server->services()->create([
+            'type' => PHP::type(),
+            'name' => PHP::id(),
+            'version' => '8.2',
+        ]);
+        $this->server->services()->create([
+            'type' => Ufw::type(),
+            'name' => Ufw::id(),
+            'version' => 'latest',
+        ]);
+        $this->server->services()->create([
+            'type' => Supervisor::type(),
+            'name' => Supervisor::id(),
+            'version' => 'latest',
+        ]);
+        $this->server->services()->create([
+            'type' => Redis::type(),
+            'name' => Redis::id(),
+            'version' => 'latest',
         ]);
 
         $this->server->services()->update([
diff --git a/tests/Traits/PrepareLoadBalancer.php b/tests/Traits/PrepareLoadBalancer.php
index 1b006ae7..c515f799 100644
--- a/tests/Traits/PrepareLoadBalancer.php
+++ b/tests/Traits/PrepareLoadBalancer.php
@@ -2,20 +2,18 @@
 
 namespace Tests\Traits;
 
-use App\Enums\Database;
 use App\Enums\LoadBalancerMethod;
-use App\Enums\PHP;
 use App\Enums\ServiceStatus;
-use App\Enums\SiteType;
-use App\Enums\Webserver;
 use App\Models\Server;
 use App\Models\Site;
+use App\SiteTypes\LoadBalancer;
+use App\SiteTypes\PHPBlank;
 
 trait PrepareLoadBalancer
 {
     private function prepare(): void
     {
-        $this->site->type = SiteType::LOAD_BALANCER;
+        $this->site->type = LoadBalancer::id();
         $this->site->type_data = [
             'method' => LoadBalancerMethod::ROUND_ROBIN,
         ];
@@ -26,11 +24,6 @@ private function prepare(): void
             'project_id' => $this->user->current_project_id,
         ]);
         foreach ($servers as $server) {
-            $server->type()->createServices([
-                'webserver' => Webserver::NGINX,
-                'database' => Database::NONE,
-                'php' => PHP::NONE,
-            ]);
             $server->services()->update([
                 'status' => ServiceStatus::READY,
             ]);
@@ -38,7 +31,7 @@ private function prepare(): void
                 'domain' => 'vito.test',
                 'aliases' => ['www.vito.test'],
                 'server_id' => $server->id,
-                'type' => SiteType::PHP_BLANK,
+                'type' => PHPBlank::id(),
                 'path' => '/home/vito/vito.test',
                 'web_directory' => '',
             ]);
diff --git a/tests/Unit/Actions/Service/InstallTest.php b/tests/Unit/Actions/Service/InstallTest.php
index 2615a7f1..233301ae 100644
--- a/tests/Unit/Actions/Service/InstallTest.php
+++ b/tests/Unit/Actions/Service/InstallTest.php
@@ -21,7 +21,7 @@ public function test_install_vito_agent(): void
             'https://api.github.com/repos/vitodeploy/agent/tags' => Http::response([['name' => '0.1.0']]),
         ]);
 
-        $this->server->monitoring()->delete();
+        $this->server->monitoring()?->delete();
 
         app(Install::class)->install($this->server, [
             'type' => 'monitoring',
@@ -40,7 +40,7 @@ public function test_install_vito_agent(): void
 
     public function test_install_vito_agent_failed(): void
     {
-        $this->server->monitoring()->delete();
+        $this->server->monitoring()?->delete();
         $this->expectExceptionMessage('Failed to fetch tags');
         SSH::fake('Active: inactive');
         Http::fake([
diff --git a/tests/Unit/Actions/Service/UninstallTest.php b/tests/Unit/Actions/Service/UninstallTest.php
index 0820cd2c..d6cada88 100644
--- a/tests/Unit/Actions/Service/UninstallTest.php
+++ b/tests/Unit/Actions/Service/UninstallTest.php
@@ -20,7 +20,7 @@ public function test_uninstall_vito_agent(): void
     {
         SSH::fake();
 
-        $this->server->monitoring()->delete();
+        $this->server->monitoring()?->delete();
 
         $service = Service::factory()->create([
             'server_id' => $this->server->id,
diff --git a/tests/Unit/Commands/RunBackupCommandTest.php b/tests/Unit/Commands/RunBackupCommandTest.php
index 6b81ae3b..0aaaafe4 100644
--- a/tests/Unit/Commands/RunBackupCommandTest.php
+++ b/tests/Unit/Commands/RunBackupCommandTest.php
@@ -6,6 +6,7 @@
 use App\Models\Backup;
 use App\Models\Database;
 use App\Models\StorageProvider;
+use App\StorageProviders\Dropbox;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
@@ -29,7 +30,7 @@ public function test_run_backups(): void
 
         $storage = StorageProvider::factory()->create([
             'user_id' => $this->user->id,
-            'provider' => \App\Enums\StorageProvider::DROPBOX,
+            'provider' => Dropbox::id(),
         ]);
 
         $backup = Backup::factory()->create([
diff --git a/tests/Unit/SSH/Services/Database/GetCharsetsTest.php b/tests/Unit/SSH/Services/Database/GetCharsetsTest.php
index 4b4e1fba..ab3944cf 100644
--- a/tests/Unit/SSH/Services/Database/GetCharsetsTest.php
+++ b/tests/Unit/SSH/Services/Database/GetCharsetsTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Unit\SSH\Services\Database;
 
 use App\Facades\SSH;
-use App\SSH\Services\Database\Database;
+use App\Services\Database\Database;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\TestCase;
 
diff --git a/tests/Unit/SSH/Services/Database/GetDatabasesTest.php b/tests/Unit/SSH/Services/Database/GetDatabasesTest.php
index cbe731d2..082ffcd0 100644
--- a/tests/Unit/SSH/Services/Database/GetDatabasesTest.php
+++ b/tests/Unit/SSH/Services/Database/GetDatabasesTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Unit\SSH\Services\Database;
 
 use App\Facades\SSH;
-use App\SSH\Services\Database\Database;
+use App\Services\Database\Database;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\TestCase;
 
diff --git a/tests/Unit/SSH/Services/Database/GetUsersTest.php b/tests/Unit/SSH/Services/Database/GetUsersTest.php
index 3a35d9a5..6eee867b 100644
--- a/tests/Unit/SSH/Services/Database/GetUsersTest.php
+++ b/tests/Unit/SSH/Services/Database/GetUsersTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Unit\SSH\Services\Database;
 
 use App\Facades\SSH;
-use App\SSH\Services\Database\Database;
+use App\Services\Database\Database;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\TestCase;
 
diff --git a/tests/Unit/StorageProviders/S3Test.php b/tests/Unit/StorageProviders/S3Test.php
index cc5b1b27..facbdd41 100644
--- a/tests/Unit/StorageProviders/S3Test.php
+++ b/tests/Unit/StorageProviders/S3Test.php
@@ -2,7 +2,6 @@
 
 namespace Tests\Unit\StorageProviders;
 
-use App\Enums\StorageProvider;
 use App\Models\StorageProvider as StorageProviderModel;
 use App\StorageProviders\S3;
 use Aws\Command;
@@ -18,7 +17,7 @@ class S3Test extends TestCase
     public function test_s3_connect_successful(): void
     {
         $storageProvider = StorageProviderModel::factory()->create([
-            'provider' => StorageProvider::S3,
+            'provider' => S3::id(),
             'credentials' => [
                 'api_url' => 'https://fake-bucket.s3.us-east-1.s3-compatible.com',
                 'key' => 'fake-key',
@@ -62,7 +61,7 @@ public function test_s3_connect_successful(): void
     public function test_s3_connect_failure(): void
     {
         $storageProvider = StorageProviderModel::factory()->create([
-            'provider' => StorageProvider::S3,
+            'provider' => S3::id(),
             'credentials' => [
                 'key' => 'fake-key',
                 'secret' => 'fake-secret',