diff --git a/app/Livewire/Project/Service/Database.php b/app/Livewire/Project/Service/Database.php
deleted file mode 100644
index e53fb682b..000000000
--- a/app/Livewire/Project/Service/Database.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-
-namespace App\Livewire\Project\Service;
-
-use App\Actions\Database\StartDatabaseProxy;
-use App\Actions\Database\StopDatabaseProxy;
-use App\Models\ServiceDatabase;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Support\Facades\DB;
-use Livewire\Component;
-
-class Database extends Component
-{
-    use AuthorizesRequests;
-
-    public ServiceDatabase $database;
-
-    public ?string $db_url_public = null;
-
-    public $fileStorages;
-
-    public $parameters;
-
-    public ?string $humanName = null;
-
-    public ?string $description = null;
-
-    public ?string $image = null;
-
-    public bool $excludeFromStatus = false;
-
-    public ?int $publicPort = null;
-
-    public ?int $proxyTimeout = null;
-
-    public bool $isPublic = false;
-
-    public bool $isLogDrainEnabled = false;
-
-    protected $listeners = ['refreshFileStorages'];
-
-    protected $rules = [
-        'humanName' => 'nullable',
-        'description' => 'nullable',
-        'image' => 'required',
-        'excludeFromStatus' => 'required|boolean',
-        'publicPort' => 'nullable|integer',
-        'proxyTimeout' => 'nullable|integer|min:0|max:31536000',
-        'isPublic' => 'required|boolean',
-        'isLogDrainEnabled' => 'required|boolean',
-    ];
-
-    public function render()
-    {
-        return view('livewire.project.service.database');
-    }
-
-    public function mount()
-    {
-        try {
-            $this->parameters = get_route_parameters();
-            $this->authorize('view', $this->database);
-            if ($this->database->is_public) {
-                $this->db_url_public = $this->database->getServiceDatabaseUrl();
-            }
-            $this->refreshFileStorages();
-            $this->syncData(false);
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    private function syncData(bool $toModel = false): void
-    {
-        if ($toModel) {
-            $this->database->human_name = $this->humanName;
-            $this->database->description = $this->description;
-            $this->database->image = $this->image;
-            $this->database->exclude_from_status = $this->excludeFromStatus;
-            $this->database->public_port = $this->publicPort;
-            $this->database->proxy_timeout = $this->proxyTimeout;
-            $this->database->is_public = $this->isPublic;
-            $this->database->is_log_drain_enabled = $this->isLogDrainEnabled;
-        } else {
-            $this->humanName = $this->database->human_name;
-            $this->description = $this->database->description;
-            $this->image = $this->database->image;
-            $this->excludeFromStatus = $this->database->exclude_from_status ?? false;
-            $this->publicPort = $this->database->public_port;
-            $this->proxyTimeout = $this->database->proxy_timeout;
-            $this->isPublic = $this->database->is_public ?? false;
-            $this->isLogDrainEnabled = $this->database->is_log_drain_enabled ?? false;
-        }
-    }
-
-    public function delete($password)
-    {
-        try {
-            $this->authorize('delete', $this->database);
-
-            if (! verifyPasswordConfirmation($password, $this)) {
-                return;
-            }
-
-            $this->database->delete();
-            $this->dispatch('success', 'Database deleted.');
-
-            return redirect()->route('project.service.configuration', $this->parameters);
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    public function instantSaveExclude()
-    {
-        try {
-            $this->authorize('update', $this->database);
-            $this->submit();
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    public function instantSaveLogDrain()
-    {
-        try {
-            $this->authorize('update', $this->database);
-            if (! $this->database->service->destination->server->isLogDrainEnabled()) {
-                $this->isLogDrainEnabled = false;
-                $this->dispatch('error', 'Log drain is not enabled on the server. Please enable it first.');
-
-                return;
-            }
-            $this->submit();
-            $this->dispatch('success', 'You need to restart the service for the changes to take effect.');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    public function convertToApplication()
-    {
-        try {
-            $this->authorize('update', $this->database);
-            $service = $this->database->service;
-            $serviceDatabase = $this->database;
-
-            // Check if application with same name already exists
-            if ($service->applications()->where('name', $serviceDatabase->name)->exists()) {
-                throw new \Exception('An application with this name already exists.');
-            }
-
-            // Create new parameters removing database_uuid
-            $redirectParams = collect($this->parameters)
-                ->except('database_uuid')
-                ->all();
-
-            DB::transaction(function () use ($service, $serviceDatabase) {
-                $service->applications()->create([
-                    'name' => $serviceDatabase->name,
-                    'human_name' => $serviceDatabase->human_name,
-                    'description' => $serviceDatabase->description,
-                    'exclude_from_status' => $serviceDatabase->exclude_from_status,
-                    'is_log_drain_enabled' => $serviceDatabase->is_log_drain_enabled,
-                    'image' => $serviceDatabase->image,
-                    'service_id' => $service->id,
-                    'is_migrated' => true,
-                ]);
-                $serviceDatabase->delete();
-            });
-
-            return redirect()->route('project.service.configuration', $redirectParams);
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    public function instantSave()
-    {
-        try {
-            $this->authorize('update', $this->database);
-            if ($this->isPublic && ! $this->publicPort) {
-                $this->dispatch('error', 'Public port is required.');
-                $this->isPublic = false;
-
-                return;
-            }
-            $this->syncData(true);
-            if ($this->database->is_public) {
-                if (! str($this->database->status)->startsWith('running')) {
-                    $this->dispatch('error', 'Database must be started to be publicly accessible.');
-                    $this->isPublic = false;
-                    $this->database->is_public = false;
-
-                    return;
-                }
-                StartDatabaseProxy::run($this->database);
-                $this->db_url_public = $this->database->getServiceDatabaseUrl();
-                $this->dispatch('success', 'Database is now publicly accessible.');
-            } else {
-                StopDatabaseProxy::run($this->database);
-                $this->db_url_public = null;
-                $this->dispatch('success', 'Database is no longer publicly accessible.');
-            }
-            $this->submit();
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    public function refreshFileStorages()
-    {
-        $this->fileStorages = $this->database->fileStorages()->get();
-    }
-
-    public function submit()
-    {
-        try {
-            $this->authorize('update', $this->database);
-            $this->validate();
-            $this->syncData(true);
-            $this->database->save();
-            $this->database->refresh();
-            $this->syncData(false);
-            updateCompose($this->database);
-            $this->dispatch('success', 'Database saved.');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        } finally {
-            $this->dispatch('generateDockerCompose');
-        }
-    }
-}
diff --git a/resources/views/livewire/project/service/database.blade.php b/resources/views/livewire/project/service/database.blade.php
deleted file mode 100644
index 87f3b0924..000000000
--- a/resources/views/livewire/project/service/database.blade.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<div>
-    <form wire:submit='submit'>
-        <div class="flex items-center gap-2 pb-4">
-            @if ($database->human_name)
-                <h2>{{ Str::headline($database->human_name) }}</h2>
-            @else
-                <h2>{{ Str::headline($database->name) }}</h2>
-            @endif
-            <x-forms.button canGate="update" :canResource="$database" type="submit">Save</x-forms.button>
-            @can('update', $database)
-                <x-modal-confirmation wire:click="convertToApplication" title="Convert to Application"
-                    buttonTitle="Convert to Application" submitAction="convertToApplication" :actions="['The selected resource will be converted to an application.']"
-                    confirmationText="{{ Str::headline($database->name) }}"
-                    confirmationLabel="Please confirm the execution of the actions by entering the Service Database Name below"
-                    shortConfirmationLabel="Service Database Name" />
-            @endcan
-            @can('delete', $database)
-                <x-modal-confirmation title="Confirm Service Database Deletion?" buttonTitle="Delete" isErrorButton
-                    submitAction="delete" :actions="['The selected service database container will be stopped and permanently deleted.']" confirmationText="{{ Str::headline($database->name) }}"
-                    confirmationLabel="Please confirm the execution of the actions by entering the Service Database Name below"
-                    shortConfirmationLabel="Service Database Name" />
-            @endcan
-        </div>
-        <div class="flex flex-col gap-2">
-            <div class="flex gap-2">
-                <x-forms.input canGate="update" :canResource="$database" label="Name" id="humanName" placeholder="Name"></x-forms.input>
-                <x-forms.input canGate="update" :canResource="$database" label="Description" id="description"></x-forms.input>
-                <x-forms.input canGate="update" :canResource="$database" required
-                    helper="You can change the image you would like to deploy.<br><br><span class='dark:text-warning'>WARNING. You could corrupt your data. Only do it if you know what you are doing.</span>"
-                    label="Image" id="image"></x-forms.input>
-            </div>
-            <div class="flex items-end gap-2">
-                <x-forms.input canGate="update" :canResource="$database" placeholder="5432" disabled="{{ $database->is_public }}" id="publicPort"
-                    label="Public Port" />
-                <x-forms.input canGate="update" :canResource="$database" value="1800" id="proxyTimeout"
-                    label="Proxy Timeout (seconds)"
-                    helper="Maximum time in seconds to keep connections open. Default is 1800 seconds (30 minutes) and max is 31536000 seconds (1 year)" />
-                <x-forms.checkbox canGate="update" :canResource="$database" instantSave id="isPublic" label="Make it publicly available" />
-            </div>
-            @if ($db_url_public)
-                <x-forms.input label="Database IP:PORT (public)"
-                    helper="Your credentials are available in your environment variables." type="password" readonly
-                    wire:model="db_url_public" />
-            @endif
-        </div>
-        <h3 class="pt-2">Advanced</h3>
-        <div class="w-96">
-            <x-forms.checkbox canGate="update" :canResource="$database" instantSave="instantSaveExclude" label="Exclude from service status"
-                helper="If you do not need to monitor this resource, enable. Useful if this service is optional."
-                id="excludeFromStatus"></x-forms.checkbox>
-            <x-forms.checkbox canGate="update" :canResource="$database" helper="Drain logs to your configured log drain endpoint in your Server settings."
-                instantSave="instantSaveLogDrain" id="isLogDrainEnabled" label="Drain Logs" />
-        </div>
-    </form>
-</div>