diff --git a/.ai/lessons.md b/.ai/lessons.md
new file mode 100644
index 000000000..6bd6dcbaa
--- /dev/null
+++ b/.ai/lessons.md
@@ -0,0 +1,20 @@
+# Lessons Learned
+
+## Docker / Worktree Setup
+- The Docker dev container mounts from `young-stork` worktree, NOT `ivory-raccoon`
+- Do NOT copy files to `young-stork` or use `docker cp` — only modify files in the `ivory-raccoon` worktree
+- Do NOT use `docker exec` to run tests — work entirely within the `ivory-raccoon` worktree
+
+## Policy Tests
+- Policy methods have typed parameters (e.g., `Server $server`) — anonymous classes cause TypeError
+- Must use `Mockery::mock(Model::class)->makePartial()` instead of anonymous classes for model stubs
+- Use `shouldReceive('getAttribute')->with('property')->andReturn(value)` for model properties accessed via relationship chains
+
+## Browser Tests (Pest Browser Plugin)
+- Plugin runs an in-process HTTP server (Amphp) sharing the same SQLite :memory: database as the test process
+- Model boot events that call external services (e.g., `StandaloneDocker::created` runs docker commands) WILL fail in tests — use `Model::withoutEvents()` to wrap creation
+- Livewire full-page components that fail during `mount()` silently redirect to the previous URL instead of showing an error page
+- `Server::proxySet()` requires `isFunctional()` which requires `is_reachable=true` AND `is_usable=true` in ServerSetting — tests without a validated server won't show proxy controls
+- Application/Database/Service pages require complex model chains (Application → Environment → Project → Team, with StandaloneDocker destination) that are difficult to fully set up for browser tests due to Livewire mount() redirecting on any chain failure
+- The `currentTeam()` helper reads from session (`data_get(session('currentTeam'), 'id')`) — set during browser login flow
+- `Project::created` auto-creates a "production" environment — don't manually create one with that name
diff --git a/CLAUDE.md b/CLAUDE.md
index 8e398586b..46f781710 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -34,6 +34,43 @@ npm run dev                     # vite dev server
 npm run build                   # production build
 ```
 
+## Browser Tests (Pest Browser Plugin)
+
+Uses `pestphp/pest-plugin-browser` with Laravel Dusk 8. New browser tests go in `tests/v4/Browser/`.
+
+```bash
+# Run all browser tests
+php artisan test --compact tests/v4/Browser/
+
+# Run a specific browser test file
+php artisan test --compact tests/v4/Browser/LoginTest.php
+
+# Run a specific test by name
+php artisan test --compact --filter='can login with valid credentials'
+```
+
+### Writing Browser Tests
+
+- Place new tests in `tests/v4/Browser/` — legacy Dusk tests in `tests/Browser/` should not be used as reference.
+- Use `RefreshDatabase` and seed required data (at minimum `InstanceSettings::create(['id' => 0])`) in `beforeEach`.
+- Key API: `visit()`, `fill(field, value)`, `click(text)`, `assertSee()`, `assertDontSee()`, `assertPathIs()`, `screenshot()`.
+- Always call `screenshot()` at the end of each test for debugging.
+- For authenticated tests, create a helper function that logs in via the UI:
+
+```php
+function loginAsRoot(): mixed
+{
+    return visit('/login')
+        ->fill('email', 'test@example.com')
+        ->fill('password', 'password')
+        ->click('Login');
+}
+```
+
+- See `tests/v4/Browser/LoginTest.php`, `tests/v4/Browser/DashboardTest.php`, and `tests/v4/Browser/RegistrationTest.php` for conventions.
+- Chrome driver runs on `localhost:4444`, app on `localhost:8000` (configured in `tests/DuskTestCase.php`).
+- Legacy Dusk macros in `app/Providers/DuskServiceProvider.php` use the old `type()`/`press()` API — do not mix with Pest Browser Plugin's `fill()`/`click()` API.
+
 ## Architecture
 
 ### Backend Structure (app/)
diff --git a/app/Http/Controllers/Api/ApplicationsController.php b/app/Http/Controllers/Api/ApplicationsController.php
index eb2c15625..d8916431f 100644
--- a/app/Http/Controllers/Api/ApplicationsController.php
+++ b/app/Http/Controllers/Api/ApplicationsController.php
@@ -54,6 +54,10 @@ class ApplicationsController extends Controller
             ]);
         }
 
+        if ($application->is_shown_once ?? false) {
+            $application->makeHidden(['value', 'real_value']);
+        }
+
         return serializeApiResponse($application);
     }
 
diff --git a/app/Http/Controllers/Api/CloudProviderTokensController.php b/app/Http/Controllers/Api/CloudProviderTokensController.php
index 5be82a31c..5ca7212fd 100644
--- a/app/Http/Controllers/Api/CloudProviderTokensController.php
+++ b/app/Http/Controllers/Api/CloudProviderTokensController.php
@@ -176,6 +176,7 @@ class CloudProviderTokensController extends Controller
         if (is_null($token)) {
             return response()->json(['message' => 'Cloud provider token not found.'], 404);
         }
+        $this->authorize('view', $token);
 
         return response()->json($this->removeSensitiveData($token));
     }
@@ -242,6 +243,7 @@ class CloudProviderTokensController extends Controller
         if (is_null($teamId)) {
             return invalidTokenResponse();
         }
+        $this->authorize('create', [CloudProviderToken::class]);
 
         $return = validateIncomingRequest($request);
         if ($return instanceof \Illuminate\Http\JsonResponse) {
@@ -386,6 +388,7 @@ class CloudProviderTokensController extends Controller
         if (! $token) {
             return response()->json(['message' => 'Cloud provider token not found.'], 404);
         }
+        $this->authorize('update', $token);
 
         $token->update(array_intersect_key($body, array_flip($allowedFields)));
 
@@ -459,6 +462,7 @@ class CloudProviderTokensController extends Controller
         if (! $token) {
             return response()->json(['message' => 'Cloud provider token not found.'], 404);
         }
+        $this->authorize('delete', $token);
 
         if ($token->hasServers()) {
             return response()->json(['message' => 'Cannot delete token that is used by servers.'], 400);
diff --git a/app/Http/Controllers/Api/GithubController.php b/app/Http/Controllers/Api/GithubController.php
index f6a6b3513..b5cabcde0 100644
--- a/app/Http/Controllers/Api/GithubController.php
+++ b/app/Http/Controllers/Api/GithubController.php
@@ -180,6 +180,7 @@ class GithubController extends Controller
         if (is_null($teamId)) {
             return invalidTokenResponse();
         }
+        $this->authorize('create', [GithubApp::class]);
         $return = validateIncomingRequest($request);
         if ($return instanceof \Illuminate\Http\JsonResponse) {
             return $return;
@@ -555,6 +556,7 @@ class GithubController extends Controller
             $githubApp = GithubApp::where('id', $github_app_id)
                 ->where('team_id', $teamId)
                 ->firstOrFail();
+            $this->authorize('update', $githubApp);
 
             // Define allowed fields for update
             $allowedFields = [
@@ -721,6 +723,7 @@ class GithubController extends Controller
             $githubApp = GithubApp::where('id', $github_app_id)
                 ->where('team_id', $teamId)
                 ->firstOrFail();
+            $this->authorize('delete', $githubApp);
 
             // Check if the GitHub app is being used by any applications
             if ($githubApp->applications->isNotEmpty()) {
diff --git a/app/Http/Controllers/Api/HetznerController.php b/app/Http/Controllers/Api/HetznerController.php
index 2645c2df1..761e951ea 100644
--- a/app/Http/Controllers/Api/HetznerController.php
+++ b/app/Http/Controllers/Api/HetznerController.php
@@ -548,6 +548,7 @@ class HetznerController extends Controller
         if (is_null($teamId)) {
             return invalidTokenResponse();
         }
+        $this->authorize('create', [Server::class]);
 
         $return = validateIncomingRequest($request);
         if ($return instanceof \Illuminate\Http\JsonResponse) {
diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index da553a68c..33b28fc59 100644
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -96,6 +96,7 @@ class ProjectController extends Controller
         if (! $project) {
             return response()->json(['message' => 'Project not found.'], 404);
         }
+        $this->authorize('view', $project);
 
         $project->load(['environments']);
 
@@ -232,6 +233,7 @@ class ProjectController extends Controller
         if (is_null($teamId)) {
             return invalidTokenResponse();
         }
+        $this->authorize('create', [Project::class]);
 
         $return = validateIncomingRequest($request);
         if ($return instanceof \Illuminate\Http\JsonResponse) {
@@ -378,6 +380,7 @@ class ProjectController extends Controller
         if (! $project) {
             return response()->json(['message' => 'Project not found.'], 404);
         }
+        $this->authorize('update', $project);
 
         $project->update($request->only($allowedFields));
 
@@ -455,6 +458,7 @@ class ProjectController extends Controller
         if (! $project) {
             return response()->json(['message' => 'Project not found.'], 404);
         }
+        $this->authorize('delete', $project);
         if (! $project->isEmpty()) {
             return response()->json(['message' => 'Project has resources, so it cannot be deleted.'], 400);
         }
@@ -630,6 +634,7 @@ class ProjectController extends Controller
         if (! $project) {
             return response()->json(['message' => 'Project not found.'], 404);
         }
+        $this->authorize('update', $project);
 
         $existingEnvironment = $project->environments()->where('name', $request->name)->first();
         if ($existingEnvironment) {
@@ -717,6 +722,7 @@ class ProjectController extends Controller
         if (! $environment) {
             return response()->json(['message' => 'Environment not found.'], 404);
         }
+        $this->authorize('delete', $environment);
 
         if (! $environment->isEmpty()) {
             return response()->json(['message' => 'Environment has resources, so it cannot be deleted.'], 400);
diff --git a/app/Http/Controllers/Api/SecurityController.php b/app/Http/Controllers/Api/SecurityController.php
index e7b36cb9a..4fe738871 100644
--- a/app/Http/Controllers/Api/SecurityController.php
+++ b/app/Http/Controllers/Api/SecurityController.php
@@ -109,6 +109,7 @@ class SecurityController extends Controller
                 'message' => 'Private Key not found.',
             ], 404);
         }
+        $this->authorize('view', $key);
 
         return response()->json($this->removeSensitiveData($key));
     }
@@ -175,6 +176,7 @@ class SecurityController extends Controller
         if (is_null($teamId)) {
             return invalidTokenResponse();
         }
+        $this->authorize('create', [PrivateKey::class]);
         $return = validateIncomingRequest($request);
         if ($return instanceof \Illuminate\Http\JsonResponse) {
             return $return;
@@ -330,6 +332,7 @@ class SecurityController extends Controller
                 'message' => 'Private Key not found.',
             ], 404);
         }
+        $this->authorize('update', $foundKey);
         $foundKey->update($request->all());
 
         return response()->json(serializeApiResponse([
@@ -406,6 +409,7 @@ class SecurityController extends Controller
         if (is_null($key)) {
             return response()->json(['message' => 'Private Key not found.'], 404);
         }
+        $this->authorize('delete', $key);
 
         if ($key->isInUse()) {
             return response()->json([
diff --git a/app/Http/Controllers/Api/ServersController.php b/app/Http/Controllers/Api/ServersController.php
index 892457925..08271c6cb 100644
--- a/app/Http/Controllers/Api/ServersController.php
+++ b/app/Http/Controllers/Api/ServersController.php
@@ -145,6 +145,7 @@ class ServersController extends Controller
         if (is_null($server)) {
             return response()->json(['message' => 'Server not found.'], 404);
         }
+        $this->authorize('view', $server);
         if ($with_resources) {
             $server['resources'] = $server->definedResources()->map(function ($resource) {
                 $payload = [
@@ -465,6 +466,7 @@ class ServersController extends Controller
         if (is_null($teamId)) {
             return invalidTokenResponse();
         }
+        $this->authorize('create', [ModelsServer::class]);
 
         $return = validateIncomingRequest($request);
         if ($return instanceof \Illuminate\Http\JsonResponse) {
@@ -665,6 +667,7 @@ class ServersController extends Controller
         if (! $server) {
             return response()->json(['message' => 'Server not found.'], 404);
         }
+        $this->authorize('update', $server);
         if ($request->proxy_type) {
             $validProxyTypes = collect(ProxyTypes::cases())->map(function ($proxyType) {
                 return str($proxyType->value)->lower();
@@ -758,6 +761,7 @@ class ServersController extends Controller
         if (! $server) {
             return response()->json(['message' => 'Server not found.'], 404);
         }
+        $this->authorize('delete', $server);
         if ($server->definedResources()->count() > 0) {
             return response()->json(['message' => 'Server has resources, so you need to delete them before.'], 400);
         }
@@ -836,6 +840,7 @@ class ServersController extends Controller
         if (! $server) {
             return response()->json(['message' => 'Server not found.'], 404);
         }
+        $this->authorize('update', $server);
         ValidateServer::dispatch($server);
 
         return response()->json(['message' => 'Validation started.'], 201);
diff --git a/app/Http/Controllers/Api/ServicesController.php b/app/Http/Controllers/Api/ServicesController.php
index 98b35f63e..199e172ac 100644
--- a/app/Http/Controllers/Api/ServicesController.php
+++ b/app/Http/Controllers/Api/ServicesController.php
@@ -35,6 +35,10 @@ class ServicesController extends Controller
             ]);
         }
 
+        if ($service->is_shown_once ?? false) {
+            $service->makeHidden(['value', 'real_value']);
+        }
+
         return serializeApiResponse($service);
     }
 
diff --git a/app/Http/Controllers/Api/TeamController.php b/app/Http/Controllers/Api/TeamController.php
index fd0282d96..bd0f48809 100644
--- a/app/Http/Controllers/Api/TeamController.php
+++ b/app/Http/Controllers/Api/TeamController.php
@@ -118,6 +118,7 @@ class TeamController extends Controller
         if (is_null($team)) {
             return response()->json(['message' => 'Team not found.'], 404);
         }
+        $this->authorize('view', $team);
         $team = $this->removeSensitiveData($team);
 
         return response()->json(
@@ -176,6 +177,7 @@ class TeamController extends Controller
         if (is_null($team)) {
             return response()->json(['message' => 'Team not found.'], 404);
         }
+        $this->authorize('view', $team);
         $members = $team->members;
         $members->makeHidden([
             'pivot',
diff --git a/app/Http/Middleware/ApiAbility.php b/app/Http/Middleware/ApiAbility.php
index 324eeebaa..874e63825 100644
--- a/app/Http/Middleware/ApiAbility.php
+++ b/app/Http/Middleware/ApiAbility.php
@@ -6,9 +6,34 @@ use Laravel\Sanctum\Http\Middleware\CheckForAnyAbility;
 
 class ApiAbility extends CheckForAnyAbility
 {
+    /**
+     * Permissions that only admins/owners may use.
+     */
+    private const MEMBER_DISALLOWED_ABILITIES = [
+        'root',
+        'write',
+        'write:sensitive',
+        'deploy',
+        'read:sensitive',
+    ];
+
     public function handle($request, $next, ...$abilities)
     {
         try {
+            $token = $request->user()->currentAccessToken();
+            $teamId = data_get($token, 'team_id');
+
+            if ($teamId !== null && ! $request->user()->isAdminOfTeam((int) $teamId)) {
+                $tokenAbilities = $token->abilities ?? [];
+                $disallowed = array_intersect($tokenAbilities, self::MEMBER_DISALLOWED_ABILITIES);
+
+                if (! empty($disallowed)) {
+                    return response()->json([
+                        'message' => 'This API token has permissions ('.implode(', ', $disallowed).') that exceed your current role as a team member. Members are restricted to read-only API access. Please revoke this token and create a new one with only read permissions.',
+                    ], 403);
+                }
+            }
+
             if ($request->user()->tokenCan('root')) {
                 return $next($request);
             }
diff --git a/app/Http/Middleware/ApiSensitiveData.php b/app/Http/Middleware/ApiSensitiveData.php
index 49584ddb3..8d7c51d11 100644
--- a/app/Http/Middleware/ApiSensitiveData.php
+++ b/app/Http/Middleware/ApiSensitiveData.php
@@ -10,10 +10,13 @@ class ApiSensitiveData
     public function handle(Request $request, Closure $next)
     {
         $token = $request->user()->currentAccessToken();
+        $hasTokenPermission = $token->can('root') || $token->can('read:sensitive');
+        $teamId = (int) data_get($token, 'team_id');
+        $isAdmin = $teamId ? $request->user()->isAdminOfTeam($teamId) : false;
 
-        // Allow access to sensitive data if token has root or read:sensitive permission
+        // Allow access to sensitive data only if token has permission AND user is admin/owner
         $request->attributes->add([
-            'can_read_sensitive' => $token->can('root') || $token->can('read:sensitive'),
+            'can_read_sensitive' => $hasTokenPermission && $isAdmin,
         ]);
 
         return $next($request);
diff --git a/app/Livewire/Admin/Index.php b/app/Livewire/Admin/Index.php
index b5f6d2929..c68bba3e8 100644
--- a/app/Livewire/Admin/Index.php
+++ b/app/Livewire/Admin/Index.php
@@ -45,6 +45,9 @@ class Index extends Component
 
     public function submitSearch()
     {
+        if (Auth::id() !== 0 && ! session('impersonating')) {
+            return redirect()->route('dashboard');
+        }
         if ($this->search !== '') {
             $this->foundUsers = User::where(function ($query) {
                 $query->where('name', 'like', "%{$this->search}%")
@@ -55,6 +58,9 @@ class Index extends Component
 
     public function getSubscribers()
     {
+        if (Auth::id() !== 0 && ! session('impersonating')) {
+            return redirect()->route('dashboard');
+        }
         $this->inactiveSubscribers = Team::whereRelation('subscription', 'stripe_invoice_paid', false)->count();
         $this->activeSubscribers = Team::whereRelation('subscription', 'stripe_invoice_paid', true)->count();
     }
diff --git a/app/Livewire/Boarding/Index.php b/app/Livewire/Boarding/Index.php
index 0f6f45d83..289f8c181 100644
--- a/app/Livewire/Boarding/Index.php
+++ b/app/Livewire/Boarding/Index.php
@@ -8,12 +8,15 @@ use App\Models\Project;
 use App\Models\Server;
 use App\Models\Team;
 use App\Services\ConfigurationRepository;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Collection;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
 class Index extends Component
 {
+    use AuthorizesRequests;
+
     protected $listeners = [
         'refreshBoardingIndex' => 'validateServer',
         'prerequisitesInstalled' => 'handlePrerequisitesInstalled',
@@ -172,6 +175,9 @@ class Index extends Component
 
     public function skipBoarding()
     {
+        if (auth()->user()?->isMember()) {
+            return redirect()->route('dashboard');
+        }
         Team::find(currentTeam()->id)->update([
             'show_boarding' => false,
         ]);
@@ -257,6 +263,7 @@ class Index extends Component
         ]);
 
         try {
+            $this->authorize('create', PrivateKey::class);
             $privateKey = PrivateKey::createAndStore([
                 'name' => $this->privateKeyName,
                 'description' => $this->privateKeyDescription,
@@ -280,6 +287,12 @@ class Index extends Component
             'remoteServerUser' => 'required|string',
         ]);
 
+        try {
+            $this->authorize('create', Server::class);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+
         $this->privateKey = formatPrivateKey($this->privateKey);
         $foundServer = Server::whereIp($this->remoteServerHost)->first();
         if ($foundServer) {
diff --git a/app/Livewire/Destination/Show.php b/app/Livewire/Destination/Show.php
index 98cf72376..448a0d1bd 100644
--- a/app/Livewire/Destination/Show.php
+++ b/app/Livewire/Destination/Show.php
@@ -2,7 +2,6 @@
 
 namespace App\Livewire\Destination;
 
-use App\Models\Server;
 use App\Models\StandaloneDocker;
 use App\Models\SwarmDocker;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
@@ -32,17 +31,12 @@ class Show extends Component
             $destination = StandaloneDocker::whereUuid($destination_uuid)->first() ??
                 SwarmDocker::whereUuid($destination_uuid)->firstOrFail();
 
-            $ownedByTeam = Server::ownedByCurrentTeam()->each(function ($server) use ($destination) {
-                if ($server->standaloneDockers->contains($destination) || $server->swarmDockers->contains($destination)) {
-                    $this->destination = $destination;
-                    $this->syncData();
-                }
-            });
-            if ($ownedByTeam === false) {
-                return redirect()->route('destination.index');
-            }
+            $this->authorize('view', $destination);
+
             $this->destination = $destination;
             $this->syncData();
+        } catch (\Illuminate\Auth\Access\AuthorizationException) {
+            abort(403);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
diff --git a/app/Livewire/NavbarDeleteTeam.php b/app/Livewire/NavbarDeleteTeam.php
index a8c932912..78eafbeb4 100644
--- a/app/Livewire/NavbarDeleteTeam.php
+++ b/app/Livewire/NavbarDeleteTeam.php
@@ -2,12 +2,16 @@
 
 namespace App\Livewire;
 
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Livewire\Component;
 
 class NavbarDeleteTeam extends Component
 {
+    use AuthorizesRequests;
+
     public $team;
 
     public function mount()
@@ -17,27 +21,35 @@ class NavbarDeleteTeam extends Component
 
     public function delete($password)
     {
-        if (! verifyPasswordConfirmation($password, $this)) {
-            return;
-        }
-
-        $currentTeam = currentTeam();
-        $currentTeam->delete();
-
-        $currentTeam->members->each(function ($user) use ($currentTeam) {
-            if ($user->id === Auth::id()) {
+        try {
+            if (! verifyPasswordConfirmation($password, $this)) {
                 return;
             }
-            $user->teams()->detach($currentTeam);
-            $session = DB::table('sessions')->where('user_id', $user->id)->first();
-            if ($session) {
-                DB::table('sessions')->where('id', $session->id)->delete();
-            }
-        });
 
-        refreshSession();
+            $currentTeam = currentTeam();
+            $this->authorize('delete', $currentTeam);
 
-        return redirectRoute($this, 'team.index');
+            $currentTeam->members->each(function ($user) use ($currentTeam) {
+                if ($user->id === Auth::id()) {
+                    return;
+                }
+                $user->teams()->detach($currentTeam);
+                $session = DB::table('sessions')->where('user_id', $user->id)->first();
+                if ($session) {
+                    DB::table('sessions')->where('id', $session->id)->delete();
+                }
+            });
+
+            Cache::forget('user:'.Auth::id().':team:'.$currentTeam->id);
+            $currentTeam->delete();
+
+            $newTeam = Auth::user()->teams()->first();
+            refreshSession($newTeam);
+
+            return redirect()->route('team.index');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function render()
diff --git a/app/Livewire/Project/AddEmpty.php b/app/Livewire/Project/AddEmpty.php
index 974f0608a..3430c69bb 100644
--- a/app/Livewire/Project/AddEmpty.php
+++ b/app/Livewire/Project/AddEmpty.php
@@ -4,11 +4,14 @@ namespace App\Livewire\Project;
 
 use App\Models\Project;
 use App\Support\ValidationPatterns;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
 class AddEmpty extends Component
 {
+    use AuthorizesRequests;
+
     public string $name;
 
     public string $description = '';
@@ -29,6 +32,7 @@ class AddEmpty extends Component
     public function submit()
     {
         try {
+            $this->authorize('create', Project::class);
             $this->validate();
             $project = Project::create([
                 'name' => $this->name,
diff --git a/app/Livewire/Project/Application/Deployment/Show.php b/app/Livewire/Project/Application/Deployment/Show.php
index 954670582..b8f5e891a 100644
--- a/app/Livewire/Project/Application/Deployment/Show.php
+++ b/app/Livewire/Project/Application/Deployment/Show.php
@@ -59,7 +59,9 @@ class Show extends Component
         $this->application_deployment_queue = $application_deployment_queue;
         $this->horizon_job_status = $this->application_deployment_queue->getHorizonJobStatus();
         $this->deployment_uuid = $deploymentUuid;
-        $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
+        $this->is_debug_enabled = auth()->user()->isMember()
+            ? false
+            : $this->application->settings->is_debug_enabled;
         $this->isKeepAliveOn();
     }
 
@@ -123,6 +125,8 @@ class Show extends Component
 
     public function downloadAllLogs(): string
     {
+        $this->authorize('update', $this->application);
+
         $logs = decode_remote_command_output($this->application_deployment_queue, includeAll: true)
             ->map(function ($line) {
                 $prefix = '';
diff --git a/app/Livewire/Project/Application/DeploymentNavbar.php b/app/Livewire/Project/Application/DeploymentNavbar.php
index ebdc014ae..b60f543ba 100644
--- a/app/Livewire/Project/Application/DeploymentNavbar.php
+++ b/app/Livewire/Project/Application/DeploymentNavbar.php
@@ -6,11 +6,14 @@ use App\Enums\ApplicationDeploymentStatus;
 use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Carbon;
 use Livewire\Component;
 
 class DeploymentNavbar extends Component
 {
+    use AuthorizesRequests;
+
     public ApplicationDeploymentQueue $application_deployment_queue;
 
     public Application $application;
@@ -25,7 +28,9 @@ class DeploymentNavbar extends Component
     {
         $this->application = Application::ownedByCurrentTeam()->find($this->application_deployment_queue->application_id);
         $this->server = $this->application->destination->server;
-        $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
+        $this->is_debug_enabled = auth()->user()->isMember()
+            ? false
+            : $this->application->settings->is_debug_enabled;
     }
 
     public function deploymentFinished()
@@ -35,15 +40,21 @@ class DeploymentNavbar extends Component
 
     public function show_debug()
     {
-        $this->application->settings->is_debug_enabled = ! $this->application->settings->is_debug_enabled;
-        $this->application->settings->save();
-        $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
-        $this->dispatch('refreshQueue');
+        try {
+            $this->authorize('update', $this->application);
+            $this->application->settings->is_debug_enabled = ! $this->application->settings->is_debug_enabled;
+            $this->application->settings->save();
+            $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
+            $this->dispatch('refreshQueue');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function force_start()
     {
         try {
+            $this->authorize('deploy', $this->application);
             force_start_deployment($this->application_deployment_queue);
         } catch (\Throwable $e) {
             return handleError($e, $this);
@@ -58,10 +69,15 @@ class DeploymentNavbar extends Component
             return '';
         }
 
+        $isMember = auth()->user()->isMember();
+
         $markdown = "# Deployment Logs\n\n";
         $markdown .= "```\n";
 
         foreach ($logs as $log) {
+            if ($isMember && ! empty($log['hidden'])) {
+                continue;
+            }
             if (isset($log['output'])) {
                 $markdown .= $log['output']."\n";
             }
@@ -74,6 +90,11 @@ class DeploymentNavbar extends Component
 
     public function cancel()
     {
+        try {
+            $this->authorize('deploy', $this->application);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
         $deployment_uuid = $this->application_deployment_queue->deployment_uuid;
         $kill_command = "docker rm -f {$deployment_uuid}";
         $build_server_id = $this->application_deployment_queue->build_server_id ?? $this->application->destination->server_id;
diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php
index a46b2f19c..eb5b5f06c 100644
--- a/app/Livewire/Project/Application/Heading.php
+++ b/app/Livewire/Project/Application/Heading.php
@@ -65,58 +65,66 @@ class Heading extends Component
 
     public function force_deploy_without_cache()
     {
-        $this->authorize('deploy', $this->application);
+        try {
+            $this->authorize('deploy', $this->application);
 
-        $this->deploy(force_rebuild: true);
+            $this->deploy(force_rebuild: true);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function deploy(bool $force_rebuild = false)
     {
-        $this->authorize('deploy', $this->application);
+        try {
+            $this->authorize('deploy', $this->application);
 
-        if ($this->application->build_pack === 'dockercompose' && is_null($this->application->docker_compose_raw)) {
-            $this->dispatch('error', 'Failed to deploy', 'Please load a Compose file first.');
+            if ($this->application->build_pack === 'dockercompose' && is_null($this->application->docker_compose_raw)) {
+                $this->dispatch('error', 'Failed to deploy', 'Please load a Compose file first.');
 
-            return;
+                return;
+            }
+            if ($this->application->destination->server->isSwarm() && str($this->application->docker_registry_image_name)->isEmpty()) {
+                $this->dispatch('error', 'Failed to deploy.', 'To deploy to a Swarm cluster you must set a Docker image name first.');
+
+                return;
+            }
+            if (data_get($this->application, 'settings.is_build_server_enabled') && str($this->application->docker_registry_image_name)->isEmpty()) {
+                $this->dispatch('error', 'Failed to deploy.', 'To use a build server, you must first set a Docker image.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/build-server">documentation</a>');
+
+                return;
+            }
+            if ($this->application->additional_servers->count() > 0 && str($this->application->docker_registry_image_name)->isEmpty()) {
+                $this->dispatch('error', 'Failed to deploy.', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/multiple-servers">documentation</a>');
+
+                return;
+            }
+            $this->setDeploymentUuid();
+            $result = queue_application_deployment(
+                application: $this->application,
+                deployment_uuid: $this->deploymentUuid,
+                force_rebuild: $force_rebuild,
+            );
+            if ($result['status'] === 'queue_full') {
+                $this->dispatch('error', 'Deployment queue full', $result['message']);
+
+                return;
+            }
+            if ($result['status'] === 'skipped') {
+                $this->dispatch('error', 'Deployment skipped', $result['message']);
+
+                return;
+            }
+
+            return $this->redirectRoute('project.application.deployment.show', [
+                'project_uuid' => $this->parameters['project_uuid'],
+                'application_uuid' => $this->parameters['application_uuid'],
+                'deployment_uuid' => $this->deploymentUuid,
+                'environment_uuid' => $this->parameters['environment_uuid'],
+            ], navigate: false);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
-        if ($this->application->destination->server->isSwarm() && str($this->application->docker_registry_image_name)->isEmpty()) {
-            $this->dispatch('error', 'Failed to deploy.', 'To deploy to a Swarm cluster you must set a Docker image name first.');
-
-            return;
-        }
-        if (data_get($this->application, 'settings.is_build_server_enabled') && str($this->application->docker_registry_image_name)->isEmpty()) {
-            $this->dispatch('error', 'Failed to deploy.', 'To use a build server, you must first set a Docker image.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/build-server">documentation</a>');
-
-            return;
-        }
-        if ($this->application->additional_servers->count() > 0 && str($this->application->docker_registry_image_name)->isEmpty()) {
-            $this->dispatch('error', 'Failed to deploy.', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/multiple-servers">documentation</a>');
-
-            return;
-        }
-        $this->setDeploymentUuid();
-        $result = queue_application_deployment(
-            application: $this->application,
-            deployment_uuid: $this->deploymentUuid,
-            force_rebuild: $force_rebuild,
-        );
-        if ($result['status'] === 'queue_full') {
-            $this->dispatch('error', 'Deployment queue full', $result['message']);
-
-            return;
-        }
-        if ($result['status'] === 'skipped') {
-            $this->dispatch('error', 'Deployment skipped', $result['message']);
-
-            return;
-        }
-
-        return $this->redirectRoute('project.application.deployment.show', [
-            'project_uuid' => $this->parameters['project_uuid'],
-            'application_uuid' => $this->parameters['application_uuid'],
-            'deployment_uuid' => $this->deploymentUuid,
-            'environment_uuid' => $this->parameters['environment_uuid'],
-        ], navigate: false);
     }
 
     protected function setDeploymentUuid()
@@ -127,45 +135,53 @@ class Heading extends Component
 
     public function stop()
     {
-        $this->authorize('deploy', $this->application);
+        try {
+            $this->authorize('deploy', $this->application);
 
-        $this->dispatch('info', 'Gracefully stopping application.<br/>It could take a while depending on the application.');
-        StopApplication::dispatch($this->application, false, $this->docker_cleanup);
+            $this->dispatch('info', 'Gracefully stopping application.<br/>It could take a while depending on the application.');
+            StopApplication::dispatch($this->application, false, $this->docker_cleanup);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function restart()
     {
-        $this->authorize('deploy', $this->application);
+        try {
+            $this->authorize('deploy', $this->application);
 
-        if ($this->application->additional_servers->count() > 0 && str($this->application->docker_registry_image_name)->isEmpty()) {
-            $this->dispatch('error', 'Failed to deploy', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/multiple-servers">documentation</a>');
+            if ($this->application->additional_servers->count() > 0 && str($this->application->docker_registry_image_name)->isEmpty()) {
+                $this->dispatch('error', 'Failed to deploy', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/multiple-servers">documentation</a>');
 
-            return;
+                return;
+            }
+
+            $this->setDeploymentUuid();
+            $result = queue_application_deployment(
+                application: $this->application,
+                deployment_uuid: $this->deploymentUuid,
+                restart_only: true,
+            );
+            if ($result['status'] === 'queue_full') {
+                $this->dispatch('error', 'Deployment queue full', $result['message']);
+
+                return;
+            }
+            if ($result['status'] === 'skipped') {
+                $this->dispatch('success', 'Deployment skipped', $result['message']);
+
+                return;
+            }
+
+            return $this->redirectRoute('project.application.deployment.show', [
+                'project_uuid' => $this->parameters['project_uuid'],
+                'application_uuid' => $this->parameters['application_uuid'],
+                'deployment_uuid' => $this->deploymentUuid,
+                'environment_uuid' => $this->parameters['environment_uuid'],
+            ], navigate: false);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
-
-        $this->setDeploymentUuid();
-        $result = queue_application_deployment(
-            application: $this->application,
-            deployment_uuid: $this->deploymentUuid,
-            restart_only: true,
-        );
-        if ($result['status'] === 'queue_full') {
-            $this->dispatch('error', 'Deployment queue full', $result['message']);
-
-            return;
-        }
-        if ($result['status'] === 'skipped') {
-            $this->dispatch('success', 'Deployment skipped', $result['message']);
-
-            return;
-        }
-
-        return $this->redirectRoute('project.application.deployment.show', [
-            'project_uuid' => $this->parameters['project_uuid'],
-            'application_uuid' => $this->parameters['application_uuid'],
-            'deployment_uuid' => $this->deploymentUuid,
-            'environment_uuid' => $this->parameters['environment_uuid'],
-        ], navigate: false);
     }
 
     public function render()
diff --git a/app/Livewire/Project/Application/Previews.php b/app/Livewire/Project/Application/Previews.php
index 41f352c14..50acf76b2 100644
--- a/app/Livewire/Project/Application/Previews.php
+++ b/app/Livewire/Project/Application/Previews.php
@@ -215,24 +215,31 @@ class Previews extends Component
 
     public function force_deploy_without_cache(int $pull_request_id, ?string $pull_request_html_url = null)
     {
-        $this->authorize('deploy', $this->application);
+        try {
+            $this->authorize('deploy', $this->application);
 
-        $this->deploy($pull_request_id, $pull_request_html_url, force_rebuild: true);
+            $this->deploy($pull_request_id, $pull_request_html_url, force_rebuild: true);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function add_and_deploy(int $pull_request_id, ?string $pull_request_html_url = null)
     {
-        $this->authorize('deploy', $this->application);
+        try {
+            $this->authorize('deploy', $this->application);
 
-        $this->add($pull_request_id, $pull_request_html_url);
-        $this->deploy($pull_request_id, $pull_request_html_url);
+            $this->add($pull_request_id, $pull_request_html_url);
+            $this->deploy($pull_request_id, $pull_request_html_url);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function deploy(int $pull_request_id, ?string $pull_request_html_url = null, bool $force_rebuild = false)
     {
-        $this->authorize('deploy', $this->application);
-
         try {
+            $this->authorize('deploy', $this->application);
             $this->setDeploymentUuid();
             $found = ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->first();
             if (! $found && ! is_null($pull_request_html_url)) {
@@ -291,9 +298,8 @@ class Previews extends Component
 
     public function stop(int $pull_request_id)
     {
-        $this->authorize('deploy', $this->application);
-
         try {
+            $this->authorize('deploy', $this->application);
             $server = $this->application->destination->server;
 
             if ($this->application->destination->server->isSwarm()) {
diff --git a/app/Livewire/Project/Application/Swarm.php b/app/Livewire/Project/Application/Swarm.php
index 197dc41ed..94d627e67 100644
--- a/app/Livewire/Project/Application/Swarm.php
+++ b/app/Livewire/Project/Application/Swarm.php
@@ -3,11 +3,14 @@
 namespace App\Livewire\Project\Application;
 
 use App\Models\Application;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
 
 class Swarm extends Component
 {
+    use AuthorizesRequests;
+
     public Application $application;
 
     #[Validate('required')]
@@ -51,6 +54,7 @@ class Swarm extends Component
     public function instantSave()
     {
         try {
+            $this->authorize('update', $this->application);
             $this->syncData(true);
             $this->dispatch('success', 'Swarm settings updated.');
         } catch (\Throwable $e) {
@@ -61,6 +65,7 @@ class Swarm extends Component
     public function submit()
     {
         try {
+            $this->authorize('update', $this->application);
             $this->syncData(true);
             $this->dispatch('success', 'Swarm settings updated.');
         } catch (\Throwable $e) {
diff --git a/app/Livewire/Project/CloneMe.php b/app/Livewire/Project/CloneMe.php
index 3b3e42619..58a181f2f 100644
--- a/app/Livewire/Project/CloneMe.php
+++ b/app/Livewire/Project/CloneMe.php
@@ -11,11 +11,14 @@ use App\Models\Environment;
 use App\Models\Project;
 use App\Models\Server;
 use App\Support\ValidationPatterns;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
 class CloneMe extends Component
 {
+    use AuthorizesRequests;
+
     public string $project_uuid;
 
     public string $environment_uuid;
@@ -91,6 +94,7 @@ class CloneMe extends Component
     public function clone(string $type)
     {
         try {
+            $this->authorize('create', Project::class);
             $this->validate([
                 'selectedDestination' => 'required',
                 'newName' => ValidationPatterns::nameRules(),
diff --git a/app/Livewire/Project/Database/BackupEdit.php b/app/Livewire/Project/Database/BackupEdit.php
index 35262d7b0..8b67105cc 100644
--- a/app/Livewire/Project/Database/BackupEdit.php
+++ b/app/Livewire/Project/Database/BackupEdit.php
@@ -201,6 +201,18 @@ class BackupEdit extends Component
         }
     }
 
+    public function backupNow()
+    {
+        try {
+            $this->authorize('manageBackups', $this->backup->database);
+
+            \App\Jobs\DatabaseBackupJob::dispatch($this->backup);
+            $this->dispatch('success', 'Backup queued. It will be available in a few minutes.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
     public function instantSave()
     {
         try {
diff --git a/app/Livewire/Project/Database/BackupExecutions.php b/app/Livewire/Project/Database/BackupExecutions.php
index 44f903fcc..5ffe6f509 100644
--- a/app/Livewire/Project/Database/BackupExecutions.php
+++ b/app/Livewire/Project/Database/BackupExecutions.php
@@ -3,12 +3,15 @@
 namespace App\Livewire\Project\Database;
 
 use App\Models\ScheduledDatabaseBackup;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Livewire\Component;
 
 class BackupExecutions extends Component
 {
+    use AuthorizesRequests;
+
     public ?ScheduledDatabaseBackup $backup = null;
 
     public $database;
@@ -44,29 +47,45 @@ class BackupExecutions extends Component
 
     public function cleanupFailed()
     {
-        if ($this->backup) {
-            $this->backup->executions()->where('status', 'failed')->delete();
-            $this->refreshBackupExecutions();
-            $this->dispatch('success', 'Failed backups cleaned up.');
+        try {
+            $this->authorize('manageBackups', $this->database);
+            if ($this->backup) {
+                $this->backup->executions()->where('status', 'failed')->delete();
+                $this->refreshBackupExecutions();
+                $this->dispatch('success', 'Failed backups cleaned up.');
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
     public function cleanupDeleted()
     {
-        if ($this->backup) {
-            $deletedCount = $this->backup->executions()->where('local_storage_deleted', true)->count();
-            if ($deletedCount > 0) {
-                $this->backup->executions()->where('local_storage_deleted', true)->delete();
-                $this->refreshBackupExecutions();
-                $this->dispatch('success', "Cleaned up {$deletedCount} backup entries deleted from local storage.");
-            } else {
-                $this->dispatch('info', 'No backup entries found that are deleted from local storage.');
+        try {
+            $this->authorize('manageBackups', $this->database);
+            if ($this->backup) {
+                $deletedCount = $this->backup->executions()->where('local_storage_deleted', true)->count();
+                if ($deletedCount > 0) {
+                    $this->backup->executions()->where('local_storage_deleted', true)->delete();
+                    $this->refreshBackupExecutions();
+                    $this->dispatch('success', "Cleaned up {$deletedCount} backup entries deleted from local storage.");
+                } else {
+                    $this->dispatch('info', 'No backup entries found that are deleted from local storage.');
+                }
             }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
     public function deleteBackup($executionId, $password)
     {
+        try {
+            $this->authorize('manageBackups', $this->database);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+
         if (! verifyPasswordConfirmation($password, $this)) {
             return;
         }
diff --git a/app/Livewire/Project/Database/BackupNow.php b/app/Livewire/Project/Database/BackupNow.php
index decd59a4c..e4ed2a366 100644
--- a/app/Livewire/Project/Database/BackupNow.php
+++ b/app/Livewire/Project/Database/BackupNow.php
@@ -14,9 +14,13 @@ class BackupNow extends Component
 
     public function backupNow()
     {
-        $this->authorize('manageBackups', $this->backup->database);
+        try {
+            $this->authorize('manageBackups', $this->backup->database);
 
-        DatabaseBackupJob::dispatch($this->backup);
-        $this->dispatch('success', 'Backup queued. It will be available in a few minutes.');
+            DatabaseBackupJob::dispatch($this->backup);
+            $this->dispatch('success', 'Backup queued. It will be available in a few minutes.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 }
diff --git a/app/Livewire/Project/Database/Clickhouse/General.php b/app/Livewire/Project/Database/Clickhouse/General.php
index 9de75c1c5..f4dfe73f2 100644
--- a/app/Livewire/Project/Database/Clickhouse/General.php
+++ b/app/Livewire/Project/Database/Clickhouse/General.php
@@ -46,6 +46,8 @@ class General extends Component
 
     public bool $isLogDrainEnabled = false;
 
+    public bool $isPasswordHiddenForMember = false;
+
     public function getListeners()
     {
         $teamId = Auth::user()->currentTeam()->id;
@@ -69,6 +71,13 @@ class General extends Component
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
+
+        $this->isPasswordHiddenForMember = auth()->user()?->isMember() ?? false;
+        if ($this->isPasswordHiddenForMember) {
+            $this->clickhouseAdminPassword = '';
+            $this->dbUrl = null;
+            $this->dbUrlPublic = null;
+        }
     }
 
     protected function rules(): array
diff --git a/app/Livewire/Project/Database/Dragonfly/General.php b/app/Livewire/Project/Database/Dragonfly/General.php
index d35e57a9d..1143ba44b 100644
--- a/app/Livewire/Project/Database/Dragonfly/General.php
+++ b/app/Livewire/Project/Database/Dragonfly/General.php
@@ -50,6 +50,8 @@ class General extends Component
 
     public bool $enable_ssl = false;
 
+    public bool $isPasswordHiddenForMember = false;
+
     public function getListeners()
     {
         $userId = Auth::id();
@@ -81,6 +83,13 @@ class General extends Component
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
+
+        $this->isPasswordHiddenForMember = auth()->user()?->isMember() ?? false;
+        if ($this->isPasswordHiddenForMember) {
+            $this->dragonflyPassword = '';
+            $this->dbUrl = null;
+            $this->dbUrlPublic = null;
+        }
     }
 
     protected function rules(): array
diff --git a/app/Livewire/Project/Database/Heading.php b/app/Livewire/Project/Database/Heading.php
index c6c9a3c48..943f22702 100644
--- a/app/Livewire/Project/Database/Heading.php
+++ b/app/Livewire/Project/Database/Heading.php
@@ -90,18 +90,28 @@ class Heading extends Component
 
     public function restart()
     {
-        $this->authorize('manage', $this->database);
+        try {
+            $this->authorize('manage', $this->database);
 
-        $activity = RestartDatabase::run($this->database);
-        $this->dispatch('activityMonitor', $activity->id, ServiceStatusChanged::class);
+            $activity = RestartDatabase::run($this->database);
+            $this->js("window.dispatchEvent(new CustomEvent('startdatabase'))");
+            $this->dispatch('activityMonitor', $activity->id, ServiceStatusChanged::class);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function start()
     {
-        $this->authorize('manage', $this->database);
+        try {
+            $this->authorize('manage', $this->database);
 
-        $activity = StartDatabase::run($this->database);
-        $this->dispatch('activityMonitor', $activity->id, ServiceStatusChanged::class);
+            $activity = StartDatabase::run($this->database);
+            $this->js("window.dispatchEvent(new CustomEvent('startdatabase'))");
+            $this->dispatch('activityMonitor', $activity->id, ServiceStatusChanged::class);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function render()
diff --git a/app/Livewire/Project/Database/Keydb/General.php b/app/Livewire/Project/Database/Keydb/General.php
index adb4ccb5f..333a5f940 100644
--- a/app/Livewire/Project/Database/Keydb/General.php
+++ b/app/Livewire/Project/Database/Keydb/General.php
@@ -52,6 +52,8 @@ class General extends Component
 
     public bool $enable_ssl = false;
 
+    public bool $isPasswordHiddenForMember = false;
+
     public function getListeners()
     {
         $userId = Auth::id();
@@ -83,6 +85,13 @@ class General extends Component
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
+
+        $this->isPasswordHiddenForMember = auth()->user()?->isMember() ?? false;
+        if ($this->isPasswordHiddenForMember) {
+            $this->keydbPassword = '';
+            $this->dbUrl = null;
+            $this->dbUrlPublic = null;
+        }
     }
 
     protected function rules(): array
diff --git a/app/Livewire/Project/Database/Mariadb/General.php b/app/Livewire/Project/Database/Mariadb/General.php
index 14240c82d..cd07368b2 100644
--- a/app/Livewire/Project/Database/Mariadb/General.php
+++ b/app/Livewire/Project/Database/Mariadb/General.php
@@ -58,6 +58,8 @@ class General extends Component
 
     public ?Carbon $certificateValidUntil = null;
 
+    public bool $isPasswordHiddenForMember = false;
+
     public function getListeners()
     {
         $userId = Auth::id();
@@ -143,6 +145,14 @@ class General extends Component
         } catch (Exception $e) {
             return handleError($e, $this);
         }
+
+        $this->isPasswordHiddenForMember = auth()->user()?->isMember() ?? false;
+        if ($this->isPasswordHiddenForMember) {
+            $this->mariadbRootPassword = '';
+            $this->mariadbPassword = '';
+            $this->db_url = null;
+            $this->db_url_public = null;
+        }
     }
 
     public function syncData(bool $toModel = false)
diff --git a/app/Livewire/Project/Database/Mongodb/General.php b/app/Livewire/Project/Database/Mongodb/General.php
index 11419ec71..c9aa253bb 100644
--- a/app/Livewire/Project/Database/Mongodb/General.php
+++ b/app/Livewire/Project/Database/Mongodb/General.php
@@ -58,6 +58,8 @@ class General extends Component
 
     public ?Carbon $certificateValidUntil = null;
 
+    public bool $isPasswordHiddenForMember = false;
+
     public function getListeners()
     {
         $userId = Auth::id();
@@ -143,6 +145,13 @@ class General extends Component
         } catch (Exception $e) {
             return handleError($e, $this);
         }
+
+        $this->isPasswordHiddenForMember = auth()->user()?->isMember() ?? false;
+        if ($this->isPasswordHiddenForMember) {
+            $this->mongoInitdbRootPassword = '';
+            $this->db_url = null;
+            $this->db_url_public = null;
+        }
     }
 
     public function syncData(bool $toModel = false)
diff --git a/app/Livewire/Project/Database/Mysql/General.php b/app/Livewire/Project/Database/Mysql/General.php
index 4f0f5eb19..4c8c91713 100644
--- a/app/Livewire/Project/Database/Mysql/General.php
+++ b/app/Livewire/Project/Database/Mysql/General.php
@@ -60,6 +60,8 @@ class General extends Component
 
     public ?Carbon $certificateValidUntil = null;
 
+    public bool $isPasswordHiddenForMember = false;
+
     public function getListeners()
     {
         $userId = Auth::id();
@@ -148,6 +150,14 @@ class General extends Component
         } catch (Exception $e) {
             return handleError($e, $this);
         }
+
+        $this->isPasswordHiddenForMember = auth()->user()?->isMember() ?? false;
+        if ($this->isPasswordHiddenForMember) {
+            $this->mysqlRootPassword = '';
+            $this->mysqlPassword = '';
+            $this->db_url = null;
+            $this->db_url_public = null;
+        }
     }
 
     public function syncData(bool $toModel = false)
diff --git a/app/Livewire/Project/Database/Postgresql/General.php b/app/Livewire/Project/Database/Postgresql/General.php
index 4e044672b..e6648f97f 100644
--- a/app/Livewire/Project/Database/Postgresql/General.php
+++ b/app/Livewire/Project/Database/Postgresql/General.php
@@ -68,6 +68,8 @@ class General extends Component
 
     public ?Carbon $certificateValidUntil = null;
 
+    public bool $isPasswordHiddenForMember = false;
+
     public function getListeners()
     {
         $userId = Auth::id();
@@ -161,6 +163,13 @@ class General extends Component
         } catch (Exception $e) {
             return handleError($e, $this);
         }
+
+        $this->isPasswordHiddenForMember = auth()->user()?->isMember() ?? false;
+        if ($this->isPasswordHiddenForMember) {
+            $this->postgresPassword = '';
+            $this->db_url = null;
+            $this->db_url_public = null;
+        }
     }
 
     public function syncData(bool $toModel = false)
diff --git a/app/Livewire/Project/Database/Redis/General.php b/app/Livewire/Project/Database/Redis/General.php
index ebe2f3ba0..b16243b84 100644
--- a/app/Livewire/Project/Database/Redis/General.php
+++ b/app/Livewire/Project/Database/Redis/General.php
@@ -56,6 +56,8 @@ class General extends Component
 
     public ?Carbon $certificateValidUntil = null;
 
+    public bool $isPasswordHiddenForMember = false;
+
     public function getListeners()
     {
         $userId = Auth::id();
@@ -136,6 +138,13 @@ class General extends Component
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
+
+        $this->isPasswordHiddenForMember = auth()->user()?->isMember() ?? false;
+        if ($this->isPasswordHiddenForMember) {
+            $this->redisPassword = '';
+            $this->dbUrl = null;
+            $this->dbUrlPublic = null;
+        }
     }
 
     public function syncData(bool $toModel = false)
diff --git a/app/Livewire/Project/Database/ScheduledBackups.php b/app/Livewire/Project/Database/ScheduledBackups.php
index 1cf5e53f6..06473c56a 100644
--- a/app/Livewire/Project/Database/ScheduledBackups.php
+++ b/app/Livewire/Project/Database/ScheduledBackups.php
@@ -56,22 +56,30 @@ class ScheduledBackups extends Component
 
     public function setCustomType()
     {
-        $this->authorize('update', $this->database);
+        try {
+            $this->authorize('update', $this->database);
 
-        $this->database->custom_type = $this->custom_type;
-        $this->database->save();
-        $this->dispatch('success', 'Database type set.');
-        $this->refreshScheduledBackups();
+            $this->database->custom_type = $this->custom_type;
+            $this->database->save();
+            $this->dispatch('success', 'Database type set.');
+            $this->refreshScheduledBackups();
+        } catch (\Throwable $e) {
+            handleError($e, $this);
+        }
     }
 
     public function delete($scheduled_backup_id): void
     {
-        $backup = $this->database->scheduledBackups->find($scheduled_backup_id);
-        $this->authorize('manageBackups', $this->database);
+        try {
+            $this->authorize('manageBackups', $this->database);
 
-        $backup->delete();
-        $this->dispatch('success', 'Scheduled backup deleted.');
-        $this->refreshScheduledBackups();
+            $backup = $this->database->scheduledBackups->find($scheduled_backup_id);
+            $backup->delete();
+            $this->dispatch('success', 'Scheduled backup deleted.');
+            $this->refreshScheduledBackups();
+        } catch (\Throwable $e) {
+            handleError($e, $this);
+        }
     }
 
     public function refreshScheduledBackups(?int $id = null): void
diff --git a/app/Livewire/Project/DeleteEnvironment.php b/app/Livewire/Project/DeleteEnvironment.php
index aa6e95975..28027ce5a 100644
--- a/app/Livewire/Project/DeleteEnvironment.php
+++ b/app/Livewire/Project/DeleteEnvironment.php
@@ -30,18 +30,22 @@ class DeleteEnvironment extends Component
 
     public function delete()
     {
-        $this->validate([
-            'environment_id' => 'required|int',
-        ]);
-        $environment = Environment::findOrFail($this->environment_id);
-        $this->authorize('delete', $environment);
+        try {
+            $this->validate([
+                'environment_id' => 'required|int',
+            ]);
+            $environment = Environment::findOrFail($this->environment_id);
+            $this->authorize('delete', $environment);
 
-        if ($environment->isEmpty()) {
-            $environment->delete();
+            if ($environment->isEmpty()) {
+                $environment->delete();
 
-            return redirectRoute($this, 'project.show', ['project_uuid' => $this->parameters['project_uuid']]);
+                return redirectRoute($this, 'project.show', ['project_uuid' => $this->parameters['project_uuid']]);
+            }
+
+            return $this->dispatch('error', "<strong>Environment {$environment->name}</strong> has defined resources, please delete them first.");
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
-
-        return $this->dispatch('error', "<strong>Environment {$environment->name}</strong> has defined resources, please delete them first.");
     }
 }
diff --git a/app/Livewire/Project/DeleteProject.php b/app/Livewire/Project/DeleteProject.php
index a018046fd..0b99f57a4 100644
--- a/app/Livewire/Project/DeleteProject.php
+++ b/app/Livewire/Project/DeleteProject.php
@@ -26,18 +26,22 @@ class DeleteProject extends Component
 
     public function delete()
     {
-        $this->validate([
-            'project_id' => 'required|int',
-        ]);
-        $project = Project::findOrFail($this->project_id);
-        $this->authorize('delete', $project);
+        try {
+            $this->validate([
+                'project_id' => 'required|int',
+            ]);
+            $project = Project::findOrFail($this->project_id);
+            $this->authorize('delete', $project);
 
-        if ($project->isEmpty()) {
-            $project->delete();
+            if ($project->isEmpty()) {
+                $project->delete();
 
-            return redirectRoute($this, 'project.index');
+                return redirectRoute($this, 'project.index');
+            }
+
+            return $this->dispatch('error', "<strong>Project {$project->name}</strong> has resources defined, please delete them first.");
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
-
-        return $this->dispatch('error', "<strong>Project {$project->name}</strong> has resources defined, please delete them first.");
     }
 }
diff --git a/app/Livewire/Project/Edit.php b/app/Livewire/Project/Edit.php
index a2d73eb5f..1314c9e4b 100644
--- a/app/Livewire/Project/Edit.php
+++ b/app/Livewire/Project/Edit.php
@@ -4,10 +4,13 @@ namespace App\Livewire\Project;
 
 use App\Models\Project;
 use App\Support\ValidationPatterns;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Component;
 
 class Edit extends Component
 {
+    use AuthorizesRequests;
+
     public Project $project;
 
     public string $name;
@@ -54,6 +57,7 @@ class Edit extends Component
     public function submit()
     {
         try {
+            $this->authorize('update', $this->project);
             $this->syncData(true);
             $this->dispatch('success', 'Project updated.');
         } catch (\Throwable $e) {
diff --git a/app/Livewire/Project/EnvironmentEdit.php b/app/Livewire/Project/EnvironmentEdit.php
index 529b9d7b1..9b9a3670d 100644
--- a/app/Livewire/Project/EnvironmentEdit.php
+++ b/app/Livewire/Project/EnvironmentEdit.php
@@ -5,11 +5,14 @@ namespace App\Livewire\Project;
 use App\Models\Application;
 use App\Models\Project;
 use App\Support\ValidationPatterns;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Attributes\Locked;
 use Livewire\Component;
 
 class EnvironmentEdit extends Component
 {
+    use AuthorizesRequests;
+
     public Project $project;
 
     public Application $application;
@@ -62,6 +65,7 @@ class EnvironmentEdit extends Component
     public function submit()
     {
         try {
+            $this->authorize('update', $this->environment);
             $this->syncData(true);
             redirectRoute($this, 'project.environment.edit', [
                 'environment_uuid' => $this->environment->uuid,
diff --git a/app/Livewire/Project/Service/EditCompose.php b/app/Livewire/Project/Service/EditCompose.php
index 32cf72067..0f5c739b1 100644
--- a/app/Livewire/Project/Service/EditCompose.php
+++ b/app/Livewire/Project/Service/EditCompose.php
@@ -3,10 +3,13 @@
 namespace App\Livewire\Project\Service;
 
 use App\Models\Service;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Component;
 
 class EditCompose extends Component
 {
+    use AuthorizesRequests;
+
     public Service $service;
 
     public $serviceId;
@@ -72,19 +75,29 @@ class EditCompose extends Component
 
     public function saveEditedCompose()
     {
-        $this->dispatch('info', 'Saving new docker compose...');
-        $this->dispatch('saveCompose', $this->dockerComposeRaw);
-        $this->dispatch('refreshStorages');
+        try {
+            $this->authorize('update', $this->service);
+            $this->dispatch('info', 'Saving new docker compose...');
+            $this->dispatch('saveCompose', $this->dockerComposeRaw);
+            $this->dispatch('refreshStorages');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function instantSave()
     {
-        $this->validate([
-            'isContainerLabelEscapeEnabled' => 'required',
-        ]);
-        $this->syncData(true);
-        $this->service->save(['is_container_label_escape_enabled' => $this->isContainerLabelEscapeEnabled]);
-        $this->dispatch('success', 'Service updated successfully');
+        try {
+            $this->authorize('update', $this->service);
+            $this->validate([
+                'isContainerLabelEscapeEnabled' => 'required',
+            ]);
+            $this->syncData(true);
+            $this->service->save(['is_container_label_escape_enabled' => $this->isContainerLabelEscapeEnabled]);
+            $this->dispatch('success', 'Service updated successfully');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function render()
diff --git a/app/Livewire/Project/Service/FileStorage.php b/app/Livewire/Project/Service/FileStorage.php
index 079115bb6..596a2646c 100644
--- a/app/Livewire/Project/Service/FileStorage.php
+++ b/app/Livewire/Project/Service/FileStorage.php
@@ -101,8 +101,7 @@ class FileStorage extends Component
     public function loadStorageOnServer()
     {
         try {
-            // Loading content is a read operation, so we use 'view' permission
-            $this->authorize('view', $this->resource);
+            $this->authorize('update', $this->resource);
 
             $this->fileStorage->loadStorageOnServer();
             $this->syncData();
diff --git a/app/Livewire/Project/Service/Heading.php b/app/Livewire/Project/Service/Heading.php
index c8a08d8f9..20502393b 100644
--- a/app/Livewire/Project/Service/Heading.php
+++ b/app/Livewire/Project/Service/Heading.php
@@ -7,12 +7,15 @@ use App\Actions\Service\StartService;
 use App\Actions\Service\StopService;
 use App\Enums\ProcessStatus;
 use App\Models\Service;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Facades\Auth;
 use Livewire\Component;
 use Spatie\Activitylog\Models\Activity;
 
 class Heading extends Component
 {
+    use AuthorizesRequests;
+
     public Service $service;
 
     public array $parameters;
@@ -99,13 +102,20 @@ class Heading extends Component
 
     public function start()
     {
-        $activity = StartService::run($this->service, pullLatestImages: true);
-        $this->dispatch('activityMonitor', $activity->id);
+        try {
+            $this->authorize('deploy', $this->service);
+            $activity = StartService::run($this->service, pullLatestImages: true);
+            $this->js("window.dispatchEvent(new CustomEvent('startservice'))");
+            $this->dispatch('activityMonitor', $activity->id);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function forceDeploy()
     {
         try {
+            $this->authorize('deploy', $this->service);
             $activities = Activity::where('properties->type_uuid', $this->service->uuid)
                 ->where(function ($q) {
                     $q->where('properties->status', ProcessStatus::IN_PROGRESS->value)
@@ -116,43 +126,57 @@ class Heading extends Component
                 $activity->save();
             }
             $activity = StartService::run($this->service, pullLatestImages: true, stopBeforeStart: true);
+            $this->js("window.dispatchEvent(new CustomEvent('startservice'))");
             $this->dispatch('activityMonitor', $activity->id);
-        } catch (\Exception $e) {
-            $this->dispatch('error', $e->getMessage());
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
     public function stop()
     {
         try {
+            $this->authorize('stop', $this->service);
             StopService::dispatch($this->service, false, $this->docker_cleanup);
-        } catch (\Exception $e) {
-            $this->dispatch('error', $e->getMessage());
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
     public function restart()
     {
-        $this->checkDeployments();
-        if ($this->isDeploymentProgress) {
-            $this->dispatch('error', 'There is a deployment in progress.');
+        try {
+            $this->authorize('deploy', $this->service);
+            $this->checkDeployments();
+            if ($this->isDeploymentProgress) {
+                $this->dispatch('error', 'There is a deployment in progress.');
 
-            return;
+                return;
+            }
+            $activity = StartService::run($this->service, stopBeforeStart: true);
+            $this->js("window.dispatchEvent(new CustomEvent('startservice'))");
+            $this->dispatch('activityMonitor', $activity->id);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
-        $activity = StartService::run($this->service, stopBeforeStart: true);
-        $this->dispatch('activityMonitor', $activity->id);
     }
 
     public function pullAndRestartEvent()
     {
-        $this->checkDeployments();
-        if ($this->isDeploymentProgress) {
-            $this->dispatch('error', 'There is a deployment in progress.');
+        try {
+            $this->authorize('deploy', $this->service);
+            $this->checkDeployments();
+            if ($this->isDeploymentProgress) {
+                $this->dispatch('error', 'There is a deployment in progress.');
 
-            return;
+                return;
+            }
+            $activity = StartService::run($this->service, pullLatestImages: true, stopBeforeStart: true);
+            $this->js("window.dispatchEvent(new CustomEvent('startservice'))");
+            $this->dispatch('activityMonitor', $activity->id);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
-        $activity = StartService::run($this->service, pullLatestImages: true, stopBeforeStart: true);
-        $this->dispatch('activityMonitor', $activity->id);
     }
 
     public function render()
diff --git a/app/Livewire/Project/Service/StackForm.php b/app/Livewire/Project/Service/StackForm.php
index 64a7d8d8b..86d5a57c1 100644
--- a/app/Livewire/Project/Service/StackForm.php
+++ b/app/Livewire/Project/Service/StackForm.php
@@ -4,16 +4,21 @@ namespace App\Livewire\Project\Service;
 
 use App\Models\Service;
 use App\Support\ValidationPatterns;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Livewire\Component;
 
 class StackForm extends Component
 {
+    use AuthorizesRequests;
+
     public Service $service;
 
     public Collection $fields;
 
+    public bool $isPasswordHiddenForMember = false;
+
     protected $listeners = ['saveCompose'];
 
     // Explicit properties
@@ -118,6 +123,17 @@ class StackForm extends Component
         })->flatMap(function ($group) {
             return $group;
         });
+
+        $this->isPasswordHiddenForMember = auth()->user()?->isMember() ?? false;
+        if ($this->isPasswordHiddenForMember) {
+            $this->fields = $this->fields->map(function ($field) {
+                if (data_get($field, 'isPassword')) {
+                    $field['value'] = null;
+                }
+
+                return $field;
+            });
+        }
     }
 
     public function saveCompose($raw)
@@ -128,14 +144,20 @@ class StackForm extends Component
 
     public function instantSave()
     {
-        $this->syncData(true);
-        $this->service->save();
-        $this->dispatch('success', 'Service settings saved.');
+        try {
+            $this->authorize('update', $this->service);
+            $this->syncData(true);
+            $this->service->save();
+            $this->dispatch('success', 'Service settings saved.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function submit($notify = true)
     {
         try {
+            $this->authorize('update', $this->service);
             $this->validate();
             $this->syncData(true);
 
diff --git a/app/Livewire/Project/Shared/Destination.php b/app/Livewire/Project/Shared/Destination.php
index 7ab81b7d1..1eb1dc580 100644
--- a/app/Livewire/Project/Shared/Destination.php
+++ b/app/Livewire/Project/Shared/Destination.php
@@ -7,12 +7,15 @@ use App\Actions\Docker\GetContainersStatus;
 use App\Events\ApplicationStatusChanged;
 use App\Models\Server;
 use App\Models\StandaloneDocker;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Collection;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
 class Destination extends Component
 {
+    use AuthorizesRequests;
+
     public $resource;
 
     public Collection $networks;
@@ -59,6 +62,7 @@ class Destination extends Component
     public function stop($serverId)
     {
         try {
+            $this->authorize('deploy', $this->resource);
             $server = Server::ownedByCurrentTeam()->findOrFail($serverId);
             StopApplicationOneServer::run($this->resource, $server);
             $this->refreshServers();
@@ -70,6 +74,7 @@ class Destination extends Component
     public function redeploy(int $network_id, int $server_id)
     {
         try {
+            $this->authorize('deploy', $this->resource);
             if ($this->resource->additional_servers->count() > 0 && str($this->resource->docker_registry_image_name)->isEmpty()) {
                 $this->dispatch('error', 'Failed to deploy.', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/multiple-servers">documentation</a>');
 
@@ -110,15 +115,20 @@ class Destination extends Component
 
     public function promote(int $network_id, int $server_id)
     {
-        $main_destination = $this->resource->destination;
-        $this->resource->update([
-            'destination_id' => $network_id,
-            'destination_type' => StandaloneDocker::class,
-        ]);
-        $this->resource->additional_networks()->detach($network_id, ['server_id' => $server_id]);
-        $this->resource->additional_networks()->attach($main_destination->id, ['server_id' => $main_destination->server->id]);
-        $this->refreshServers();
-        $this->resource->refresh();
+        try {
+            $this->authorize('update', $this->resource);
+            $main_destination = $this->resource->destination;
+            $this->resource->update([
+                'destination_id' => $network_id,
+                'destination_type' => StandaloneDocker::class,
+            ]);
+            $this->resource->additional_networks()->detach($network_id, ['server_id' => $server_id]);
+            $this->resource->additional_networks()->attach($main_destination->id, ['server_id' => $main_destination->server->id]);
+            $this->refreshServers();
+            $this->resource->refresh();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function refreshServers()
@@ -130,13 +140,19 @@ class Destination extends Component
 
     public function addServer(int $network_id, int $server_id)
     {
-        $this->resource->additional_networks()->attach($network_id, ['server_id' => $server_id]);
-        $this->dispatch('refresh');
+        try {
+            $this->authorize('update', $this->resource);
+            $this->resource->additional_networks()->attach($network_id, ['server_id' => $server_id]);
+            $this->dispatch('refresh');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function removeServer(int $network_id, int $server_id, $password)
     {
         try {
+            $this->authorize('update', $this->resource);
             if (! verifyPasswordConfirmation($password, $this)) {
                 return;
             }
diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/All.php b/app/Livewire/Project/Shared/EnvironmentVariable/All.php
index f250a860b..a69a41d90 100644
--- a/app/Livewire/Project/Shared/EnvironmentVariable/All.php
+++ b/app/Livewire/Project/Shared/EnvironmentVariable/All.php
@@ -72,7 +72,7 @@ class All extends Component
             $query->orderBy('order');
         }
 
-        return $query->get();
+        return $this->nullLockedValues($query->get());
     }
 
     public function getEnvironmentVariablesPreviewProperty()
@@ -86,7 +86,21 @@ class All extends Component
             $query->orderBy('order');
         }
 
-        return $query->get();
+        return $this->nullLockedValues($query->get());
+    }
+
+    private function nullLockedValues($envs)
+    {
+        $isMember = auth()->user()?->isMember();
+
+        $envs->each(function ($env) use ($isMember) {
+            if ($env->is_shown_once || $isMember) {
+                $env->value = null;
+                $env->real_value = null;
+            }
+        });
+
+        return $envs;
     }
 
     public function getHardcodedEnvironmentVariablesProperty()
@@ -155,7 +169,12 @@ class All extends Component
 
     private function formatEnvironmentVariables($variables)
     {
-        return $variables->map(function ($item) {
+        $isMember = auth()->user()?->isMember();
+
+        return $variables->map(function ($item) use ($isMember) {
+            if ($isMember) {
+                return "$item->key=(Hidden, only admins can view)";
+            }
             if ($item->is_shown_once) {
                 return "$item->key=(Locked Secret, delete and add again to change)";
             }
diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/Show.php b/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
index 2a18be13c..74f3606e7 100644
--- a/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
+++ b/app/Livewire/Project/Shared/EnvironmentVariable/Show.php
@@ -56,6 +56,8 @@ class Show extends Component
 
     public bool $is_redis_credential = false;
 
+    public bool $isValueHidden = false;
+
     public array $problematicVariables = [];
 
     protected $listeners = [
@@ -142,6 +144,13 @@ class Show extends Component
             $this->is_really_required = $this->env->is_really_required ?? false;
             $this->is_shared = $this->env->is_shared ?? false;
             $this->real_value = $this->env->real_value;
+
+            if ($this->env->is_shown_once || auth()->user()?->isMember()) {
+                $this->value = null;
+                $this->real_value = null;
+            }
+
+            $this->isValueHidden = auth()->user()?->isMember() ?? false;
         }
     }
 
diff --git a/app/Livewire/Project/Shared/HealthChecks.php b/app/Livewire/Project/Shared/HealthChecks.php
index 0d5d71b45..6eaf0cdd0 100644
--- a/app/Livewire/Project/Shared/HealthChecks.php
+++ b/app/Livewire/Project/Shared/HealthChecks.php
@@ -78,8 +78,12 @@ class HealthChecks extends Component
 
     public function mount()
     {
-        $this->authorize('view', $this->resource);
-        $this->syncData();
+        try {
+            $this->authorize('view', $this->resource);
+            $this->syncData();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function syncData(bool $toModel = false): void
diff --git a/app/Livewire/Project/Shared/ResourceOperations.php b/app/Livewire/Project/Shared/ResourceOperations.php
index e769e4bcb..25545c4b0 100644
--- a/app/Livewire/Project/Shared/ResourceOperations.php
+++ b/app/Livewire/Project/Shared/ResourceOperations.php
@@ -47,224 +47,87 @@ class ResourceOperations extends Component
 
     public function cloneTo($destination_id)
     {
-        $this->authorize('update', $this->resource);
+        try {
+            $this->authorize('update', $this->resource);
 
-        $teamScope = fn ($q) => $q->where('team_id', currentTeam()->id);
-        $new_destination = StandaloneDocker::whereHas('server', $teamScope)->find($destination_id);
-        if (! $new_destination) {
-            $new_destination = SwarmDocker::whereHas('server', $teamScope)->find($destination_id);
-        }
-        if (! $new_destination) {
-            return $this->addError('destination_id', 'Destination not found.');
-        }
-        $uuid = (string) new Cuid2;
-        $server = $new_destination->server;
-
-        if ($this->resource->getMorphClass() === \App\Models\Application::class) {
-            $new_resource = clone_application($this->resource, $new_destination, ['uuid' => $uuid], $this->cloneVolumeData);
-
-            $route = route('project.application.configuration', [
-                'project_uuid' => $this->projectUuid,
-                'environment_uuid' => $this->environmentUuid,
-                'application_uuid' => $new_resource->uuid,
-            ]).'#resource-operations';
-
-            return redirect()->to($route);
-        } elseif (
-            $this->resource->getMorphClass() === \App\Models\StandalonePostgresql::class ||
-            $this->resource->getMorphClass() === \App\Models\StandaloneMongodb::class ||
-            $this->resource->getMorphClass() === \App\Models\StandaloneMysql::class ||
-            $this->resource->getMorphClass() === \App\Models\StandaloneMariadb::class ||
-            $this->resource->getMorphClass() === \App\Models\StandaloneRedis::class ||
-            $this->resource->getMorphClass() === \App\Models\StandaloneKeydb::class ||
-            $this->resource->getMorphClass() === \App\Models\StandaloneDragonfly::class ||
-            $this->resource->getMorphClass() === \App\Models\StandaloneClickhouse::class
-        ) {
+            $teamScope = fn ($q) => $q->where('team_id', currentTeam()->id);
+            $new_destination = StandaloneDocker::whereHas('server', $teamScope)->find($destination_id);
+            if (! $new_destination) {
+                $new_destination = SwarmDocker::whereHas('server', $teamScope)->find($destination_id);
+            }
+            if (! $new_destination) {
+                return $this->addError('destination_id', 'Destination not found.');
+            }
             $uuid = (string) new Cuid2;
-            $new_resource = $this->resource->replicate([
-                'id',
-                'created_at',
-                'updated_at',
-            ])->fill([
-                'uuid' => $uuid,
-                'name' => $this->resource->name.'-clone-'.$uuid,
-                'status' => 'exited',
-                'started_at' => null,
-                'destination_id' => $new_destination->id,
-            ]);
-            $new_resource->save();
+            $server = $new_destination->server;
 
-            $tags = $this->resource->tags;
-            foreach ($tags as $tag) {
-                $new_resource->tags()->attach($tag->id);
-            }
+            if ($this->resource->getMorphClass() === \App\Models\Application::class) {
+                $new_resource = clone_application($this->resource, $new_destination, ['uuid' => $uuid], $this->cloneVolumeData);
 
-            $new_resource->persistentStorages()->delete();
-            $persistentVolumes = $this->resource->persistentStorages()->get();
-            foreach ($persistentVolumes as $volume) {
-                $originalName = $volume->name;
-                $newName = '';
+                $route = route('project.application.configuration', [
+                    'project_uuid' => $this->projectUuid,
+                    'environment_uuid' => $this->environmentUuid,
+                    'application_uuid' => $new_resource->uuid,
+                ]).'#resource-operations';
 
-                if (str_starts_with($originalName, 'postgres-data-')) {
-                    $newName = 'postgres-data-'.$new_resource->uuid;
-                } elseif (str_starts_with($originalName, 'mysql-data-')) {
-                    $newName = 'mysql-data-'.$new_resource->uuid;
-                } elseif (str_starts_with($originalName, 'redis-data-')) {
-                    $newName = 'redis-data-'.$new_resource->uuid;
-                } elseif (str_starts_with($originalName, 'clickhouse-data-')) {
-                    $newName = 'clickhouse-data-'.$new_resource->uuid;
-                } elseif (str_starts_with($originalName, 'mariadb-data-')) {
-                    $newName = 'mariadb-data-'.$new_resource->uuid;
-                } elseif (str_starts_with($originalName, 'mongodb-data-')) {
-                    $newName = 'mongodb-data-'.$new_resource->uuid;
-                } elseif (str_starts_with($originalName, 'keydb-data-')) {
-                    $newName = 'keydb-data-'.$new_resource->uuid;
-                } elseif (str_starts_with($originalName, 'dragonfly-data-')) {
-                    $newName = 'dragonfly-data-'.$new_resource->uuid;
-                } else {
-                    if (str_starts_with($volume->name, $this->resource->uuid)) {
-                        $newName = str($volume->name)->replace($this->resource->uuid, $new_resource->uuid);
-                    } else {
-                        $newName = $new_resource->uuid.'-'.$volume->name;
-                    }
-                }
-
-                $newPersistentVolume = $volume->replicate([
-                    'id',
-                    'created_at',
-                    'updated_at',
-                ])->fill([
-                    'name' => $newName,
-                    'resource_id' => $new_resource->id,
-                ]);
-                $newPersistentVolume->save();
-
-                if ($this->cloneVolumeData) {
-                    try {
-                        StopDatabase::dispatch($this->resource);
-                        $sourceVolume = $volume->name;
-                        $targetVolume = $newPersistentVolume->name;
-                        $sourceServer = $this->resource->destination->server;
-                        $targetServer = $new_resource->destination->server;
-
-                        VolumeCloneJob::dispatch($sourceVolume, $targetVolume, $sourceServer, $targetServer, $newPersistentVolume);
-
-                        StartDatabase::dispatch($this->resource);
-                    } catch (\Exception $e) {
-                        \Log::error('Failed to copy volume data for '.$volume->name.': '.$e->getMessage());
-                    }
-                }
-            }
-
-            $fileStorages = $this->resource->fileStorages()->get();
-            foreach ($fileStorages as $storage) {
-                $newStorage = $storage->replicate([
-                    'id',
-                    'created_at',
-                    'updated_at',
-                ])->fill([
-                    'resource_id' => $new_resource->id,
-                ]);
-                $newStorage->save();
-            }
-
-            $scheduledBackups = $this->resource->scheduledBackups()->get();
-            foreach ($scheduledBackups as $backup) {
+                return redirect()->to($route);
+            } elseif (
+                $this->resource->getMorphClass() === \App\Models\StandalonePostgresql::class ||
+                $this->resource->getMorphClass() === \App\Models\StandaloneMongodb::class ||
+                $this->resource->getMorphClass() === \App\Models\StandaloneMysql::class ||
+                $this->resource->getMorphClass() === \App\Models\StandaloneMariadb::class ||
+                $this->resource->getMorphClass() === \App\Models\StandaloneRedis::class ||
+                $this->resource->getMorphClass() === \App\Models\StandaloneKeydb::class ||
+                $this->resource->getMorphClass() === \App\Models\StandaloneDragonfly::class ||
+                $this->resource->getMorphClass() === \App\Models\StandaloneClickhouse::class
+            ) {
                 $uuid = (string) new Cuid2;
-                $newBackup = $backup->replicate([
+                $new_resource = $this->resource->replicate([
                     'id',
                     'created_at',
                     'updated_at',
                 ])->fill([
                     'uuid' => $uuid,
-                    'database_id' => $new_resource->id,
-                    'database_type' => $new_resource->getMorphClass(),
-                    'team_id' => currentTeam()->id,
-                ]);
-                $newBackup->save();
-            }
-
-            $environmentVaribles = $this->resource->environment_variables()->get();
-            foreach ($environmentVaribles as $environmentVarible) {
-                $payload = [
-                    'resourceable_id' => $new_resource->id,
-                    'resourceable_type' => $new_resource->getMorphClass(),
-                ];
-                $newEnvironmentVariable = $environmentVarible->replicate([
-                    'id',
-                    'created_at',
-                    'updated_at',
-                ])->fill($payload);
-                $newEnvironmentVariable->save();
-            }
-
-            $route = route('project.database.configuration', [
-                'project_uuid' => $this->projectUuid,
-                'environment_uuid' => $this->environmentUuid,
-                'database_uuid' => $new_resource->uuid,
-            ]).'#resource-operations';
-
-            return redirect()->to($route);
-        } elseif ($this->resource->type() === 'service') {
-            $uuid = (string) new Cuid2;
-            $new_resource = $this->resource->replicate([
-                'id',
-                'created_at',
-                'updated_at',
-            ])->fill([
-                'uuid' => $uuid,
-                'name' => $this->resource->name.'-clone-'.$uuid,
-                'destination_id' => $new_destination->id,
-                'destination_type' => $new_destination->getMorphClass(),
-                'server_id' => $new_destination->server_id, // server_id is probably not needed anymore because of the new polymorphic relationships (here it is needed for clone to a different server to work - but maybe we can drop the column)
-            ]);
-
-            $new_resource->save();
-
-            $tags = $this->resource->tags;
-            foreach ($tags as $tag) {
-                $new_resource->tags()->attach($tag->id);
-            }
-
-            $scheduledTasks = $this->resource->scheduled_tasks()->get();
-            foreach ($scheduledTasks as $task) {
-                $newTask = $task->replicate([
-                    'id',
-                    'created_at',
-                    'updated_at',
-                ])->fill([
-                    'uuid' => (string) new Cuid2,
-                    'service_id' => $new_resource->id,
-                    'team_id' => currentTeam()->id,
-                ]);
-                $newTask->save();
-            }
-
-            $environmentVariables = $this->resource->environment_variables()->get();
-            foreach ($environmentVariables as $environmentVariable) {
-                $newEnvironmentVariable = $environmentVariable->replicate([
-                    'id',
-                    'created_at',
-                    'updated_at',
-                ])->fill([
-                    'resourceable_id' => $new_resource->id,
-                    'resourceable_type' => $new_resource->getMorphClass(),
-                ]);
-                $newEnvironmentVariable->save();
-            }
-
-            foreach ($new_resource->applications() as $application) {
-                $application->update([
+                    'name' => $this->resource->name.'-clone-'.$uuid,
                     'status' => 'exited',
+                    'started_at' => null,
+                    'destination_id' => $new_destination->id,
                 ]);
+                $new_resource->save();
 
-                $persistentVolumes = $application->persistentStorages()->get();
+                $tags = $this->resource->tags;
+                foreach ($tags as $tag) {
+                    $new_resource->tags()->attach($tag->id);
+                }
+
+                $new_resource->persistentStorages()->delete();
+                $persistentVolumes = $this->resource->persistentStorages()->get();
                 foreach ($persistentVolumes as $volume) {
+                    $originalName = $volume->name;
                     $newName = '';
-                    if (str_starts_with($volume->name, $volume->resource->uuid)) {
-                        $newName = str($volume->name)->replace($volume->resource->uuid, $application->uuid);
+
+                    if (str_starts_with($originalName, 'postgres-data-')) {
+                        $newName = 'postgres-data-'.$new_resource->uuid;
+                    } elseif (str_starts_with($originalName, 'mysql-data-')) {
+                        $newName = 'mysql-data-'.$new_resource->uuid;
+                    } elseif (str_starts_with($originalName, 'redis-data-')) {
+                        $newName = 'redis-data-'.$new_resource->uuid;
+                    } elseif (str_starts_with($originalName, 'clickhouse-data-')) {
+                        $newName = 'clickhouse-data-'.$new_resource->uuid;
+                    } elseif (str_starts_with($originalName, 'mariadb-data-')) {
+                        $newName = 'mariadb-data-'.$new_resource->uuid;
+                    } elseif (str_starts_with($originalName, 'mongodb-data-')) {
+                        $newName = 'mongodb-data-'.$new_resource->uuid;
+                    } elseif (str_starts_with($originalName, 'keydb-data-')) {
+                        $newName = 'keydb-data-'.$new_resource->uuid;
+                    } elseif (str_starts_with($originalName, 'dragonfly-data-')) {
+                        $newName = 'dragonfly-data-'.$new_resource->uuid;
                     } else {
-                        $newName = $application->uuid.'-'.str($volume->name)->afterLast('-');
+                        if (str_starts_with($volume->name, $this->resource->uuid)) {
+                            $newName = str($volume->name)->replace($this->resource->uuid, $new_resource->uuid);
+                        } else {
+                            $newName = $new_resource->uuid.'-'.$volume->name;
+                        }
                     }
 
                     $newPersistentVolume = $volume->replicate([
@@ -273,79 +136,220 @@ class ResourceOperations extends Component
                         'updated_at',
                     ])->fill([
                         'name' => $newName,
-                        'resource_id' => $application->id,
+                        'resource_id' => $new_resource->id,
                     ]);
                     $newPersistentVolume->save();
 
                     if ($this->cloneVolumeData) {
                         try {
-                            StopService::dispatch($application);
+                            StopDatabase::dispatch($this->resource);
                             $sourceVolume = $volume->name;
                             $targetVolume = $newPersistentVolume->name;
-                            $sourceServer = $application->service->destination->server;
+                            $sourceServer = $this->resource->destination->server;
                             $targetServer = $new_resource->destination->server;
 
                             VolumeCloneJob::dispatch($sourceVolume, $targetVolume, $sourceServer, $targetServer, $newPersistentVolume);
 
-                            StartService::dispatch($application);
+                            StartDatabase::dispatch($this->resource);
                         } catch (\Exception $e) {
                             \Log::error('Failed to copy volume data for '.$volume->name.': '.$e->getMessage());
                         }
                     }
                 }
-            }
 
-            foreach ($new_resource->databases() as $database) {
-                $database->update([
-                    'status' => 'exited',
-                ]);
-
-                $persistentVolumes = $database->persistentStorages()->get();
-                foreach ($persistentVolumes as $volume) {
-                    $newName = '';
-                    if (str_starts_with($volume->name, $volume->resource->uuid)) {
-                        $newName = str($volume->name)->replace($volume->resource->uuid, $database->uuid);
-                    } else {
-                        $newName = $database->uuid.'-'.str($volume->name)->afterLast('-');
-                    }
-
-                    $newPersistentVolume = $volume->replicate([
+                $fileStorages = $this->resource->fileStorages()->get();
+                foreach ($fileStorages as $storage) {
+                    $newStorage = $storage->replicate([
                         'id',
                         'created_at',
                         'updated_at',
                     ])->fill([
-                        'name' => $newName,
-                        'resource_id' => $database->id,
+                        'resource_id' => $new_resource->id,
                     ]);
-                    $newPersistentVolume->save();
+                    $newStorage->save();
+                }
 
-                    if ($this->cloneVolumeData) {
-                        try {
-                            StopService::dispatch($database->service);
-                            $sourceVolume = $volume->name;
-                            $targetVolume = $newPersistentVolume->name;
-                            $sourceServer = $database->service->destination->server;
-                            $targetServer = $new_resource->destination->server;
+                $scheduledBackups = $this->resource->scheduledBackups()->get();
+                foreach ($scheduledBackups as $backup) {
+                    $uuid = (string) new Cuid2;
+                    $newBackup = $backup->replicate([
+                        'id',
+                        'created_at',
+                        'updated_at',
+                    ])->fill([
+                        'uuid' => $uuid,
+                        'database_id' => $new_resource->id,
+                        'database_type' => $new_resource->getMorphClass(),
+                        'team_id' => currentTeam()->id,
+                    ]);
+                    $newBackup->save();
+                }
 
-                            VolumeCloneJob::dispatch($sourceVolume, $targetVolume, $sourceServer, $targetServer, $newPersistentVolume);
+                $environmentVaribles = $this->resource->environment_variables()->get();
+                foreach ($environmentVaribles as $environmentVarible) {
+                    $payload = [
+                        'resourceable_id' => $new_resource->id,
+                        'resourceable_type' => $new_resource->getMorphClass(),
+                    ];
+                    $newEnvironmentVariable = $environmentVarible->replicate([
+                        'id',
+                        'created_at',
+                        'updated_at',
+                    ])->fill($payload);
+                    $newEnvironmentVariable->save();
+                }
 
-                            StartService::dispatch($database->service);
-                        } catch (\Exception $e) {
-                            \Log::error('Failed to copy volume data for '.$volume->name.': '.$e->getMessage());
+                $route = route('project.database.configuration', [
+                    'project_uuid' => $this->projectUuid,
+                    'environment_uuid' => $this->environmentUuid,
+                    'database_uuid' => $new_resource->uuid,
+                ]).'#resource-operations';
+
+                return redirect()->to($route);
+            } elseif ($this->resource->type() === 'service') {
+                $uuid = (string) new Cuid2;
+                $new_resource = $this->resource->replicate([
+                    'id',
+                    'created_at',
+                    'updated_at',
+                ])->fill([
+                    'uuid' => $uuid,
+                    'name' => $this->resource->name.'-clone-'.$uuid,
+                    'destination_id' => $new_destination->id,
+                    'destination_type' => $new_destination->getMorphClass(),
+                    'server_id' => $new_destination->server_id, // server_id is probably not needed anymore because of the new polymorphic relationships (here it is needed for clone to a different server to work - but maybe we can drop the column)
+                ]);
+
+                $new_resource->save();
+
+                $tags = $this->resource->tags;
+                foreach ($tags as $tag) {
+                    $new_resource->tags()->attach($tag->id);
+                }
+
+                $scheduledTasks = $this->resource->scheduled_tasks()->get();
+                foreach ($scheduledTasks as $task) {
+                    $newTask = $task->replicate([
+                        'id',
+                        'created_at',
+                        'updated_at',
+                    ])->fill([
+                        'uuid' => (string) new Cuid2,
+                        'service_id' => $new_resource->id,
+                        'team_id' => currentTeam()->id,
+                    ]);
+                    $newTask->save();
+                }
+
+                $environmentVariables = $this->resource->environment_variables()->get();
+                foreach ($environmentVariables as $environmentVariable) {
+                    $newEnvironmentVariable = $environmentVariable->replicate([
+                        'id',
+                        'created_at',
+                        'updated_at',
+                    ])->fill([
+                        'resourceable_id' => $new_resource->id,
+                        'resourceable_type' => $new_resource->getMorphClass(),
+                    ]);
+                    $newEnvironmentVariable->save();
+                }
+
+                foreach ($new_resource->applications() as $application) {
+                    $application->update([
+                        'status' => 'exited',
+                    ]);
+
+                    $persistentVolumes = $application->persistentStorages()->get();
+                    foreach ($persistentVolumes as $volume) {
+                        $newName = '';
+                        if (str_starts_with($volume->name, $volume->resource->uuid)) {
+                            $newName = str($volume->name)->replace($volume->resource->uuid, $application->uuid);
+                        } else {
+                            $newName = $application->uuid.'-'.str($volume->name)->afterLast('-');
+                        }
+
+                        $newPersistentVolume = $volume->replicate([
+                            'id',
+                            'created_at',
+                            'updated_at',
+                        ])->fill([
+                            'name' => $newName,
+                            'resource_id' => $application->id,
+                        ]);
+                        $newPersistentVolume->save();
+
+                        if ($this->cloneVolumeData) {
+                            try {
+                                StopService::dispatch($application);
+                                $sourceVolume = $volume->name;
+                                $targetVolume = $newPersistentVolume->name;
+                                $sourceServer = $application->service->destination->server;
+                                $targetServer = $new_resource->destination->server;
+
+                                VolumeCloneJob::dispatch($sourceVolume, $targetVolume, $sourceServer, $targetServer, $newPersistentVolume);
+
+                                StartService::dispatch($application);
+                            } catch (\Exception $e) {
+                                \Log::error('Failed to copy volume data for '.$volume->name.': '.$e->getMessage());
+                            }
                         }
                     }
                 }
+
+                foreach ($new_resource->databases() as $database) {
+                    $database->update([
+                        'status' => 'exited',
+                    ]);
+
+                    $persistentVolumes = $database->persistentStorages()->get();
+                    foreach ($persistentVolumes as $volume) {
+                        $newName = '';
+                        if (str_starts_with($volume->name, $volume->resource->uuid)) {
+                            $newName = str($volume->name)->replace($volume->resource->uuid, $database->uuid);
+                        } else {
+                            $newName = $database->uuid.'-'.str($volume->name)->afterLast('-');
+                        }
+
+                        $newPersistentVolume = $volume->replicate([
+                            'id',
+                            'created_at',
+                            'updated_at',
+                        ])->fill([
+                            'name' => $newName,
+                            'resource_id' => $database->id,
+                        ]);
+                        $newPersistentVolume->save();
+
+                        if ($this->cloneVolumeData) {
+                            try {
+                                StopService::dispatch($database->service);
+                                $sourceVolume = $volume->name;
+                                $targetVolume = $newPersistentVolume->name;
+                                $sourceServer = $database->service->destination->server;
+                                $targetServer = $new_resource->destination->server;
+
+                                VolumeCloneJob::dispatch($sourceVolume, $targetVolume, $sourceServer, $targetServer, $newPersistentVolume);
+
+                                StartService::dispatch($database->service);
+                            } catch (\Exception $e) {
+                                \Log::error('Failed to copy volume data for '.$volume->name.': '.$e->getMessage());
+                            }
+                        }
+                    }
+                }
+
+                $new_resource->parse();
+
+                $route = route('project.service.configuration', [
+                    'project_uuid' => $this->projectUuid,
+                    'environment_uuid' => $this->environmentUuid,
+                    'service_uuid' => $new_resource->uuid,
+                ]).'#resource-operations';
+
+                return redirect()->to($route);
             }
-
-            $new_resource->parse();
-
-            $route = route('project.service.configuration', [
-                'project_uuid' => $this->projectUuid,
-                'environment_uuid' => $this->environmentUuid,
-                'service_uuid' => $new_resource->uuid,
-            ]).'#resource-operations';
-
-            return redirect()->to($route);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
diff --git a/app/Livewire/Project/Shared/UploadConfig.php b/app/Livewire/Project/Shared/UploadConfig.php
index 1b10f588b..0f0894687 100644
--- a/app/Livewire/Project/Shared/UploadConfig.php
+++ b/app/Livewire/Project/Shared/UploadConfig.php
@@ -3,10 +3,13 @@
 namespace App\Livewire\Project\Shared;
 
 use App\Models\Application;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Component;
 
 class UploadConfig extends Component
 {
+    use AuthorizesRequests;
+
     public $config;
 
     public $applicationId;
@@ -29,13 +32,12 @@ class UploadConfig extends Component
     public function uploadConfig()
     {
         try {
-            $application = Application::findOrFail($this->applicationId);
+            $application = Application::ownedByCurrentTeam()->findOrFail($this->applicationId);
+            $this->authorize('update', $application);
             $application->setConfig($this->config);
             $this->dispatch('success', 'Application settings updated');
-        } catch (\Exception $e) {
-            $this->dispatch('error', $e->getMessage());
-
-            return;
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
diff --git a/app/Livewire/Project/Show.php b/app/Livewire/Project/Show.php
index e884abb4e..c86fa377d 100644
--- a/app/Livewire/Project/Show.php
+++ b/app/Livewire/Project/Show.php
@@ -5,11 +5,14 @@ namespace App\Livewire\Project;
 use App\Models\Environment;
 use App\Models\Project;
 use App\Support\ValidationPatterns;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
 class Show extends Component
 {
+    use AuthorizesRequests;
+
     public Project $project;
 
     public string $name;
@@ -41,6 +44,7 @@ class Show extends Component
     public function submit()
     {
         try {
+            $this->authorize('create', Environment::class);
             $this->validate();
             $environment = Environment::create([
                 'name' => $this->name,
diff --git a/app/Livewire/Security/ApiTokens.php b/app/Livewire/Security/ApiTokens.php
index a263acedf..97d2bfb44 100644
--- a/app/Livewire/Security/ApiTokens.php
+++ b/app/Livewire/Security/ApiTokens.php
@@ -23,6 +23,10 @@ class ApiTokens extends Component
 
     public bool $canUseWritePermissions = false;
 
+    public bool $canUseDeployPermissions = false;
+
+    public bool $canUseSensitivePermissions = false;
+
     public function render()
     {
         return view('livewire.security.api-tokens');
@@ -33,6 +37,8 @@ class ApiTokens extends Component
         $this->isApiEnabled = InstanceSettings::get()->is_api_enabled;
         $this->canUseRootPermissions = auth()->user()->can('useRootPermissions', PersonalAccessToken::class);
         $this->canUseWritePermissions = auth()->user()->can('useWritePermissions', PersonalAccessToken::class);
+        $this->canUseDeployPermissions = auth()->user()->can('useDeployPermissions', PersonalAccessToken::class);
+        $this->canUseSensitivePermissions = auth()->user()->can('useSensitivePermissions', PersonalAccessToken::class);
         $this->getTokens();
     }
 
@@ -43,23 +49,35 @@ class ApiTokens extends Component
 
     public function updatedPermissions($permissionToUpdate)
     {
-        // Check if user is trying to use restricted permissions
-        if ($permissionToUpdate == 'root' && ! $this->canUseRootPermissions) {
+        // Re-evaluate policies fresh — never trust stored snapshot booleans
+        if ($permissionToUpdate == 'root' && ! auth()->user()->can('useRootPermissions', PersonalAccessToken::class)) {
             $this->dispatch('error', 'You do not have permission to use root permissions.');
-            // Remove root from permissions if it was somehow added
             $this->permissions = array_diff($this->permissions, ['root']);
 
             return;
         }
 
-        if (in_array($permissionToUpdate, ['write', 'write:sensitive']) && ! $this->canUseWritePermissions) {
+        if (in_array($permissionToUpdate, ['write', 'write:sensitive']) && ! auth()->user()->can('useWritePermissions', PersonalAccessToken::class)) {
             $this->dispatch('error', 'You do not have permission to use write permissions.');
-            // Remove write permissions if they were somehow added
             $this->permissions = array_diff($this->permissions, ['write', 'write:sensitive']);
 
             return;
         }
 
+        if ($permissionToUpdate == 'deploy' && ! auth()->user()->can('useDeployPermissions', PersonalAccessToken::class)) {
+            $this->dispatch('error', 'You do not have permission to use deploy permissions.');
+            $this->permissions = array_diff($this->permissions, ['deploy']);
+
+            return;
+        }
+
+        if ($permissionToUpdate == 'read:sensitive' && ! auth()->user()->can('useSensitivePermissions', PersonalAccessToken::class)) {
+            $this->dispatch('error', 'You do not have permission to use read:sensitive permissions.');
+            $this->permissions = array_diff($this->permissions, ['read:sensitive']);
+
+            return;
+        }
+
         if ($permissionToUpdate == 'root') {
             $this->permissions = ['root'];
         } elseif ($permissionToUpdate == 'read:sensitive' && ! in_array('read', $this->permissions)) {
@@ -79,20 +97,31 @@ class ApiTokens extends Component
         try {
             $this->authorize('create', PersonalAccessToken::class);
 
-            // Validate permissions based on user role
-            if (in_array('root', $this->permissions) && ! $this->canUseRootPermissions) {
+            // Re-evaluate policies fresh against the current authenticated user.
+            // Never trust $this->canUse* booleans — they come from the Livewire
+            // snapshot which can be replayed from another user's session.
+            if (in_array('root', $this->permissions) && ! auth()->user()->can('useRootPermissions', PersonalAccessToken::class)) {
                 throw new \Exception('You do not have permission to create tokens with root permissions.');
             }
 
-            if (array_intersect(['write', 'write:sensitive'], $this->permissions) && ! $this->canUseWritePermissions) {
+            if (array_intersect(['write', 'write:sensitive'], $this->permissions) && ! auth()->user()->can('useWritePermissions', PersonalAccessToken::class)) {
                 throw new \Exception('You do not have permission to create tokens with write permissions.');
             }
 
+            if (in_array('deploy', $this->permissions) && ! auth()->user()->can('useDeployPermissions', PersonalAccessToken::class)) {
+                throw new \Exception('You do not have permission to create tokens with deploy permissions.');
+            }
+
+            if (in_array('read:sensitive', $this->permissions) && ! auth()->user()->can('useSensitivePermissions', PersonalAccessToken::class)) {
+                throw new \Exception('You do not have permission to create tokens with read:sensitive permissions.');
+            }
+
             $this->validate([
                 'description' => 'required|min:3|max:255',
             ]);
             $token = auth()->user()->createToken($this->description, array_values($this->permissions));
             $this->getTokens();
+            // Do NOT strip the numeric prefix (e.g. "69|...") — Sanctum uses it to index and look up tokens.
             session()->flash('token', $token->plainTextToken);
         } catch (\Exception $e) {
             return handleError($e, $this);
diff --git a/app/Livewire/Security/CloudInitScriptForm.php b/app/Livewire/Security/CloudInitScriptForm.php
index 33beff334..5e4ca9853 100644
--- a/app/Livewire/Security/CloudInitScriptForm.php
+++ b/app/Livewire/Security/CloudInitScriptForm.php
@@ -20,15 +20,19 @@ class CloudInitScriptForm extends Component
 
     public function mount(?int $scriptId = null)
     {
-        if ($scriptId) {
-            $this->scriptId = $scriptId;
-            $cloudInitScript = CloudInitScript::ownedByCurrentTeam()->findOrFail($scriptId);
-            $this->authorize('update', $cloudInitScript);
+        try {
+            if ($scriptId) {
+                $this->scriptId = $scriptId;
+                $cloudInitScript = CloudInitScript::ownedByCurrentTeam()->findOrFail($scriptId);
+                $this->authorize('update', $cloudInitScript);
 
-            $this->name = $cloudInitScript->name;
-            $this->script = $cloudInitScript->script;
-        } else {
-            $this->authorize('create', CloudInitScript::class);
+                $this->name = $cloudInitScript->name;
+                $this->script = $cloudInitScript->script;
+            } else {
+                $this->authorize('create', CloudInitScript::class);
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
diff --git a/app/Livewire/Security/CloudProviderTokenForm.php b/app/Livewire/Security/CloudProviderTokenForm.php
index 7affb1531..ec4513ff3 100644
--- a/app/Livewire/Security/CloudProviderTokenForm.php
+++ b/app/Livewire/Security/CloudProviderTokenForm.php
@@ -21,7 +21,11 @@ class CloudProviderTokenForm extends Component
 
     public function mount()
     {
-        $this->authorize('create', CloudProviderToken::class);
+        try {
+            $this->authorize('create', CloudProviderToken::class);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     protected function rules(): array
diff --git a/app/Livewire/Security/CloudProviderTokens.php b/app/Livewire/Security/CloudProviderTokens.php
index cfef30772..b7f389534 100644
--- a/app/Livewire/Security/CloudProviderTokens.php
+++ b/app/Livewire/Security/CloudProviderTokens.php
@@ -14,8 +14,12 @@ class CloudProviderTokens extends Component
 
     public function mount()
     {
-        $this->authorize('viewAny', CloudProviderToken::class);
-        $this->loadTokens();
+        try {
+            $this->authorize('viewAny', CloudProviderToken::class);
+            $this->loadTokens();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function getListeners()
diff --git a/app/Livewire/Security/PrivateKey/Index.php b/app/Livewire/Security/PrivateKey/Index.php
index 1eb66ae3e..0362b65fa 100644
--- a/app/Livewire/Security/PrivateKey/Index.php
+++ b/app/Livewire/Security/PrivateKey/Index.php
@@ -21,8 +21,12 @@ class Index extends Component
 
     public function cleanupUnusedKeys()
     {
-        $this->authorize('create', PrivateKey::class);
-        PrivateKey::cleanupUnusedKeys();
-        $this->dispatch('success', 'Unused keys have been cleaned up.');
+        try {
+            $this->authorize('create', PrivateKey::class);
+            PrivateKey::cleanupUnusedKeys();
+            $this->dispatch('success', 'Unused keys have been cleaned up.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 }
diff --git a/app/Livewire/Server/CloudflareTunnel.php b/app/Livewire/Server/CloudflareTunnel.php
index 24f8e022e..2ab829854 100644
--- a/app/Livewire/Server/CloudflareTunnel.php
+++ b/app/Livewire/Server/CloudflareTunnel.php
@@ -72,12 +72,16 @@ class CloudflareTunnel extends Component
 
     public function manualCloudflareConfig()
     {
-        $this->authorize('update', $this->server);
-        $this->isCloudflareTunnelsEnabled = true;
-        $this->server->settings->is_cloudflare_tunnel = true;
-        $this->server->settings->save();
-        $this->server->refresh();
-        $this->dispatch('success', 'Cloudflare Tunnel enabled.');
+        try {
+            $this->authorize('update', $this->server);
+            $this->isCloudflareTunnelsEnabled = true;
+            $this->server->settings->is_cloudflare_tunnel = true;
+            $this->server->settings->save();
+            $this->server->refresh();
+            $this->dispatch('success', 'Cloudflare Tunnel enabled.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function automatedCloudflareConfig()
diff --git a/app/Livewire/Server/Destinations.php b/app/Livewire/Server/Destinations.php
index 117b43ad6..622bc1d1e 100644
--- a/app/Livewire/Server/Destinations.php
+++ b/app/Livewire/Server/Destinations.php
@@ -69,6 +69,11 @@ class Destinations extends Component
 
     public function scan()
     {
+        try {
+            $this->authorize('update', $this->server);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
         if ($this->server->isSwarm()) {
             $alreadyAddedNetworks = $this->server->swarmDockers;
         } else {
diff --git a/app/Livewire/Server/New/ByHetzner.php b/app/Livewire/Server/New/ByHetzner.php
index f1ffa60f2..e8df99d65 100644
--- a/app/Livewire/Server/New/ByHetzner.php
+++ b/app/Livewire/Server/New/ByHetzner.php
@@ -78,14 +78,18 @@ class ByHetzner extends Component
 
     public function mount()
     {
-        $this->authorize('viewAny', CloudProviderToken::class);
-        $this->loadTokens();
-        $this->loadSavedCloudInitScripts();
-        $this->server_name = generate_random_name();
-        $this->private_keys = PrivateKey::ownedAndOnlySShKeys()->where('id', '!=', 0)->get();
+        try {
+            $this->authorize('viewAny', CloudProviderToken::class);
+            $this->loadTokens();
+            $this->loadSavedCloudInitScripts();
+            $this->server_name = generate_random_name();
+            $this->private_keys = PrivateKey::ownedAndOnlySShKeys()->where('id', '!=', 0)->get();
 
-        if ($this->private_keys->count() > 0) {
-            $this->private_key_id = $this->private_keys->first()->id;
+            if ($this->private_keys->count() > 0) {
+                $this->private_key_id = $this->private_keys->first()->id;
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
diff --git a/app/Livewire/Server/Proxy.php b/app/Livewire/Server/Proxy.php
index 1a14baf89..6c163a112 100644
--- a/app/Livewire/Server/Proxy.php
+++ b/app/Livewire/Server/Proxy.php
@@ -96,11 +96,15 @@ class Proxy extends Component
 
     public function changeProxy()
     {
-        $this->authorize('update', $this->server);
-        $this->server->proxy = null;
-        $this->server->save();
+        try {
+            $this->authorize('update', $this->server);
+            $this->server->proxy = null;
+            $this->server->save();
 
-        $this->dispatch('reloadWindow');
+            $this->dispatch('reloadWindow');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function selectProxy($proxy_type)
diff --git a/app/Livewire/Server/Proxy/DynamicConfigurationNavbar.php b/app/Livewire/Server/Proxy/DynamicConfigurationNavbar.php
index c67591cf5..f7db1257c 100644
--- a/app/Livewire/Server/Proxy/DynamicConfigurationNavbar.php
+++ b/app/Livewire/Server/Proxy/DynamicConfigurationNavbar.php
@@ -22,34 +22,38 @@ class DynamicConfigurationNavbar extends Component
 
     public function delete(string $fileName)
     {
-        $this->authorize('update', $this->server);
-        $proxy_path = $this->server->proxyPath();
-        $proxy_type = $this->server->proxyType();
+        try {
+            $this->authorize('update', $this->server);
+            $proxy_path = $this->server->proxyPath();
+            $proxy_type = $this->server->proxyType();
 
-        // Decode filename: pipes are used to encode dots for Livewire property binding
-        // (e.g., 'my|service.yaml' -> 'my.service.yaml')
-        // This must happen BEFORE validation because validateShellSafePath() correctly
-        // rejects pipe characters as dangerous shell metacharacters
-        $file = str_replace('|', '.', $fileName);
+            // Decode filename: pipes are used to encode dots for Livewire property binding
+            // (e.g., 'my|service.yaml' -> 'my.service.yaml')
+            // This must happen BEFORE validation because validateShellSafePath() correctly
+            // rejects pipe characters as dangerous shell metacharacters
+            $file = str_replace('|', '.', $fileName);
 
-        // Validate filename to prevent command injection
-        validateShellSafePath($file, 'proxy configuration filename');
+            // Validate filename to prevent command injection
+            validateShellSafePath($file, 'proxy configuration filename');
 
-        if ($proxy_type === 'CADDY' && $file === 'Caddyfile') {
-            $this->dispatch('error', 'Cannot delete Caddyfile.');
+            if ($proxy_type === 'CADDY' && $file === 'Caddyfile') {
+                $this->dispatch('error', 'Cannot delete Caddyfile.');
 
-            return;
+                return;
+            }
+
+            $fullPath = "{$proxy_path}/dynamic/{$file}";
+            $escapedPath = escapeshellarg($fullPath);
+            instant_remote_process(["rm -f {$escapedPath}"], $this->server);
+            if ($proxy_type === 'CADDY') {
+                $this->server->reloadCaddy();
+            }
+            $this->dispatch('success', 'File deleted.');
+            $this->dispatch('loadDynamicConfigurations');
+            $this->dispatch('refresh');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
-
-        $fullPath = "{$proxy_path}/dynamic/{$file}";
-        $escapedPath = escapeshellarg($fullPath);
-        instant_remote_process(["rm -f {$escapedPath}"], $this->server);
-        if ($proxy_type === 'CADDY') {
-            $this->server->reloadCaddy();
-        }
-        $this->dispatch('success', 'File deleted.');
-        $this->dispatch('loadDynamicConfigurations');
-        $this->dispatch('refresh');
     }
 
     public function render()
diff --git a/app/Livewire/Server/Proxy/DynamicConfigurations.php b/app/Livewire/Server/Proxy/DynamicConfigurations.php
index 6ea9e7c3d..f824645aa 100644
--- a/app/Livewire/Server/Proxy/DynamicConfigurations.php
+++ b/app/Livewire/Server/Proxy/DynamicConfigurations.php
@@ -3,11 +3,14 @@
 namespace App\Livewire\Server\Proxy;
 
 use App\Models\Server;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class DynamicConfigurations extends Component
 {
+    use AuthorizesRequests;
+
     public ?Server $server = null;
 
     public $parameters = [];
@@ -35,6 +38,11 @@ class DynamicConfigurations extends Component
 
     public function loadDynamicConfigurations()
     {
+        try {
+            $this->authorize('view', $this->server);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
         $proxy_path = $this->server->proxyPath();
         $files = instant_remote_process(["mkdir -p $proxy_path/dynamic && ls -1 {$proxy_path}/dynamic"], $this->server);
         $files = collect(explode("\n", $files))->filter(fn ($file) => ! empty($file));
diff --git a/app/Livewire/Server/Resources.php b/app/Livewire/Server/Resources.php
index a21b0372b..31e57b301 100644
--- a/app/Livewire/Server/Resources.php
+++ b/app/Livewire/Server/Resources.php
@@ -29,23 +29,38 @@ class Resources extends Component
 
     public function startUnmanaged($id)
     {
-        $this->server->startUnmanaged($id);
-        $this->dispatch('success', 'Container started.');
-        $this->loadUnmanagedContainers();
+        try {
+            $this->authorize('update', $this->server);
+            $this->server->startUnmanaged($id);
+            $this->dispatch('success', 'Container started.');
+            $this->loadUnmanagedContainers();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function restartUnmanaged($id)
     {
-        $this->server->restartUnmanaged($id);
-        $this->dispatch('success', 'Container restarted.');
-        $this->loadUnmanagedContainers();
+        try {
+            $this->authorize('update', $this->server);
+            $this->server->restartUnmanaged($id);
+            $this->dispatch('success', 'Container restarted.');
+            $this->loadUnmanagedContainers();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function stopUnmanaged($id)
     {
-        $this->server->stopUnmanaged($id);
-        $this->dispatch('success', 'Container stopped.');
-        $this->loadUnmanagedContainers();
+        try {
+            $this->authorize('update', $this->server);
+            $this->server->stopUnmanaged($id);
+            $this->dispatch('success', 'Container stopped.');
+            $this->loadUnmanagedContainers();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function refreshStatus()
diff --git a/app/Livewire/Server/Security/Patches.php b/app/Livewire/Server/Security/Patches.php
index b4d151424..087836da3 100644
--- a/app/Livewire/Server/Security/Patches.php
+++ b/app/Livewire/Server/Security/Patches.php
@@ -41,7 +41,11 @@ class Patches extends Component
     {
         $this->parameters = get_route_parameters();
         $this->server = Server::ownedByCurrentTeam()->whereUuid($this->parameters['server_uuid'])->firstOrFail();
-        $this->authorize('viewSecurity', $this->server);
+        try {
+            $this->authorize('viewSecurity', $this->server);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function checkForUpdatesDispatch()
@@ -69,14 +73,14 @@ class Patches extends Component
 
     public function updateAllPackages()
     {
-        $this->authorize('update', $this->server);
-        if (! $this->packageManager || ! $this->osId) {
-            $this->dispatch('error', message: 'Run "Check for updates" first.');
-
-            return;
-        }
-
         try {
+            $this->authorize('update', $this->server);
+            if (! $this->packageManager || ! $this->osId) {
+                $this->dispatch('error', message: 'Run "Check for updates" first.');
+
+                return;
+            }
+
             $activity = UpdatePackage::run(
                 server: $this->server,
                 packageManager: $this->packageManager,
@@ -84,8 +88,8 @@ class Patches extends Component
                 all: true
             );
             $this->dispatch('activityMonitor', $activity->id, ServerPackageUpdated::class);
-        } catch (\Exception $e) {
-            $this->dispatch('error', message: $e->getMessage());
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
diff --git a/app/Livewire/Server/Show.php b/app/Livewire/Server/Show.php
index edc17004c..21703c4aa 100644
--- a/app/Livewire/Server/Show.php
+++ b/app/Livewire/Server/Show.php
@@ -287,18 +287,22 @@ class Show extends Component
 
     public function checkLocalhostConnection()
     {
-        $this->syncData(true);
-        ['uptime' => $uptime, 'error' => $error] = $this->server->validateConnection();
-        if ($uptime) {
-            $this->dispatch('success', 'Server is reachable.');
-            $this->server->settings->is_reachable = $this->isReachable = true;
-            $this->server->settings->is_usable = $this->isUsable = true;
-            $this->server->settings->save();
-            ServerReachabilityChanged::dispatch($this->server);
-        } else {
-            $this->dispatch('error', 'Server is not reachable.', 'Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help. <br><br>Error: '.$error);
+        try {
+            $this->syncData(true);
+            ['uptime' => $uptime, 'error' => $error] = $this->server->validateConnection();
+            if ($uptime) {
+                $this->dispatch('success', 'Server is reachable.');
+                $this->server->settings->is_reachable = $this->isReachable = true;
+                $this->server->settings->is_usable = $this->isUsable = true;
+                $this->server->settings->save();
+                ServerReachabilityChanged::dispatch($this->server);
+            } else {
+                $this->dispatch('error', 'Server is not reachable.', 'Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help. <br><br>Error: '.$error);
 
-            return;
+                return;
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
     }
 
@@ -401,6 +405,7 @@ class Show extends Component
     public function checkHetznerServerStatus(bool $manual = false)
     {
         try {
+            $this->authorize('view', $this->server);
             if (! $this->server->hetzner_server_id || ! $this->server->cloudProviderToken) {
                 $this->dispatch('error', 'This server is not associated with a Hetzner Cloud server or token.');
 
@@ -465,6 +470,7 @@ class Show extends Component
     public function startHetznerServer()
     {
         try {
+            $this->authorize('update', $this->server);
             if (! $this->server->hetzner_server_id || ! $this->server->cloudProviderToken) {
                 $this->dispatch('error', 'This server is not associated with a Hetzner Cloud server or token.');
 
diff --git a/app/Livewire/Server/ValidateAndInstall.php b/app/Livewire/Server/ValidateAndInstall.php
index 1a5bd381b..9b0f02573 100644
--- a/app/Livewire/Server/ValidateAndInstall.php
+++ b/app/Livewire/Server/ValidateAndInstall.php
@@ -72,31 +72,39 @@ class ValidateAndInstall extends Component
 
     public function retry()
     {
-        $this->authorize('update', $this->server);
-        $this->uptime = null;
-        $this->supported_os_type = null;
-        $this->prerequisites_installed = null;
-        $this->docker_installed = null;
-        $this->docker_compose_installed = null;
-        $this->docker_version = null;
-        $this->error = null;
-        $this->number_of_tries = 0;
-        $this->init();
+        try {
+            $this->authorize('update', $this->server);
+            $this->uptime = null;
+            $this->supported_os_type = null;
+            $this->prerequisites_installed = null;
+            $this->docker_installed = null;
+            $this->docker_compose_installed = null;
+            $this->docker_version = null;
+            $this->error = null;
+            $this->number_of_tries = 0;
+            $this->init();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function validateConnection()
     {
-        $this->authorize('update', $this->server);
-        ['uptime' => $this->uptime, 'error' => $error] = $this->server->validateConnection();
-        if (! $this->uptime) {
-            $this->error = 'Server is not reachable. Please validate your configuration and connection.<br>Check this <a target="_blank" class="text-black underline dark:text-white" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help. <br><br><div class="text-error">Error: '.$error.'</div>';
-            $this->server->update([
-                'validation_logs' => $this->error,
-            ]);
+        try {
+            $this->authorize('update', $this->server);
+            ['uptime' => $this->uptime, 'error' => $error] = $this->server->validateConnection();
+            if (! $this->uptime) {
+                $this->error = 'Server is not reachable. Please validate your configuration and connection.<br>Check this <a target="_blank" class="text-black underline dark:text-white" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help. <br><br><div class="text-error">Error: '.$error.'</div>';
+                $this->server->update([
+                    'validation_logs' => $this->error,
+                ]);
 
-            return;
+                return;
+            }
+            $this->dispatch('validateOS');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
         }
-        $this->dispatch('validateOS');
     }
 
     public function validateOS()
diff --git a/app/Livewire/Settings/Advanced.php b/app/Livewire/Settings/Advanced.php
index ad478273f..c63e9b2f7 100644
--- a/app/Livewire/Settings/Advanced.php
+++ b/app/Livewire/Settings/Advanced.php
@@ -4,11 +4,14 @@ namespace App\Livewire\Settings;
 
 use App\Models\InstanceSettings;
 use App\Rules\ValidIpOrCidr;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
 
 class Advanced extends Component
 {
+    use AuthorizesRequests;
+
     public InstanceSettings $settings;
 
     #[Validate('boolean')]
@@ -72,6 +75,7 @@ class Advanced extends Component
     public function submit()
     {
         try {
+            $this->authorize('update', $this->settings);
             $this->validate();
 
             $this->custom_dns_servers = str($this->custom_dns_servers)->replaceEnd(',', '')->trim();
@@ -141,6 +145,7 @@ class Advanced extends Component
     public function instantSave()
     {
         try {
+            $this->authorize('update', $this->settings);
             $this->settings->is_registration_enabled = $this->is_registration_enabled;
             $this->settings->do_not_track = $this->do_not_track;
             $this->settings->is_dns_validation_enabled = $this->is_dns_validation_enabled;
@@ -159,6 +164,7 @@ class Advanced extends Component
 
     public function toggleTwoStepConfirmation($password): bool
     {
+        $this->authorize('update', $this->settings);
         if (! verifyPasswordConfirmation($password, $this)) {
             return false;
         }
diff --git a/app/Livewire/Settings/Index.php b/app/Livewire/Settings/Index.php
index 9a51d107d..5a7c74172 100644
--- a/app/Livewire/Settings/Index.php
+++ b/app/Livewire/Settings/Index.php
@@ -4,12 +4,15 @@ namespace App\Livewire\Settings;
 
 use App\Models\InstanceSettings;
 use App\Models\Server;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
 
 class Index extends Component
 {
+    use AuthorizesRequests;
+
     public InstanceSettings $settings;
 
     public ?Server $server = null;
@@ -86,6 +89,7 @@ class Index extends Component
 
     public function instantSave($isSave = true)
     {
+        $this->authorize('update', $this->settings);
         $this->validate();
         $this->settings->fqdn = $this->fqdn ? trim($this->fqdn) : $this->fqdn;
         $this->settings->public_port_min = $this->public_port_min;
@@ -103,6 +107,7 @@ class Index extends Component
 
     public function confirmDomainUsage()
     {
+        $this->authorize('update', $this->settings);
         $this->forceSaveDomains = true;
         $this->showDomainConflictModal = false;
         $this->submit();
@@ -111,6 +116,7 @@ class Index extends Component
     public function submit()
     {
         try {
+            $this->authorize('update', $this->settings);
             $error_show = false;
             $this->resetErrorBag();
 
@@ -172,6 +178,7 @@ class Index extends Component
     public function buildHelperImage()
     {
         try {
+            $this->authorize('update', $this->settings);
             if (! isDev()) {
                 $this->dispatch('error', 'Building helper image is only available in development mode.');
 
diff --git a/app/Livewire/Settings/Updates.php b/app/Livewire/Settings/Updates.php
index 01a67c38c..88a8945d0 100644
--- a/app/Livewire/Settings/Updates.php
+++ b/app/Livewire/Settings/Updates.php
@@ -5,11 +5,14 @@ namespace App\Livewire\Settings;
 use App\Jobs\CheckForUpdatesJob;
 use App\Models\InstanceSettings;
 use App\Models\Server;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
 
 class Updates extends Component
 {
+    use AuthorizesRequests;
+
     public InstanceSettings $settings;
 
     public ?Server $server = null;
@@ -25,6 +28,9 @@ class Updates extends Component
 
     public function mount()
     {
+        if (! isInstanceAdmin()) {
+            return redirect()->route('dashboard');
+        }
         if (! isCloud()) {
             $this->server = Server::findOrFail(0);
         }
@@ -38,6 +44,7 @@ class Updates extends Component
     public function instantSave()
     {
         try {
+            $this->authorize('update', $this->settings);
             if ($this->settings->is_auto_update_enabled === true) {
                 $this->validate([
                     'auto_update_frequency' => ['required', 'string'],
@@ -56,6 +63,7 @@ class Updates extends Component
     public function submit()
     {
         try {
+            $this->authorize('update', $this->settings);
             $this->resetErrorBag();
             $this->validate();
 
@@ -88,6 +96,7 @@ class Updates extends Component
 
     public function checkManually()
     {
+        $this->authorize('update', $this->settings);
         CheckForUpdatesJob::dispatchSync();
         $this->dispatch('updateAvailable');
         $settings = instanceSettings();
diff --git a/app/Livewire/SettingsBackup.php b/app/Livewire/SettingsBackup.php
index 84f5c6081..cfd188b40 100644
--- a/app/Livewire/SettingsBackup.php
+++ b/app/Livewire/SettingsBackup.php
@@ -7,12 +7,15 @@ use App\Models\S3Storage;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\Server;
 use App\Models\StandalonePostgresql;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Attributes\Locked;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
 
 class SettingsBackup extends Component
 {
+    use AuthorizesRequests;
+
     public InstanceSettings $settings;
 
     public Server $server;
@@ -76,6 +79,7 @@ class SettingsBackup extends Component
     public function addCoolifyDatabase()
     {
         try {
+            $this->authorize('update', $this->settings);
             $server = Server::findOrFail(0);
             $out = instant_remote_process(['docker inspect coolify-db'], $server);
             $envs = format_docker_envs_to_json($out);
@@ -120,14 +124,19 @@ class SettingsBackup extends Component
 
     public function submit()
     {
-        $this->validate();
+        try {
+            $this->authorize('update', $this->settings);
+            $this->validate();
 
-        $this->database->update([
-            'name' => $this->name,
-            'description' => $this->description,
-            'postgres_user' => $this->postgres_user,
-            'postgres_password' => $this->postgres_password,
-        ]);
-        $this->dispatch('success', 'Backup updated.');
+            $this->database->update([
+                'name' => $this->name,
+                'description' => $this->description,
+                'postgres_user' => $this->postgres_user,
+                'postgres_password' => $this->postgres_password,
+            ]);
+            $this->dispatch('success', 'Backup updated.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 }
diff --git a/app/Livewire/SettingsEmail.php b/app/Livewire/SettingsEmail.php
index ca48e9b16..5ed012b37 100644
--- a/app/Livewire/SettingsEmail.php
+++ b/app/Livewire/SettingsEmail.php
@@ -5,6 +5,7 @@ namespace App\Livewire;
 use App\Models\InstanceSettings;
 use App\Models\Team;
 use App\Notifications\TransactionalEmails\Test;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Facades\RateLimiter;
 use Livewire\Attributes\Locked;
 use Livewire\Attributes\Validate;
@@ -12,6 +13,8 @@ use Livewire\Component;
 
 class SettingsEmail extends Component
 {
+    use AuthorizesRequests;
+
     public InstanceSettings $settings;
 
     #[Locked]
@@ -103,6 +106,7 @@ class SettingsEmail extends Component
     public function submit()
     {
         try {
+            $this->authorize('update', $this->settings);
             $this->resetErrorBag();
             $this->syncData(true);
             $this->dispatch('success', 'Transactional email settings updated.');
@@ -114,6 +118,7 @@ class SettingsEmail extends Component
     public function instantSave(string $type)
     {
         try {
+            $this->authorize('update', $this->settings);
             $currentSmtpEnabled = $this->settings->smtp_enabled;
             $currentResendEnabled = $this->settings->resend_enabled;
             $this->resetErrorBag();
@@ -141,6 +146,7 @@ class SettingsEmail extends Component
     public function submitSmtp()
     {
         try {
+            $this->authorize('update', $this->settings);
             $this->validate([
                 'smtpEnabled' => 'boolean',
                 'smtpFromAddress' => 'required|email',
@@ -184,6 +190,7 @@ class SettingsEmail extends Component
     public function submitResend()
     {
         try {
+            $this->authorize('update', $this->settings);
             $this->validate([
                 'resendEnabled' => 'boolean',
                 'resendApiKey' => 'required|string',
@@ -214,6 +221,7 @@ class SettingsEmail extends Component
     public function sendTestEmail()
     {
         try {
+            $this->authorize('update', $this->settings);
             $this->validate([
                 'testEmailAddress' => 'required|email',
             ], [
diff --git a/app/Livewire/SettingsOauth.php b/app/Livewire/SettingsOauth.php
index 6f949b716..44ea4f611 100644
--- a/app/Livewire/SettingsOauth.php
+++ b/app/Livewire/SettingsOauth.php
@@ -3,10 +3,13 @@
 namespace App\Livewire;
 
 use App\Models\OauthSetting;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Component;
 
 class SettingsOauth extends Component
 {
+    use AuthorizesRequests;
+
     public $oauth_settings_map;
 
     protected function rules()
@@ -131,6 +134,7 @@ class SettingsOauth extends Component
     public function instantSave(string $provider)
     {
         try {
+            $this->authorize('update', instanceSettings());
             $this->updateOauthSettings($provider);
         } catch (\Exception $e) {
             return handleError($e, $this);
@@ -139,7 +143,12 @@ class SettingsOauth extends Component
 
     public function submit()
     {
-        $this->updateOauthSettings();
-        $this->dispatch('success', 'Instance settings updated successfully!');
+        try {
+            $this->authorize('update', instanceSettings());
+            $this->updateOauthSettings();
+            $this->dispatch('success', 'Instance settings updated successfully!');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 }
diff --git a/app/Livewire/SharedVariables/Environment/Show.php b/app/Livewire/SharedVariables/Environment/Show.php
index e1b230218..503fc3ead 100644
--- a/app/Livewire/SharedVariables/Environment/Show.php
+++ b/app/Livewire/SharedVariables/Environment/Show.php
@@ -73,7 +73,12 @@ class Show extends Component
 
     private function formatEnvironmentVariables($variables)
     {
-        return $variables->map(function ($item) {
+        $isMember = auth()->user()?->isMember();
+
+        return $variables->map(function ($item) use ($isMember) {
+            if ($isMember) {
+                return "$item->key=(Hidden, only admins can view)";
+            }
             if ($item->is_shown_once) {
                 return "$item->key=(Locked Secret, delete and add again to change)";
             }
diff --git a/app/Livewire/SharedVariables/Project/Show.php b/app/Livewire/SharedVariables/Project/Show.php
index 1f304b543..00646fdbe 100644
--- a/app/Livewire/SharedVariables/Project/Show.php
+++ b/app/Livewire/SharedVariables/Project/Show.php
@@ -58,9 +58,13 @@ class Show extends Component
 
     public function switch()
     {
-        $this->authorize('view', $this->project);
-        $this->view = $this->view === 'normal' ? 'dev' : 'normal';
-        $this->getDevView();
+        try {
+            $this->authorize('view', $this->project);
+            $this->view = $this->view === 'normal' ? 'dev' : 'normal';
+            $this->getDevView();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function getDevView()
@@ -70,7 +74,12 @@ class Show extends Component
 
     private function formatEnvironmentVariables($variables)
     {
-        return $variables->map(function ($item) {
+        $isMember = auth()->user()?->isMember();
+
+        return $variables->map(function ($item) use ($isMember) {
+            if ($isMember) {
+                return "$item->key=(Hidden, only admins can view)";
+            }
             if ($item->is_shown_once) {
                 return "$item->key=(Locked Secret, delete and add again to change)";
             }
diff --git a/app/Livewire/SharedVariables/Team/Index.php b/app/Livewire/SharedVariables/Team/Index.php
index 75fd415e1..9ad37dea1 100644
--- a/app/Livewire/SharedVariables/Team/Index.php
+++ b/app/Livewire/SharedVariables/Team/Index.php
@@ -52,9 +52,13 @@ class Index extends Component
 
     public function switch()
     {
-        $this->authorize('view', $this->team);
-        $this->view = $this->view === 'normal' ? 'dev' : 'normal';
-        $this->getDevView();
+        try {
+            $this->authorize('view', $this->team);
+            $this->view = $this->view === 'normal' ? 'dev' : 'normal';
+            $this->getDevView();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function getDevView()
@@ -64,7 +68,12 @@ class Index extends Component
 
     private function formatEnvironmentVariables($variables)
     {
-        return $variables->map(function ($item) {
+        $isMember = auth()->user()?->isMember();
+
+        return $variables->map(function ($item) use ($isMember) {
+            if ($isMember) {
+                return "$item->key=(Hidden, only admins can view)";
+            }
             if ($item->is_shown_once) {
                 return "$item->key=(Locked Secret, delete and add again to change)";
             }
diff --git a/app/Livewire/Storage/Form.php b/app/Livewire/Storage/Form.php
index 4dc0b6ae2..bc1726f10 100644
--- a/app/Livewire/Storage/Form.php
+++ b/app/Livewire/Storage/Form.php
@@ -31,6 +31,8 @@ class Form extends Component
 
     public ?bool $isUsable = null;
 
+    public bool $isPasswordHiddenForMember = false;
+
     protected function rules(): array
     {
         return [
@@ -109,6 +111,12 @@ class Form extends Component
     public function mount()
     {
         $this->syncData(false);
+
+        $this->isPasswordHiddenForMember = auth()->user()?->isMember() ?? false;
+        if ($this->isPasswordHiddenForMember) {
+            $this->key = '';
+            $this->secret = '';
+        }
     }
 
     public function testConnection()
diff --git a/app/Livewire/Storage/Show.php b/app/Livewire/Storage/Show.php
index fdf3d0d28..fd8c12292 100644
--- a/app/Livewire/Storage/Show.php
+++ b/app/Livewire/Storage/Show.php
@@ -18,7 +18,11 @@ class Show extends Component
         if (! $this->storage) {
             abort(404);
         }
-        $this->authorize('view', $this->storage);
+        try {
+            $this->authorize('view', $this->storage);
+        } catch (\Illuminate\Auth\Access\AuthorizationException) {
+            return $this->redirectRoute('storage.index', navigate: true);
+        }
     }
 
     public function render()
diff --git a/app/Livewire/Tags/Show.php b/app/Livewire/Tags/Show.php
index fc5b13374..28d6440a9 100644
--- a/app/Livewire/Tags/Show.php
+++ b/app/Livewire/Tags/Show.php
@@ -5,6 +5,7 @@ namespace App\Livewire\Tags;
 use App\Http\Controllers\Api\DeployController;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Tag;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Collection;
 use Livewire\Attributes\Locked;
 use Livewire\Attributes\Title;
@@ -13,6 +14,8 @@ use Livewire\Component;
 #[Title('Tags | Coolify')]
 class Show extends Component
 {
+    use AuthorizesRequests;
+
     #[Locked]
     public ?string $tagName = null;
 
@@ -73,6 +76,12 @@ class Show extends Component
     public function redeployAll()
     {
         try {
+            $this->applications->each(function ($resource) {
+                $this->authorize('deploy', $resource);
+            });
+            $this->services->each(function ($resource) {
+                $this->authorize('deploy', $resource);
+            });
             $message = collect([]);
             $this->applications->each(function ($resource) use ($message) {
                 $deploy = new DeployController;
diff --git a/app/Livewire/Team/AdminView.php b/app/Livewire/Team/AdminView.php
index c8d44d42b..cbc8f67b6 100644
--- a/app/Livewire/Team/AdminView.php
+++ b/app/Livewire/Team/AdminView.php
@@ -25,6 +25,9 @@ class AdminView extends Component
 
     public function submitSearch()
     {
+        if (! isInstanceAdmin()) {
+            return;
+        }
         if ($this->search !== '') {
             $this->users = User::where(function ($query) {
                 $query->where('name', 'like', "%{$this->search}%")
@@ -39,6 +42,9 @@ class AdminView extends Component
 
     public function getUsers()
     {
+        if (! isInstanceAdmin()) {
+            return;
+        }
         $users = User::where('id', '!=', auth()->id())->get();
         if ($users->count() > $this->number_of_users_to_show) {
             $this->lots_of_users = true;
diff --git a/app/Livewire/Team/Index.php b/app/Livewire/Team/Index.php
index 8a943e6b6..140d9f5cc 100644
--- a/app/Livewire/Team/Index.php
+++ b/app/Livewire/Team/Index.php
@@ -7,6 +7,7 @@ use App\Models\TeamInvitation;
 use App\Support\ValidationPatterns;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Livewire\Component;
 
@@ -95,23 +96,31 @@ class Index extends Component
 
     public function delete()
     {
-        $currentTeam = currentTeam();
-        $this->authorize('delete', $currentTeam);
-        $currentTeam->delete();
+        try {
+            $currentTeam = currentTeam();
+            $this->authorize('delete', $currentTeam);
+            $currentTeam->members->each(function ($user) use ($currentTeam) {
+                if ($user->id === Auth::id()) {
+                    return;
+                }
+                $user->teams()->detach($currentTeam);
+                $session = DB::table('sessions')->where('user_id', $user->id)->first();
+                if ($session) {
+                    DB::table('sessions')->where('id', $session->id)->delete();
+                }
+            });
 
-        $currentTeam->members->each(function ($user) use ($currentTeam) {
-            if ($user->id === Auth::id()) {
-                return;
-            }
-            $user->teams()->detach($currentTeam);
-            $session = DB::table('sessions')->where('user_id', $user->id)->first();
-            if ($session) {
-                DB::table('sessions')->where('id', $session->id)->delete();
-            }
-        });
+            // Clear stale cache before deleting so refreshSession doesn't resolve the deleted team
+            Cache::forget('user:'.Auth::id().':team:'.$currentTeam->id);
+            $currentTeam->delete();
 
-        refreshSession();
+            // Switch to the user's next available team
+            $newTeam = Auth::user()->teams()->first();
+            refreshSession($newTeam);
 
-        return redirect()->route('team.index');
+            return redirect()->route('team.index');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 }
diff --git a/app/Livewire/Upgrade.php b/app/Livewire/Upgrade.php
index 7948ad6a9..be4ea1cf0 100644
--- a/app/Livewire/Upgrade.php
+++ b/app/Livewire/Upgrade.php
@@ -44,6 +44,9 @@ class Upgrade extends Component
     public function upgrade()
     {
         try {
+            if (! isInstanceAdmin()) {
+                abort(403);
+            }
             if ($this->updateInProgress) {
                 return;
             }
diff --git a/app/Models/S3Storage.php b/app/Models/S3Storage.php
index 3aae55966..5d1c3b8b5 100644
--- a/app/Models/S3Storage.php
+++ b/app/Models/S3Storage.php
@@ -127,21 +127,25 @@ class S3Storage extends BaseModel
         } catch (\Throwable $e) {
             $this->is_usable = false;
             if ($this->unusable_email_sent === false && is_transactional_emails_enabled()) {
-                $mail = new MailMessage;
-                $mail->subject('Coolify: S3 Storage Connection Error');
-                $mail->view('emails.s3-connection-error', ['name' => $this->name, 'reason' => $e->getMessage(), 'url' => route('storage.show', ['storage_uuid' => $this->uuid])]);
+                try {
+                    $mail = new MailMessage;
+                    $mail->subject('Coolify: S3 Storage Connection Error');
+                    $mail->view('emails.s3-connection-error', ['name' => $this->name, 'reason' => $e->getMessage(), 'url' => route('storage.show', ['storage_uuid' => $this->uuid])]);
 
-                // Load the team with its members and their roles explicitly
-                $team = $this->team()->with(['members' => function ($query) {
-                    $query->withPivot('role');
-                }])->first();
+                    // Load the team with its members and their roles explicitly
+                    $team = $this->team()->with(['members' => function ($query) {
+                        $query->withPivot('role');
+                    }])->first();
 
-                // Get admins directly from the pivot relationship for this specific team
-                $users = $team->members()->wherePivotIn('role', ['admin', 'owner'])->get(['users.id', 'users.email']);
-                foreach ($users as $user) {
-                    send_user_an_email($mail, $user->email);
+                    // Get admins directly from the pivot relationship for this specific team
+                    $users = $team->members()->wherePivotIn('role', ['admin', 'owner'])->get(['users.id', 'users.email']);
+                    foreach ($users as $user) {
+                        send_user_an_email($mail, $user->email);
+                    }
+                    $this->unusable_email_sent = true;
+                } catch (\Throwable $emailException) {
+                    \Log::warning('Failed to send S3 connection error notification: '.$emailException->getMessage());
                 }
-                $this->unusable_email_sent = true;
             }
 
             throw $e;
diff --git a/app/Models/Team.php b/app/Models/Team.php
index e32526169..92fed1128 100644
--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@@ -59,7 +59,7 @@ class Team extends Model implements SendsDiscord, SendsEmail, SendsPushover, Sen
             $team->webhookNotificationSettings()->create();
         });
 
-        static::saving(function ($team) {
+        static::updating(function ($team) {
             if (auth()->user()?->isMember()) {
                 throw new \Exception('You are not allowed to update this team.');
             }
diff --git a/app/Models/User.php b/app/Models/User.php
index 4561cddb2..68ecc6b31 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -316,6 +316,11 @@ class User extends Authenticatable implements SendsEmail
     {
         $sessionTeamId = data_get(session('currentTeam'), 'id');
 
+        // Fallback for stateless API requests: resolve team from Sanctum token
+        if (is_null($sessionTeamId) && $this->currentAccessToken()) {
+            $sessionTeamId = data_get($this->currentAccessToken(), 'team_id');
+        }
+
         if (is_null($sessionTeamId)) {
             return null;
         }
diff --git a/app/Policies/ApiTokenPolicy.php b/app/Policies/ApiTokenPolicy.php
index 761227118..ba9bade01 100644
--- a/app/Policies/ApiTokenPolicy.php
+++ b/app/Policies/ApiTokenPolicy.php
@@ -12,11 +12,6 @@ class ApiTokenPolicy
      */
     public function viewAny(User $user): bool
     {
-        // Authorization temporarily disabled
-        /*
-        // Users can view their own API tokens
-        return true;
-        */
         return true;
     }
 
@@ -25,12 +20,7 @@ class ApiTokenPolicy
      */
     public function view(User $user, PersonalAccessToken $token): bool
     {
-        // Authorization temporarily disabled
-        /*
-        // Users can only view their own tokens
         return $user->id === $token->tokenable_id && $token->tokenable_type === User::class;
-        */
-        return true;
     }
 
     /**
@@ -38,11 +28,6 @@ class ApiTokenPolicy
      */
     public function create(User $user): bool
     {
-        // Authorization temporarily disabled
-        /*
-        // All authenticated users can create their own API tokens
-        return true;
-        */
         return true;
     }
 
@@ -51,12 +36,7 @@ class ApiTokenPolicy
      */
     public function update(User $user, PersonalAccessToken $token): bool
     {
-        // Authorization temporarily disabled
-        /*
-        // Users can only update their own tokens
         return $user->id === $token->tokenable_id && $token->tokenable_type === User::class;
-        */
-        return true;
     }
 
     /**
@@ -64,12 +44,7 @@ class ApiTokenPolicy
      */
     public function delete(User $user, PersonalAccessToken $token): bool
     {
-        // Authorization temporarily disabled
-        /*
-        // Users can only delete their own tokens
         return $user->id === $token->tokenable_id && $token->tokenable_type === User::class;
-        */
-        return true;
     }
 
     /**
@@ -77,11 +52,6 @@ class ApiTokenPolicy
      */
     public function manage(User $user): bool
     {
-        // Authorization temporarily disabled
-        /*
-        // All authenticated users can manage their own API tokens
-        return true;
-        */
         return true;
     }
 
@@ -90,7 +60,6 @@ class ApiTokenPolicy
      */
     public function useRootPermissions(User $user): bool
     {
-        // Only admins and owners can use root permissions
         return $user->isAdmin() || $user->isOwner();
     }
 
@@ -99,11 +68,22 @@ class ApiTokenPolicy
      */
     public function useWritePermissions(User $user): bool
     {
-        // Authorization temporarily disabled
-        /*
-        // Only admins and owners can use write permissions
         return $user->isAdmin() || $user->isOwner();
-        */
-        return true;
+    }
+
+    /**
+     * Determine whether the user can use deploy permissions for API tokens.
+     */
+    public function useDeployPermissions(User $user): bool
+    {
+        return $user->isAdmin() || $user->isOwner();
+    }
+
+    /**
+     * Determine whether the user can use read:sensitive permissions for API tokens.
+     */
+    public function useSensitivePermissions(User $user): bool
+    {
+        return $user->isAdmin() || $user->isOwner();
     }
 }
diff --git a/app/Policies/ApplicationPolicy.php b/app/Policies/ApplicationPolicy.php
index d64a436ad..7a992f2fd 100644
--- a/app/Policies/ApplicationPolicy.php
+++ b/app/Policies/ApplicationPolicy.php
@@ -13,10 +13,6 @@ class ApplicationPolicy
      */
     public function viewAny(User $user): bool
     {
-        // Authorization temporarily disabled
-        /*
-        return true;
-        */
         return true;
     }
 
@@ -25,11 +21,9 @@ class ApplicationPolicy
      */
     public function view(User $user, Application $application): bool
     {
-        // Authorization temporarily disabled
-        /*
-        return true;
-        */
-        return true;
+        $teamId = $this->getTeamId($application);
+
+        return $teamId !== null && $user->teams->contains('id', $teamId);
     }
 
     /**
@@ -37,15 +31,7 @@ class ApplicationPolicy
      */
     public function create(User $user): bool
     {
-        // Authorization temporarily disabled
-        /*
-        if ($user->isAdmin()) {
-            return true;
-        }
-
-        return false;
-        */
-        return true;
+        return $user->isAdmin();
     }
 
     /**
@@ -53,15 +39,17 @@ class ApplicationPolicy
      */
     public function update(User $user, Application $application): Response
     {
-        // Authorization temporarily disabled
-        /*
-        if ($user->isAdmin()) {
+        $teamId = $this->getTeamId($application);
+
+        if ($teamId === null) {
+            return Response::deny('Application team not found.');
+        }
+
+        if ($user->isAdminOfTeam($teamId)) {
             return Response::allow();
         }
 
-        return Response::deny('As a member, you cannot update this application.<br/><br/>You need at least admin or owner permissions.');
-        */
-        return Response::allow();
+        return Response::deny('You need at least admin or owner permissions to update this application.');
     }
 
     /**
@@ -69,15 +57,9 @@ class ApplicationPolicy
      */
     public function delete(User $user, Application $application): bool
     {
-        // Authorization temporarily disabled
-        /*
-        if ($user->isAdmin()) {
-            return true;
-        }
+        $teamId = $this->getTeamId($application);
 
-        return false;
-        */
-        return true;
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -85,11 +67,7 @@ class ApplicationPolicy
      */
     public function restore(User $user, Application $application): bool
     {
-        // Authorization temporarily disabled
-        /*
-        return true;
-        */
-        return true;
+        return false;
     }
 
     /**
@@ -97,11 +75,7 @@ class ApplicationPolicy
      */
     public function forceDelete(User $user, Application $application): bool
     {
-        // Authorization temporarily disabled
-        /*
-        return $user->isAdmin() && $user->teams->contains('id', $application->team()->first()->id);
-        */
-        return true;
+        return false;
     }
 
     /**
@@ -109,11 +83,9 @@ class ApplicationPolicy
      */
     public function deploy(User $user, Application $application): bool
     {
-        // Authorization temporarily disabled
-        /*
-        return $user->teams->contains('id', $application->team()->first()->id);
-        */
-        return true;
+        $teamId = $this->getTeamId($application);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -121,11 +93,9 @@ class ApplicationPolicy
      */
     public function manageDeployments(User $user, Application $application): bool
     {
-        // Authorization temporarily disabled
-        /*
-        return $user->isAdmin() && $user->teams->contains('id', $application->team()->first()->id);
-        */
-        return true;
+        $teamId = $this->getTeamId($application);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -133,11 +103,9 @@ class ApplicationPolicy
      */
     public function manageEnvironment(User $user, Application $application): bool
     {
-        // Authorization temporarily disabled
-        /*
-        return $user->isAdmin() && $user->teams->contains('id', $application->team()->first()->id);
-        */
-        return true;
+        $teamId = $this->getTeamId($application);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -145,10 +113,11 @@ class ApplicationPolicy
      */
     public function cleanupDeploymentQueue(User $user): bool
     {
-        // Authorization temporarily disabled
-        /*
         return $user->isAdmin();
-        */
-        return true;
+    }
+
+    private function getTeamId(Application $application): ?int
+    {
+        return $application->team()?->id;
     }
 }
diff --git a/app/Policies/ApplicationPreviewPolicy.php b/app/Policies/ApplicationPreviewPolicy.php
index 4d371cc38..f3c13acd9 100644
--- a/app/Policies/ApplicationPreviewPolicy.php
+++ b/app/Policies/ApplicationPreviewPolicy.php
@@ -21,8 +21,9 @@ class ApplicationPreviewPolicy
      */
     public function view(User $user, ApplicationPreview $applicationPreview): bool
     {
-        // return $user->teams->contains('id', $applicationPreview->application->team()->first()->id);
-        return true;
+        $teamId = $this->getTeamId($applicationPreview);
+
+        return $teamId !== null && $user->teams->contains('id', $teamId);
     }
 
     /**
@@ -30,21 +31,25 @@ class ApplicationPreviewPolicy
      */
     public function create(User $user): bool
     {
-        // return $user->isAdmin();
-        return true;
+        return $user->isAdmin();
     }
 
     /**
      * Determine whether the user can update the model.
      */
-    public function update(User $user, ApplicationPreview $applicationPreview)
+    public function update(User $user, ApplicationPreview $applicationPreview): Response
     {
-        // if ($user->isAdmin()) {
-        //    return Response::allow();
-        // }
+        $teamId = $this->getTeamId($applicationPreview);
 
-        // return Response::deny('As a member, you cannot update this preview.<br/><br/>You need at least admin or owner permissions.');
-        return true;
+        if ($teamId === null) {
+            return Response::deny('Application preview team not found.');
+        }
+
+        if ($user->isAdminOfTeam($teamId)) {
+            return Response::allow();
+        }
+
+        return Response::deny('You need at least admin or owner permissions to update this preview.');
     }
 
     /**
@@ -52,8 +57,9 @@ class ApplicationPreviewPolicy
      */
     public function delete(User $user, ApplicationPreview $applicationPreview): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $applicationPreview->application->team()->first()->id);
-        return true;
+        $teamId = $this->getTeamId($applicationPreview);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -61,8 +67,7 @@ class ApplicationPreviewPolicy
      */
     public function restore(User $user, ApplicationPreview $applicationPreview): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $applicationPreview->application->team()->first()->id);
-        return true;
+        return false;
     }
 
     /**
@@ -70,8 +75,7 @@ class ApplicationPreviewPolicy
      */
     public function forceDelete(User $user, ApplicationPreview $applicationPreview): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $applicationPreview->application->team()->first()->id);
-        return true;
+        return false;
     }
 
     /**
@@ -79,8 +83,9 @@ class ApplicationPreviewPolicy
      */
     public function deploy(User $user, ApplicationPreview $applicationPreview): bool
     {
-        // return $user->teams->contains('id', $applicationPreview->application->team()->first()->id);
-        return true;
+        $teamId = $this->getTeamId($applicationPreview);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -88,7 +93,13 @@ class ApplicationPreviewPolicy
      */
     public function manageDeployments(User $user, ApplicationPreview $applicationPreview): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $applicationPreview->application->team()->first()->id);
-        return true;
+        $teamId = $this->getTeamId($applicationPreview);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
+    }
+
+    private function getTeamId(ApplicationPreview $applicationPreview): ?int
+    {
+        return $applicationPreview->application?->team()?->id;
     }
 }
diff --git a/app/Policies/ApplicationSettingPolicy.php b/app/Policies/ApplicationSettingPolicy.php
index 848dc9aee..be2137cb8 100644
--- a/app/Policies/ApplicationSettingPolicy.php
+++ b/app/Policies/ApplicationSettingPolicy.php
@@ -20,8 +20,9 @@ class ApplicationSettingPolicy
      */
     public function view(User $user, ApplicationSetting $applicationSetting): bool
     {
-        // return $user->teams->contains('id', $applicationSetting->application->team()->first()->id);
-        return true;
+        $teamId = $this->getTeamId($applicationSetting);
+
+        return $teamId !== null && $user->teams->contains('id', $teamId);
     }
 
     /**
@@ -29,8 +30,7 @@ class ApplicationSettingPolicy
      */
     public function create(User $user): bool
     {
-        // return $user->isAdmin();
-        return true;
+        return $user->isAdmin();
     }
 
     /**
@@ -38,8 +38,9 @@ class ApplicationSettingPolicy
      */
     public function update(User $user, ApplicationSetting $applicationSetting): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $applicationSetting->application->team()->first()->id);
-        return true;
+        $teamId = $this->getTeamId($applicationSetting);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -47,8 +48,9 @@ class ApplicationSettingPolicy
      */
     public function delete(User $user, ApplicationSetting $applicationSetting): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $applicationSetting->application->team()->first()->id);
-        return true;
+        $teamId = $this->getTeamId($applicationSetting);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -56,8 +58,7 @@ class ApplicationSettingPolicy
      */
     public function restore(User $user, ApplicationSetting $applicationSetting): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $applicationSetting->application->team()->first()->id);
-        return true;
+        return false;
     }
 
     /**
@@ -65,7 +66,11 @@ class ApplicationSettingPolicy
      */
     public function forceDelete(User $user, ApplicationSetting $applicationSetting): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $applicationSetting->application->team()->first()->id);
-        return true;
+        return false;
+    }
+
+    private function getTeamId(ApplicationSetting $applicationSetting): ?int
+    {
+        return $applicationSetting->application?->team()?->id;
     }
 }
diff --git a/app/Policies/DatabasePolicy.php b/app/Policies/DatabasePolicy.php
index f8e8af637..f62ffdde2 100644
--- a/app/Policies/DatabasePolicy.php
+++ b/app/Policies/DatabasePolicy.php
@@ -20,8 +20,9 @@ class DatabasePolicy
      */
     public function view(User $user, $database): bool
     {
-        // return $user->teams->contains('id', $database->team()->first()->id);
-        return true;
+        $teamId = $this->getTeamId($database);
+
+        return $teamId !== null && $user->teams->contains('id', $teamId);
     }
 
     /**
@@ -29,21 +30,25 @@ class DatabasePolicy
      */
     public function create(User $user): bool
     {
-        // return $user->isAdmin();
-        return true;
+        return $user->isAdmin();
     }
 
     /**
      * Determine whether the user can update the model.
      */
-    public function update(User $user, $database)
+    public function update(User $user, $database): Response
     {
-        // if ($user->isAdmin() && $user->teams->contains('id', $database->team()->first()->id)) {
-        //    return Response::allow();
-        // }
+        $teamId = $this->getTeamId($database);
 
-        // return Response::deny('As a member, you cannot update this database.<br/><br/>You need at least admin or owner permissions.');
-        return true;
+        if ($teamId === null) {
+            return Response::deny('Database team not found.');
+        }
+
+        if ($user->isAdminOfTeam($teamId)) {
+            return Response::allow();
+        }
+
+        return Response::deny('You need at least admin or owner permissions to update this database.');
     }
 
     /**
@@ -51,8 +56,9 @@ class DatabasePolicy
      */
     public function delete(User $user, $database): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $database->team()->first()->id);
-        return true;
+        $teamId = $this->getTeamId($database);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -60,8 +66,7 @@ class DatabasePolicy
      */
     public function restore(User $user, $database): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $database->team()->first()->id);
-        return true;
+        return false;
     }
 
     /**
@@ -69,8 +74,7 @@ class DatabasePolicy
      */
     public function forceDelete(User $user, $database): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $database->team()->first()->id);
-        return true;
+        return false;
     }
 
     /**
@@ -78,8 +82,9 @@ class DatabasePolicy
      */
     public function manage(User $user, $database): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $database->team()->first()->id);
-        return true;
+        $teamId = $this->getTeamId($database);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -87,8 +92,9 @@ class DatabasePolicy
      */
     public function manageBackups(User $user, $database): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $database->team()->first()->id);
-        return true;
+        $teamId = $this->getTeamId($database);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -96,7 +102,22 @@ class DatabasePolicy
      */
     public function manageEnvironment(User $user, $database): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $database->team()->first()->id);
-        return true;
+        $teamId = $this->getTeamId($database);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
+    }
+
+    private function getTeamId($database): ?int
+    {
+        // Instance-level databases (e.g., coolify-db) belong to root team
+        if (isset($database->id) && $database->id === 0) {
+            return 0;
+        }
+
+        if (method_exists($database, 'team')) {
+            return $database->team()?->id;
+        }
+
+        return null;
     }
 }
diff --git a/app/Policies/EnvironmentPolicy.php b/app/Policies/EnvironmentPolicy.php
index 7199abb25..e400ec903 100644
--- a/app/Policies/EnvironmentPolicy.php
+++ b/app/Policies/EnvironmentPolicy.php
@@ -20,8 +20,9 @@ class EnvironmentPolicy
      */
     public function view(User $user, Environment $environment): bool
     {
-        // return $user->teams->contains('id', $environment->project->team_id);
-        return true;
+        $teamId = $this->getTeamId($environment);
+
+        return $teamId !== null && $user->teams->contains('id', $teamId);
     }
 
     /**
@@ -29,8 +30,7 @@ class EnvironmentPolicy
      */
     public function create(User $user): bool
     {
-        // return $user->isAdmin();
-        return true;
+        return $user->isAdmin();
     }
 
     /**
@@ -38,8 +38,9 @@ class EnvironmentPolicy
      */
     public function update(User $user, Environment $environment): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $environment->project->team_id);
-        return true;
+        $teamId = $this->getTeamId($environment);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -47,8 +48,9 @@ class EnvironmentPolicy
      */
     public function delete(User $user, Environment $environment): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $environment->project->team_id);
-        return true;
+        $teamId = $this->getTeamId($environment);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -56,8 +58,7 @@ class EnvironmentPolicy
      */
     public function restore(User $user, Environment $environment): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $environment->project->team_id);
-        return true;
+        return false;
     }
 
     /**
@@ -65,7 +66,11 @@ class EnvironmentPolicy
      */
     public function forceDelete(User $user, Environment $environment): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $environment->project->team_id);
-        return true;
+        return false;
+    }
+
+    private function getTeamId(Environment $environment): ?int
+    {
+        return $environment->project?->team_id;
     }
 }
diff --git a/app/Policies/EnvironmentVariablePolicy.php b/app/Policies/EnvironmentVariablePolicy.php
index 21e2ea443..dd0f58918 100644
--- a/app/Policies/EnvironmentVariablePolicy.php
+++ b/app/Policies/EnvironmentVariablePolicy.php
@@ -20,7 +20,9 @@ class EnvironmentVariablePolicy
      */
     public function view(User $user, EnvironmentVariable $environmentVariable): bool
     {
-        return true;
+        $teamId = $this->getTeamId($environmentVariable);
+
+        return $teamId !== null && $user->teams->contains('id', $teamId);
     }
 
     /**
@@ -28,7 +30,7 @@ class EnvironmentVariablePolicy
      */
     public function create(User $user): bool
     {
-        return true;
+        return $user->isAdmin();
     }
 
     /**
@@ -36,7 +38,9 @@ class EnvironmentVariablePolicy
      */
     public function update(User $user, EnvironmentVariable $environmentVariable): bool
     {
-        return true;
+        $teamId = $this->getTeamId($environmentVariable);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -44,7 +48,9 @@ class EnvironmentVariablePolicy
      */
     public function delete(User $user, EnvironmentVariable $environmentVariable): bool
     {
-        return true;
+        $teamId = $this->getTeamId($environmentVariable);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -52,7 +58,7 @@ class EnvironmentVariablePolicy
      */
     public function restore(User $user, EnvironmentVariable $environmentVariable): bool
     {
-        return true;
+        return false;
     }
 
     /**
@@ -60,7 +66,7 @@ class EnvironmentVariablePolicy
      */
     public function forceDelete(User $user, EnvironmentVariable $environmentVariable): bool
     {
-        return true;
+        return false;
     }
 
     /**
@@ -68,6 +74,19 @@ class EnvironmentVariablePolicy
      */
     public function manageEnvironment(User $user, EnvironmentVariable $environmentVariable): bool
     {
-        return true;
+        $teamId = $this->getTeamId($environmentVariable);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
+    }
+
+    private function getTeamId(EnvironmentVariable $environmentVariable): ?int
+    {
+        $resource = $environmentVariable->resourceable;
+
+        if (! $resource || ! method_exists($resource, 'team')) {
+            return null;
+        }
+
+        return $resource->team()?->id;
     }
 }
diff --git a/app/Policies/GithubAppPolicy.php b/app/Policies/GithubAppPolicy.php
index 56bec7032..79dd79838 100644
--- a/app/Policies/GithubAppPolicy.php
+++ b/app/Policies/GithubAppPolicy.php
@@ -20,8 +20,11 @@ class GithubAppPolicy
      */
     public function view(User $user, GithubApp $githubApp): bool
     {
-        // return $user->teams->contains('id', $githubApp->team_id) || $githubApp->is_system_wide;
-        return true;
+        if ($githubApp->is_system_wide) {
+            return true;
+        }
+
+        return $user->teams->contains('id', $githubApp->team_id);
     }
 
     /**
@@ -29,8 +32,7 @@ class GithubAppPolicy
      */
     public function create(User $user): bool
     {
-        // return $user->isAdmin();
-        return true;
+        return $user->isAdmin();
     }
 
     /**
@@ -39,12 +41,10 @@ class GithubAppPolicy
     public function update(User $user, GithubApp $githubApp): bool
     {
         if ($githubApp->is_system_wide) {
-            // return $user->isAdmin();
-            return true;
+            return $user->canAccessSystemResources();
         }
 
-        // return $user->isAdmin() && $user->teams->contains('id', $githubApp->team_id);
-        return true;
+        return $user->isAdminOfTeam($githubApp->team_id);
     }
 
     /**
@@ -53,12 +53,10 @@ class GithubAppPolicy
     public function delete(User $user, GithubApp $githubApp): bool
     {
         if ($githubApp->is_system_wide) {
-            // return $user->isAdmin();
-            return true;
+            return $user->canAccessSystemResources();
         }
 
-        // return $user->isAdmin() && $user->teams->contains('id', $githubApp->team_id);
-        return true;
+        return $user->isAdminOfTeam($githubApp->team_id);
     }
 
     /**
diff --git a/app/Policies/NotificationPolicy.php b/app/Policies/NotificationPolicy.php
index 4f3be431d..e8764bf13 100644
--- a/app/Policies/NotificationPolicy.php
+++ b/app/Policies/NotificationPolicy.php
@@ -12,13 +12,11 @@ class NotificationPolicy
      */
     public function view(User $user, Model $notificationSettings): bool
     {
-        // Check if the notification settings belong to the user's current team
         if (! $notificationSettings->team) {
             return false;
         }
 
-        // return $user->teams()->where('teams.id', $notificationSettings->team->id)->exists();
-        return true;
+        return $user->teams->contains('id', $notificationSettings->team->id);
     }
 
     /**
@@ -26,14 +24,13 @@ class NotificationPolicy
      */
     public function update(User $user, Model $notificationSettings): bool
     {
-        // Check if the notification settings belong to the user's current team
         if (! $notificationSettings->team) {
             return false;
         }
 
-        // Only owners and admins can update notification settings
-        //  return $user->isAdmin() || $user->isOwner();
-        return true;
+        $teamId = $notificationSettings->team->id;
+
+        return $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -41,8 +38,7 @@ class NotificationPolicy
      */
     public function manage(User $user, Model $notificationSettings): bool
     {
-        // return $this->update($user, $notificationSettings);
-        return true;
+        return $this->update($user, $notificationSettings);
     }
 
     /**
@@ -50,7 +46,6 @@ class NotificationPolicy
      */
     public function sendTest(User $user, Model $notificationSettings): bool
     {
-        // return $this->update($user, $notificationSettings);
-        return true;
+        return $this->update($user, $notificationSettings);
     }
 }
diff --git a/app/Policies/ProjectPolicy.php b/app/Policies/ProjectPolicy.php
index e188c293f..9d65b9130 100644
--- a/app/Policies/ProjectPolicy.php
+++ b/app/Policies/ProjectPolicy.php
@@ -20,8 +20,7 @@ class ProjectPolicy
      */
     public function view(User $user, Project $project): bool
     {
-        // return $user->teams->contains('id', $project->team_id);
-        return true;
+        return $user->teams->contains('id', $project->team_id);
     }
 
     /**
@@ -29,8 +28,7 @@ class ProjectPolicy
      */
     public function create(User $user): bool
     {
-        // return $user->isAdmin();
-        return true;
+        return $user->isAdmin();
     }
 
     /**
@@ -38,8 +36,7 @@ class ProjectPolicy
      */
     public function update(User $user, Project $project): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $project->team_id);
-        return true;
+        return $user->isAdminOfTeam($project->team_id);
     }
 
     /**
@@ -47,8 +44,7 @@ class ProjectPolicy
      */
     public function delete(User $user, Project $project): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $project->team_id);
-        return true;
+        return $user->isAdminOfTeam($project->team_id);
     }
 
     /**
@@ -56,8 +52,7 @@ class ProjectPolicy
      */
     public function restore(User $user, Project $project): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $project->team_id);
-        return true;
+        return false;
     }
 
     /**
@@ -65,7 +60,6 @@ class ProjectPolicy
      */
     public function forceDelete(User $user, Project $project): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $project->team_id);
-        return true;
+        return false;
     }
 }
diff --git a/app/Policies/ResourceCreatePolicy.php b/app/Policies/ResourceCreatePolicy.php
index 9ed2b66ab..a7a855402 100644
--- a/app/Policies/ResourceCreatePolicy.php
+++ b/app/Policies/ResourceCreatePolicy.php
@@ -38,8 +38,7 @@ class ResourceCreatePolicy
      */
     public function createAny(User $user): bool
     {
-        // return $user->isAdmin();
-        return true;
+        return $user->isAdmin();
     }
 
     /**
@@ -51,8 +50,7 @@ class ResourceCreatePolicy
             return false;
         }
 
-        //  return $user->isAdmin();
-        return true;
+        return $user->isAdmin();
     }
 
     /**
diff --git a/app/Policies/S3StoragePolicy.php b/app/Policies/S3StoragePolicy.php
index 982c7c523..81cbd164f 100644
--- a/app/Policies/S3StoragePolicy.php
+++ b/app/Policies/S3StoragePolicy.php
@@ -36,8 +36,7 @@ class S3StoragePolicy
      */
     public function update(User $user, S3Storage $storage): bool
     {
-        // return $user->teams->contains('id', $storage->team_id) && $user->isAdmin();
-        return $user->teams->contains('id', $storage->team_id);
+        return $user->teams->contains('id', $storage->team_id) && $user->isAdminOfTeam($storage->team_id);
     }
 
     /**
@@ -45,8 +44,7 @@ class S3StoragePolicy
      */
     public function delete(User $user, S3Storage $storage): bool
     {
-        // return $user->teams->contains('id', $storage->team_id) && $user->isAdmin();
-        return $user->teams->contains('id', $storage->team_id);
+        return $user->teams->contains('id', $storage->team_id) && $user->isAdminOfTeam($storage->team_id);
     }
 
     /**
@@ -70,6 +68,6 @@ class S3StoragePolicy
      */
     public function validateConnection(User $user, S3Storage $storage): bool
     {
-        return $user->teams->contains('id', $storage->team_id);
+        return $user->teams->contains('id', $storage->team_id) && $user->isAdminOfTeam($storage->team_id);
     }
 }
diff --git a/app/Policies/ServerPolicy.php b/app/Policies/ServerPolicy.php
index 6d2396a7d..32436987c 100644
--- a/app/Policies/ServerPolicy.php
+++ b/app/Policies/ServerPolicy.php
@@ -28,8 +28,7 @@ class ServerPolicy
      */
     public function create(User $user): bool
     {
-        // return $user->isAdmin();
-        return true;
+        return $user->isAdmin();
     }
 
     /**
@@ -37,8 +36,7 @@ class ServerPolicy
      */
     public function update(User $user, Server $server): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $server->team_id);
-        return true;
+        return $user->isAdminOfTeam($server->team_id);
     }
 
     /**
@@ -46,8 +44,7 @@ class ServerPolicy
      */
     public function delete(User $user, Server $server): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $server->team_id);
-        return true;
+        return $user->isAdminOfTeam($server->team_id);
     }
 
     /**
@@ -71,8 +68,7 @@ class ServerPolicy
      */
     public function manageProxy(User $user, Server $server): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $server->team_id);
-        return true;
+        return $user->isAdminOfTeam($server->team_id);
     }
 
     /**
@@ -80,8 +76,7 @@ class ServerPolicy
      */
     public function manageSentinel(User $user, Server $server): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $server->team_id);
-        return true;
+        return $user->isAdminOfTeam($server->team_id);
     }
 
     /**
@@ -89,8 +84,7 @@ class ServerPolicy
      */
     public function manageCaCertificate(User $user, Server $server): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $server->team_id);
-        return true;
+        return $user->isAdminOfTeam($server->team_id);
     }
 
     /**
@@ -98,7 +92,6 @@ class ServerPolicy
      */
     public function viewSecurity(User $user, Server $server): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $server->team_id);
-        return true;
+        return $user->isAdminOfTeam($server->team_id);
     }
 }
diff --git a/app/Policies/ServiceApplicationPolicy.php b/app/Policies/ServiceApplicationPolicy.php
index af380a90f..c730ab0c6 100644
--- a/app/Policies/ServiceApplicationPolicy.php
+++ b/app/Policies/ServiceApplicationPolicy.php
@@ -21,8 +21,7 @@ class ServiceApplicationPolicy
      */
     public function create(User $user): bool
     {
-        // return $user->isAdmin();
-        return true;
+        return $user->isAdmin();
     }
 
     /**
@@ -30,8 +29,7 @@ class ServiceApplicationPolicy
      */
     public function update(User $user, ServiceApplication $serviceApplication): bool
     {
-        // return Gate::allows('update', $serviceApplication->service);
-        return true;
+        return Gate::allows('update', $serviceApplication->service);
     }
 
     /**
@@ -39,8 +37,7 @@ class ServiceApplicationPolicy
      */
     public function delete(User $user, ServiceApplication $serviceApplication): bool
     {
-        // return Gate::allows('delete', $serviceApplication->service);
-        return true;
+        return Gate::allows('delete', $serviceApplication->service);
     }
 
     /**
@@ -48,8 +45,7 @@ class ServiceApplicationPolicy
      */
     public function restore(User $user, ServiceApplication $serviceApplication): bool
     {
-        // return Gate::allows('update', $serviceApplication->service);
-        return true;
+        return false;
     }
 
     /**
@@ -57,7 +53,6 @@ class ServiceApplicationPolicy
      */
     public function forceDelete(User $user, ServiceApplication $serviceApplication): bool
     {
-        // return Gate::allows('delete', $serviceApplication->service);
-        return true;
+        return false;
     }
 }
diff --git a/app/Policies/ServiceDatabasePolicy.php b/app/Policies/ServiceDatabasePolicy.php
index f72f1f327..e5cbe91a0 100644
--- a/app/Policies/ServiceDatabasePolicy.php
+++ b/app/Policies/ServiceDatabasePolicy.php
@@ -13,7 +13,7 @@ class ServiceDatabasePolicy
      */
     public function view(User $user, ServiceDatabase $serviceDatabase): bool
     {
-        return true;
+        return Gate::allows('view', $serviceDatabase->service);
     }
 
     /**
@@ -21,8 +21,7 @@ class ServiceDatabasePolicy
      */
     public function create(User $user): bool
     {
-        // return $user->isAdmin();
-        return true;
+        return $user->isAdmin();
     }
 
     /**
@@ -30,9 +29,7 @@ class ServiceDatabasePolicy
      */
     public function update(User $user, ServiceDatabase $serviceDatabase): bool
     {
-
-        // return Gate::allows('update', $serviceDatabase->service);
-        return true;
+        return Gate::allows('update', $serviceDatabase->service);
     }
 
     /**
@@ -40,8 +37,7 @@ class ServiceDatabasePolicy
      */
     public function delete(User $user, ServiceDatabase $serviceDatabase): bool
     {
-        // return Gate::allows('delete', $serviceDatabase->service);
-        return true;
+        return Gate::allows('delete', $serviceDatabase->service);
     }
 
     /**
@@ -49,8 +45,7 @@ class ServiceDatabasePolicy
      */
     public function restore(User $user, ServiceDatabase $serviceDatabase): bool
     {
-        // return Gate::allows('update', $serviceDatabase->service);
-        return true;
+        return false;
     }
 
     /**
@@ -58,12 +53,14 @@ class ServiceDatabasePolicy
      */
     public function forceDelete(User $user, ServiceDatabase $serviceDatabase): bool
     {
-        // return Gate::allows('delete', $serviceDatabase->service);
-        return true;
+        return false;
     }
 
+    /**
+     * Determine whether the user can manage database backups.
+     */
     public function manageBackups(User $user, ServiceDatabase $serviceDatabase): bool
     {
-        return true;
+        return Gate::allows('update', $serviceDatabase->service);
     }
 }
diff --git a/app/Policies/ServicePolicy.php b/app/Policies/ServicePolicy.php
index 7ab0fe7d0..d48728cdf 100644
--- a/app/Policies/ServicePolicy.php
+++ b/app/Policies/ServicePolicy.php
@@ -20,7 +20,9 @@ class ServicePolicy
      */
     public function view(User $user, Service $service): bool
     {
-        return true;
+        $teamId = $this->getTeamId($service);
+
+        return $teamId !== null && $user->teams->contains('id', $teamId);
     }
 
     /**
@@ -28,8 +30,7 @@ class ServicePolicy
      */
     public function create(User $user): bool
     {
-        // return $user->isAdmin();
-        return true;
+        return $user->isAdmin();
     }
 
     /**
@@ -37,13 +38,9 @@ class ServicePolicy
      */
     public function update(User $user, Service $service): bool
     {
-        $team = $service->team();
-        if (! $team) {
-            return false;
-        }
+        $teamId = $this->getTeamId($service);
 
-        // return $user->isAdmin() && $user->teams->contains('id', $team->id);
-        return true;
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -51,12 +48,9 @@ class ServicePolicy
      */
     public function delete(User $user, Service $service): bool
     {
-        // if ($user->isAdmin()) {
-        //    return true;
-        // }
+        $teamId = $this->getTeamId($service);
 
-        // return false;
-        return true;
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -64,8 +58,7 @@ class ServicePolicy
      */
     public function restore(User $user, Service $service): bool
     {
-        // return true;
-        return true;
+        return false;
     }
 
     /**
@@ -73,23 +66,17 @@ class ServicePolicy
      */
     public function forceDelete(User $user, Service $service): bool
     {
-        // if ($user->isAdmin()) {
-        //    return true;
-        // }
-
-        // return false;
-        return true;
+        return false;
     }
 
+    /**
+     * Determine whether the user can stop the service.
+     */
     public function stop(User $user, Service $service): bool
     {
-        $team = $service->team();
-        if (! $team) {
-            return false;
-        }
+        $teamId = $this->getTeamId($service);
 
-        // return $user->teams->contains('id', $team->id);
-        return true;
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -97,13 +84,9 @@ class ServicePolicy
      */
     public function manageEnvironment(User $user, Service $service): bool
     {
-        $team = $service->team();
-        if (! $team) {
-            return false;
-        }
+        $teamId = $this->getTeamId($service);
 
-        // return $user->isAdmin() && $user->teams->contains('id', $team->id);
-        return true;
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
     /**
@@ -111,18 +94,23 @@ class ServicePolicy
      */
     public function deploy(User $user, Service $service): bool
     {
-        $team = $service->team();
-        if (! $team) {
-            return false;
-        }
+        $teamId = $this->getTeamId($service);
 
-        // return $user->teams->contains('id', $team->id);
-        return true;
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
     }
 
+    /**
+     * Determine whether the user can access the terminal.
+     */
     public function accessTerminal(User $user, Service $service): bool
     {
-        // return $user->isAdmin() || $user->teams->contains('id', $service->team()->id);
-        return true;
+        $teamId = $this->getTeamId($service);
+
+        return $teamId !== null && $user->isAdminOfTeam($teamId);
+    }
+
+    private function getTeamId(Service $service): ?int
+    {
+        return $service->team()?->id;
     }
 }
diff --git a/app/Policies/SharedEnvironmentVariablePolicy.php b/app/Policies/SharedEnvironmentVariablePolicy.php
index b465d8a0c..21b6acb27 100644
--- a/app/Policies/SharedEnvironmentVariablePolicy.php
+++ b/app/Policies/SharedEnvironmentVariablePolicy.php
@@ -28,8 +28,7 @@ class SharedEnvironmentVariablePolicy
      */
     public function create(User $user): bool
     {
-        // return $user->isAdmin();
-        return true;
+        return $user->isAdmin();
     }
 
     /**
@@ -37,8 +36,7 @@ class SharedEnvironmentVariablePolicy
      */
     public function update(User $user, SharedEnvironmentVariable $sharedEnvironmentVariable): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $sharedEnvironmentVariable->team_id);
-        return true;
+        return $user->isAdminOfTeam($sharedEnvironmentVariable->team_id);
     }
 
     /**
@@ -46,8 +44,7 @@ class SharedEnvironmentVariablePolicy
      */
     public function delete(User $user, SharedEnvironmentVariable $sharedEnvironmentVariable): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $sharedEnvironmentVariable->team_id);
-        return true;
+        return $user->isAdminOfTeam($sharedEnvironmentVariable->team_id);
     }
 
     /**
@@ -55,8 +52,7 @@ class SharedEnvironmentVariablePolicy
      */
     public function restore(User $user, SharedEnvironmentVariable $sharedEnvironmentVariable): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $sharedEnvironmentVariable->team_id);
-        return true;
+        return false;
     }
 
     /**
@@ -64,8 +60,7 @@ class SharedEnvironmentVariablePolicy
      */
     public function forceDelete(User $user, SharedEnvironmentVariable $sharedEnvironmentVariable): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $sharedEnvironmentVariable->team_id);
-        return true;
+        return false;
     }
 
     /**
@@ -73,7 +68,6 @@ class SharedEnvironmentVariablePolicy
      */
     public function manageEnvironment(User $user, SharedEnvironmentVariable $sharedEnvironmentVariable): bool
     {
-        // return $user->isAdmin() && $user->teams->contains('id', $sharedEnvironmentVariable->team_id);
-        return true;
+        return $user->isAdminOfTeam($sharedEnvironmentVariable->team_id);
     }
 }
diff --git a/app/Policies/StandaloneDockerPolicy.php b/app/Policies/StandaloneDockerPolicy.php
index 3e1f83d12..33eda183a 100644
--- a/app/Policies/StandaloneDockerPolicy.php
+++ b/app/Policies/StandaloneDockerPolicy.php
@@ -28,8 +28,7 @@ class StandaloneDockerPolicy
      */
     public function create(User $user): bool
     {
-        // return $user->isAdmin();
-        return true;
+        return $user->isAdmin();
     }
 
     /**
@@ -37,7 +36,7 @@ class StandaloneDockerPolicy
      */
     public function update(User $user, StandaloneDocker $standaloneDocker): bool
     {
-        return $user->teams->contains('id', $standaloneDocker->server->team_id);
+        return $user->isAdminOfTeam($standaloneDocker->server->team_id);
     }
 
     /**
@@ -45,7 +44,7 @@ class StandaloneDockerPolicy
      */
     public function delete(User $user, StandaloneDocker $standaloneDocker): bool
     {
-        return $user->teams->contains('id', $standaloneDocker->server->team_id);
+        return $user->isAdminOfTeam($standaloneDocker->server->team_id);
     }
 
     /**
diff --git a/app/Policies/SwarmDockerPolicy.php b/app/Policies/SwarmDockerPolicy.php
index 82a75910b..b19ab4907 100644
--- a/app/Policies/SwarmDockerPolicy.php
+++ b/app/Policies/SwarmDockerPolicy.php
@@ -28,8 +28,7 @@ class SwarmDockerPolicy
      */
     public function create(User $user): bool
     {
-        // return $user->isAdmin();
-        return true;
+        return $user->isAdmin();
     }
 
     /**
@@ -37,7 +36,7 @@ class SwarmDockerPolicy
      */
     public function update(User $user, SwarmDocker $swarmDocker): bool
     {
-        return $user->teams->contains('id', $swarmDocker->server->team_id);
+        return $user->isAdminOfTeam($swarmDocker->server->team_id);
     }
 
     /**
@@ -45,7 +44,7 @@ class SwarmDockerPolicy
      */
     public function delete(User $user, SwarmDocker $swarmDocker): bool
     {
-        return $user->teams->contains('id', $swarmDocker->server->team_id);
+        return $user->isAdminOfTeam($swarmDocker->server->team_id);
     }
 
     /**
diff --git a/app/View/Components/Forms/Button.php b/app/View/Components/Forms/Button.php
index b54444261..8511c87db 100644
--- a/app/View/Components/Forms/Button.php
+++ b/app/View/Components/Forms/Button.php
@@ -14,6 +14,7 @@ class Button extends Component
      */
     public function __construct(
         public bool $disabled = false,
+        public bool $authDisabled = false,
         public bool $noStyle = false,
         public ?string $modalId = null,
         public string $defaultClass = 'button',
@@ -28,6 +29,7 @@ class Button extends Component
 
             if (! $hasPermission) {
                 $this->disabled = true;
+                $this->authDisabled = true;
             }
         }
 
diff --git a/bootstrap/helpers/remoteProcess.php b/bootstrap/helpers/remoteProcess.php
index 217c82929..cb9f3bcab 100644
--- a/bootstrap/helpers/remoteProcess.php
+++ b/bootstrap/helpers/remoteProcess.php
@@ -183,6 +183,11 @@ function decode_remote_command_output(?ApplicationDeploymentQueue $application_d
     $application = Application::find(data_get($application_deployment_queue, 'application_id'));
     $is_debug_enabled = data_get($application, 'settings.is_debug_enabled');
 
+    // Members should never see debug logs, even if an admin enabled debug mode
+    if ($is_debug_enabled && auth()->check() && auth()->user()->isMember()) {
+        $is_debug_enabled = false;
+    }
+
     $logs = data_get($application_deployment_queue, 'logs');
     if (empty($logs)) {
         return collect([]);
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 3e993dbf3..d51a647aa 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -186,6 +186,14 @@ function refreshSession(?Team $team = null): void
             $team = User::find(Auth::id())->teams->first();
         }
     }
+
+    if (! $team) {
+        session()->forget('currentTeam');
+        Cache::forget('team:'.Auth::id());
+
+        return;
+    }
+
     // Clear old cache key format for backwards compatibility
     Cache::forget('team:'.Auth::id());
     // Use new cache key format that includes team ID
diff --git a/resources/css/utilities.css b/resources/css/utilities.css
index 02be0c0c4..349a12ed0 100644
--- a/resources/css/utilities.css
+++ b/resources/css/utilities.css
@@ -122,7 +122,11 @@
 }
 
 @utility button {
-    @apply flex gap-2 justify-center items-center px-2 h-8 text-sm text-black normal-case rounded-sm border-2 outline-0 cursor-pointer font-medium bg-white border-neutral-200 hover:bg-neutral-100 dark:bg-coolgray-100 dark:text-white dark:hover:text-white dark:hover:bg-coolgray-200 dark:border-coolgray-300 hover:text-black disabled:cursor-not-allowed min-w-fit dark:disabled:text-neutral-600 disabled:border-transparent disabled:hover:bg-transparent disabled:bg-transparent disabled:text-neutral-300 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-coollabs dark:focus-visible:ring-warning focus-visible:ring-offset-2 dark:focus-visible:ring-offset-base;
+    @apply flex gap-2 justify-center items-center px-2 h-8 text-sm text-black normal-case rounded-sm border-2 outline-0 cursor-pointer font-medium bg-white border-neutral-200 hover:bg-neutral-100 dark:bg-coolgray-100 dark:text-white dark:hover:text-white dark:hover:bg-coolgray-200 dark:border-coolgray-300 hover:text-black disabled:cursor-not-allowed min-w-fit dark:disabled:text-neutral-600 disabled:border-neutral-200 dark:disabled:border-coolgray-300 disabled:hover:bg-transparent disabled:bg-transparent disabled:text-neutral-300 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-coollabs dark:focus-visible:ring-warning focus-visible:ring-offset-2 dark:focus-visible:ring-offset-base;
+}
+
+@utility auth-tooltip {
+    @apply fixed z-[99] px-2.5 py-1.5 text-xs rounded-sm pointer-events-none whitespace-nowrap text-neutral-700 bg-neutral-200 dark:text-neutral-300 dark:bg-coolgray-400;
 }
 
 @utility alert-success {
diff --git a/resources/views/components/applications/advanced.blade.php b/resources/views/components/applications/advanced.blade.php
index e36583741..5964abb4e 100644
--- a/resources/views/components/applications/advanced.blade.php
+++ b/resources/views/components/applications/advanced.blade.php
@@ -3,7 +3,7 @@
         Advanced
     </x-slot>
     @if ($application->status === 'running')
-        <div class="dropdown-iteme" wire:click='force_deploy_without_cache'>
+        <div class="dropdown-iteme" @if(!auth()->user()->can('deploy', $application)) data-disabled @endif wire:click='force_deploy_without_cache'>
             <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24" stroke-width="1.5"
                 stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
                 <path stroke="none" d="M0 0h24v24H0z" fill="none" />
@@ -18,7 +18,7 @@
             cache)
         </div>
     @else
-        <div class="dropdown-item" wire:click='deploy(true)'>
+        <div class="dropdown-item" @if(!auth()->user()->can('deploy', $application)) data-disabled @endif wire:click='deploy(true)'>
             <svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4" viewBox="0 0 24 24" stroke-width="1.5"
                 stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
                 <path stroke="none" d="M0 0h24v24H0z" fill="none" />
diff --git a/resources/views/components/forms/button.blade.php b/resources/views/components/forms/button.blade.php
index 96cdb4420..f1efd8c6c 100644
--- a/resources/views/components/forms/button.blade.php
+++ b/resources/views/components/forms/button.blade.php
@@ -1,3 +1,24 @@
+@if ($authDisabled)
+<span class="relative inline-flex"
+    x-data="{ visible: false, _t: null }"
+    @mouseenter="_t = setTimeout(() => {
+        visible = true;
+        $nextTick(() => requestAnimationFrame(() => {
+            const tip = $refs.tip;
+            if (!tip) return;
+            const r = $el.getBoundingClientRect();
+            const t = tip.getBoundingClientRect();
+            let top = r.top - t.height - 6;
+            let left = r.left;
+            if (top < 4) top = r.bottom + 6;
+            if (left + t.width > innerWidth - 8) left = innerWidth - 8 - t.width;
+            if (left < 4) left = 4;
+            tip.style.top = top + 'px';
+            tip.style.left = left + 'px';
+        }));
+    }, 300)"
+    @mouseleave="clearTimeout(_t); visible = false">
+@endif
 <button @disabled($disabled) {{ $attributes->merge(['class' => $defaultClass]) }}
     {{ $attributes->merge(['type' => 'button']) }}
     @isset($confirm)
@@ -18,3 +39,9 @@
         @endif
     @endif
 </button>
+@if ($authDisabled)
+    <div x-ref="tip" x-show="visible" x-cloak class="auth-tooltip">
+        You do not have permission to perform this action.
+    </div>
+</span>
+@endif
diff --git a/resources/views/components/modal-confirmation.blade.php b/resources/views/components/modal-confirmation.blade.php
index e77b52076..ae01a5913 100644
--- a/resources/views/components/modal-confirmation.blade.php
+++ b/resources/views/components/modal-confirmation.blade.php
@@ -6,6 +6,7 @@
     'buttonFullWidth' => false,
     'customButton' => null,
     'disabled' => false,
+    'authDisabled' => false,
     'dispatchAction' => false,
     'submitAction' => 'delete',
     'content' => null,
@@ -147,11 +148,11 @@
         @else
             @if ($disabled)
                 @if ($buttonFullWidth)
-                    <x-forms.button class="w-full" isError disabled wire:target>
+                    <x-forms.button class="w-full" isError disabled :authDisabled="$authDisabled" wire:target>
                         {{ $buttonTitle }}
                     </x-forms.button>
                 @else
-                    <x-forms.button isError disabled wire:target>
+                    <x-forms.button isError disabled :authDisabled="$authDisabled" wire:target>
                         {{ $buttonTitle }}
                     </x-forms.button>
                 @endif
diff --git a/resources/views/components/notification/navbar.blade.php b/resources/views/components/notification/navbar.blade.php
index 0ee3b8ee4..256c4d528 100644
--- a/resources/views/components/notification/navbar.blade.php
+++ b/resources/views/components/notification/navbar.blade.php
@@ -2,7 +2,7 @@
     <h1>Notifications</h1>
     <div class="subtitle">Get notified about your infrastructure.</div>
     <div class="navbar-main">
-        <nav class="flex items-center gap-3.5 min-h-10">
+        <nav class="flex items-center gap-6 min-h-10">
             <a class="{{ request()->routeIs('notifications.email') ? 'dark:text-white' : '' }}" {{ wireNavigate() }}
                 href="{{ route('notifications.email') }}">
                 <button>Email</button>
diff --git a/resources/views/components/services/advanced.blade.php b/resources/views/components/services/advanced.blade.php
index 963de5c57..ed8c5d647 100644
--- a/resources/views/components/services/advanced.blade.php
+++ b/resources/views/components/services/advanced.blade.php
@@ -3,7 +3,7 @@
         Advanced
     </x-slot>
     @if (str($service->status)->contains('running'))
-        <div class="dropdown-item" @click="$wire.dispatch('pullAndRestartEvent')">
+        <div class="dropdown-item" @if(!auth()->user()->can('deploy', $service)) data-disabled @endif @click="$wire.dispatch('pullAndRestartEvent')">
             <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24" stroke-width="1.5"
                 stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
                 <path stroke="none" d="M0 0h24v24H0z" fill="none" />
@@ -17,7 +17,7 @@
             Pull Latest Images & Restart
         </div>
     @elseif (str($service->status)->contains('degraded'))
-        <div class="dropdown-item" @click="$wire.dispatch('forceDeployEvent')">
+        <div class="dropdown-item" @if(!auth()->user()->can('deploy', $service)) data-disabled @endif @click="$wire.dispatch('forceDeployEvent')">
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor"
                 stroke-linecap="round" stroke-linejoin="round" data-darkreader-inline-stroke=""
                 style="--darkreader-inline-stroke: currentColor;" class="w-6 h-6" stroke-width="2">
@@ -27,7 +27,7 @@
             Force Restart
         </div>
     @else
-        <div class="dropdown-item" @click="$wire.dispatch('forceDeployEvent')">
+        <div class="dropdown-item" @if(!auth()->user()->can('deploy', $service)) data-disabled @endif @click="$wire.dispatch('forceDeployEvent')">
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor"
                 stroke-linecap="round" stroke-linejoin="round" data-darkreader-inline-stroke=""
                 style="--darkreader-inline-stroke: currentColor;" class="w-4 h-4" stroke-width="2">
@@ -36,7 +36,7 @@
             </svg>
             Force Deploy
         </div>
-        <div class="dropdown-item" wire:click='stop(true)''>
+        <div class="dropdown-item" @if(!auth()->user()->can('stop', $service)) data-disabled @endif wire:click='stop(true)''>
             <svg class="w-4 h-4" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
                 <path fill="currentColor" d="M26 20h-6v-2h6zm4 8h-6v-2h6zm-2-4h-6v-2h6z" />
                 <path fill="currentColor"
diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index 908c4a98a..8c75fd102 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -11,20 +11,23 @@
     <section class="-mt-2">
         <div class="flex items-center gap-2 pb-2">
             <h3>Projects</h3>
-            @if ($projects->count() > 0)
-                <x-modal-input buttonTitle="Add" title="New Project">
-                    <x-slot:content>
-                        <button
-                            class="flex items-center justify-center size-4 text-white rounded hover:bg-coolgray-400 dark:hover:bg-coolgray-300 cursor-pointer">
-                            <svg class="size-3" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                stroke-width="2" stroke="currentColor">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
-                            </svg>
-                        </button>
-                    </x-slot:content>
-                    <livewire:project.add-empty />
-                </x-modal-input>
-            @endif
+            @can('create', App\Models\Project::class)
+                @if ($projects->count() > 0)
+                    <x-modal-input buttonTitle="Add" title="New Project">
+                        <x-slot:content>
+                            <button
+                                class="flex items-center justify-center size-4 text-white rounded hover:bg-coolgray-400 dark:hover:bg-coolgray-300 cursor-pointer">
+                                <svg class="size-3" xmlns="http://www.w3.org/2000/svg" fill="none"
+                                    viewBox="0 0 24 24" stroke-width="2" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M12 4.5v15m7.5-7.5h-15" />
+                                </svg>
+                            </button>
+                        </x-slot:content>
+                        <livewire:project.add-empty />
+                    </x-modal-input>
+                @endif
+            @endcan
         </div>
         @if ($projects->count() > 0)
             <div class="grid grid-cols-1 gap-4 xl:grid-cols-2">
@@ -64,12 +67,15 @@
         @else
             <div class="flex flex-col gap-1">
                 <div class='font-bold dark:text-warning'>No projects found.</div>
-                <div class="flex items-center gap-1">
-                    <x-modal-input buttonTitle="Add" title="New Project">
-                        <livewire:project.add-empty />
-                    </x-modal-input> your first project or
-                    go to the <a class="underline dark:text-white" href="{{ route('onboarding') }}" {{ wireNavigate() }}>onboarding</a> page.
-                </div>
+                @can('create', App\Models\Project::class)
+                    <div class="flex items-center gap-1">
+                        <x-modal-input buttonTitle="Add" title="New Project">
+                            <livewire:project.add-empty />
+                        </x-modal-input> your first project or
+                        go to the <a class="underline dark:text-white" href="{{ route('onboarding') }}"
+                            {{ wireNavigate() }}>onboarding</a> page.
+                    </div>
+                @endcan
             </div>
         @endif
     </section>
@@ -77,20 +83,23 @@
     <section>
         <div class="flex items-center gap-2 pb-2">
             <h3>Servers</h3>
-            @if ($servers->count() > 0 && $privateKeys->count() > 0)
-                <x-modal-input buttonTitle="Add" title="New Server" :closeOutside="false">
-                    <x-slot:content>
-                        <button
-                            class="flex items-center justify-center size-4 text-white rounded hover:bg-coolgray-400 dark:hover:bg-coolgray-300 cursor-pointer">
-                            <svg class="size-3" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                stroke-width="2" stroke="currentColor">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
-                            </svg>
-                        </button>
-                    </x-slot:content>
-                    <livewire:server.create />
-                </x-modal-input>
-            @endif
+            @can('create', App\Models\Server::class)
+                @if ($servers->count() > 0 && $privateKeys->count() > 0)
+                    <x-modal-input buttonTitle="Add" title="New Server" :closeOutside="false">
+                        <x-slot:content>
+                            <button
+                                class="flex items-center justify-center size-4 text-white rounded hover:bg-coolgray-400 dark:hover:bg-coolgray-300 cursor-pointer">
+                                <svg class="size-3" xmlns="http://www.w3.org/2000/svg" fill="none"
+                                    viewBox="0 0 24 24" stroke-width="2" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M12 4.5v15m7.5-7.5h-15" />
+                                </svg>
+                            </button>
+                        </x-slot:content>
+                        <livewire:server.create />
+                    </x-modal-input>
+                @endif
+            @endcan
         </div>
         @if ($servers->count() > 0)
             <div class="grid grid-cols-1 gap-4 xl:grid-cols-2">
@@ -127,26 +136,34 @@
             @if ($privateKeys->count() === 0)
                 <div class="flex flex-col gap-1">
                     <div class='font-bold dark:text-warning'>No private keys found.</div>
-                    <div class="flex items-center gap-1">Before you can add your server, first <x-modal-input
-                            buttonTitle="add" title="New Private Key">
-                            <livewire:security.private-key.create from="server" />
-                        </x-modal-input> a private key
-                        or
-                        go to the <a class="underline dark:text-white" href="{{ route('onboarding') }}" {{ wireNavigate() }}>onboarding</a>
-                        page.
-                    </div>
+                    @can('create', App\Models\Server::class)
+                        <div class="flex items-center gap-1">Before you can add your server, first <x-modal-input
+                                buttonTitle="add" title="New Private Key">
+                                <livewire:security.private-key.create from="server" />
+                            </x-modal-input> a private key
+                            or
+                            go to the <a class="underline dark:text-white"
+                                href="{{ route('onboarding') }}"
+                                {{ wireNavigate() }}>onboarding</a>
+                            page.
+                        </div>
+                    @endcan
                 </div>
             @else
                 <div class="flex flex-col gap-1">
                     <div class='font-bold dark:text-warning'>No servers found.</div>
-                    <div class="flex items-center gap-1">
-                        <x-modal-input buttonTitle="Add" title="New Server" :closeOutside="false">
-                            <livewire:server.create />
-                        </x-modal-input> your first server
-                        or
-                        go to the <a class="underline dark:text-white" href="{{ route('onboarding') }}" {{ wireNavigate() }}>onboarding</a>
-                        page.
-                    </div>
+                    @can('create', App\Models\Server::class)
+                        <div class="flex items-center gap-1">
+                            <x-modal-input buttonTitle="Add" title="New Server" :closeOutside="false">
+                                <livewire:server.create />
+                            </x-modal-input> your first server
+                            or
+                            go to the <a class="underline dark:text-white"
+                                href="{{ route('onboarding') }}"
+                                {{ wireNavigate() }}>onboarding</a>
+                            page.
+                        </div>
+                    @endcan
                 </div>
             @endif
         @endif
diff --git a/resources/views/livewire/project/application/deployment/show.blade.php b/resources/views/livewire/project/application/deployment/show.blade.php
index 28872f4bc..4ea4a65bc 100644
--- a/resources/views/livewire/project/application/deployment/show.blade.php
+++ b/resources/views/livewire/project/application/deployment/show.blade.php
@@ -246,6 +246,7 @@
                                             class="block w-full px-4 py-2 text-left text-sm text-gray-700 dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-coolgray-300">
                                             Download displayed logs
                                         </button>
+                                        @can('update', $application)
                                         <button x-on:click="
                                             downloadingAllLogs = true;
                                             $wire.downloadAllLogs().then(logs => {
@@ -276,6 +277,7 @@
                                                 Downloading...
                                             </span>
                                         </button>
+                                        @endcan
                                     </div>
                                 </div>
                             </div>
@@ -288,6 +290,7 @@
                                         d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
                                 </svg>
                             </button>
+                            @can('update', $application)
                             <button wire:click="toggleDebug"
                                 title="{{ $is_debug_enabled ? 'Hide Debug Logs' : 'Show Debug Logs' }}"
                                 class="p-1 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 {{ $is_debug_enabled ? '!text-warning' : '' }}">
@@ -297,6 +300,7 @@
                                         d="M12 12.75c1.148 0 2.278.08 3.383.237 1.037.146 1.866.966 1.866 2.013 0 3.728-2.35 6.75-5.25 6.75S6.75 18.728 6.75 15c0-1.046.83-1.867 1.866-2.013A24.204 24.204 0 0 1 12 12.75Zm0 0c2.883 0 5.647.508 8.207 1.44a23.91 23.91 0 0 1-1.152 6.06M12 12.75c-2.883 0-5.647.508-8.208 1.44.125 2.104.52 4.136 1.153 6.06M12 12.75a2.25 2.25 0 0 0 2.248-2.354M12 12.75a2.25 2.25 0 0 1-2.248-2.354M12 8.25c.995 0 1.971-.08 2.922-.236.403-.066.74-.358.795-.762a3.778 3.778 0 0 0-.399-2.25M12 8.25c-.995 0-1.97-.08-2.922-.236-.402-.066-.74-.358-.795-.762a3.734 3.734 0 0 1 .4-2.253M12 8.25a2.25 2.25 0 0 0-2.248 2.146M12 8.25a2.25 2.25 0 0 1 2.248 2.146M8.683 5a6.032 6.032 0 0 1-1.155-1.002c.07-.63.27-1.222.574-1.747m.581 2.749A3.75 3.75 0 0 1 15.318 5m0 0c.427-.283.815-.62 1.155-.999a4.471 4.471 0 0 0-.575-1.752M4.921 6a24.048 24.048 0 0 0-.392 3.314c1.668.546 3.416.914 5.223 1.082M19.08 6c.205 1.08.337 2.187.392 3.314a23.882 23.882 0 0 1-5.223 1.082" />
                                 </svg>
                             </button>
+                            @endcan
                             <button title="Follow Logs" :class="alwaysScroll ? '!text-warning' : ''"
                                 x-on:click="toggleScroll"
                                 class="p-1 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200">
diff --git a/resources/views/livewire/project/application/heading.blade.php b/resources/views/livewire/project/application/heading.blade.php
index 4af466fc5..c73a824bb 100644
--- a/resources/views/livewire/project/application/heading.blade.php
+++ b/resources/views/livewire/project/application/heading.blade.php
@@ -36,88 +36,88 @@
                 <div>Please load a Compose file.</div>
             @else
                 @if (!$application->destination->server->isSwarm())
-                    <div>
-                        <x-applications.advanced :application="$application" />
-                    </div>
+                        <div>
+                            <x-applications.advanced :application="$application" />
+                        </div>
                 @endif
-                <div class="flex flex-wrap gap-2">
-                    @if (!str($application->status)->startsWith('exited'))
-                        @if (!$application->destination->server->isSwarm())
-                            <x-forms.button title="With rolling update if possible" wire:click='deploy'>
-                                <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-orange-400"
-                                    viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none"
-                                    stroke-linecap="round" stroke-linejoin="round">
-                                    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-                                    <path
-                                        d="M10.09 4.01l.496 -.495a2 2 0 0 1 2.828 0l7.071 7.07a2 2 0 0 1 0 2.83l-7.07 7.07a2 2 0 0 1 -2.83 0l-7.07 -7.07a2 2 0 0 1 0 -2.83l3.535 -3.535h-3.988">
-                                    </path>
-                                    <path d="M7.05 11.038v-3.988"></path>
-                                </svg>
-                                Redeploy
-                            </x-forms.button>
-                        @endif
-                        @if ($application->build_pack !== 'dockercompose')
-                            @if ($application->destination->server->isSwarm())
-                                <x-forms.button title="Redeploy Swarm Service (rolling update)" wire:click='deploy'>
-                                    <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
-                                        xmlns="http://www.w3.org/2000/svg">
-                                        <g fill="none" stroke="currentColor" stroke-linecap="round"
-                                            stroke-linejoin="round" stroke-width="2">
-                                            <path
-                                                d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
-                                            <path d="M20 4v5h-5" />
-                                        </g>
+                    <div class="flex flex-wrap gap-2">
+                        @if (!str($application->status)->startsWith('exited'))
+                            @if (!$application->destination->server->isSwarm())
+                                <x-forms.button canGate="deploy" :canResource="$application" title="With rolling update if possible" wire:click='deploy'>
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-orange-400"
+                                        viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none"
+                                        stroke-linecap="round" stroke-linejoin="round">
+                                        <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                                        <path
+                                            d="M10.09 4.01l.496 -.495a2 2 0 0 1 2.828 0l7.071 7.07a2 2 0 0 1 0 2.83l-7.07 7.07a2 2 0 0 1 -2.83 0l-7.07 -7.07a2 2 0 0 1 0 -2.83l3.535 -3.535h-3.988">
+                                        </path>
+                                        <path d="M7.05 11.038v-3.988"></path>
                                     </svg>
-                                    Update Service
-                                </x-forms.button>
-                            @else
-                                <x-forms.button title="Restart without rebuilding" wire:click='restart'>
-                                    <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
-                                        xmlns="http://www.w3.org/2000/svg">
-                                        <g fill="none" stroke="currentColor" stroke-linecap="round"
-                                            stroke-linejoin="round" stroke-width="2">
-                                            <path
-                                                d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
-                                            <path d="M20 4v5h-5" />
-                                        </g>
-                                    </svg>
-                                    Restart
+                                    Redeploy
                                 </x-forms.button>
                             @endif
-                        @endif
-                        <x-modal-confirmation title="Confirm Application Stopping?" buttonTitle="Stop"
-                            submitAction="stop" :checkboxes="$checkboxes" :actions="[
-                                'This application will be stopped.',
-                                'All non-persistent data of this application will be deleted.',
-                            ]" :confirmWithText="false" :confirmWithPassword="false"
-                            step1ButtonText="Continue" step2ButtonText="Confirm">
-                            <x-slot:button-title>
-                                <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
-                                    stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
-                                    stroke-linejoin="round">
-                                    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-                                    <path
-                                        d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                                    </path>
-                                    <path
-                                        d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                                    </path>
+                            @if ($application->build_pack !== 'dockercompose')
+                                @if ($application->destination->server->isSwarm())
+                                    <x-forms.button canGate="deploy" :canResource="$application" title="Redeploy Swarm Service (rolling update)" wire:click='deploy'>
+                                        <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
+                                            xmlns="http://www.w3.org/2000/svg">
+                                            <g fill="none" stroke="currentColor" stroke-linecap="round"
+                                                stroke-linejoin="round" stroke-width="2">
+                                                <path
+                                                    d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                                                <path d="M20 4v5h-5" />
+                                            </g>
+                                        </svg>
+                                        Update Service
+                                    </x-forms.button>
+                                @else
+                                    <x-forms.button canGate="deploy" :canResource="$application" title="Restart without rebuilding" wire:click='restart'>
+                                        <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
+                                            xmlns="http://www.w3.org/2000/svg">
+                                            <g fill="none" stroke="currentColor" stroke-linecap="round"
+                                                stroke-linejoin="round" stroke-width="2">
+                                                <path
+                                                    d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                                                <path d="M20 4v5h-5" />
+                                            </g>
+                                        </svg>
+                                        Restart
+                                    </x-forms.button>
+                                @endif
+                            @endif
+                            <x-modal-confirmation :disabled="!auth()->user()->can('deploy', $application)" :authDisabled="!auth()->user()->can('deploy', $application)" title="Confirm Application Stopping?" buttonTitle="Stop"
+                                submitAction="stop" :checkboxes="$checkboxes" :actions="[
+                                    'This application will be stopped.',
+                                    'All non-persistent data of this application will be deleted.',
+                                ]" :confirmWithText="false" :confirmWithPassword="false"
+                                step1ButtonText="Continue" step2ButtonText="Confirm">
+                                <x-slot:button-title>
+                                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
+                                        stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
+                                        stroke-linejoin="round">
+                                        <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                                        <path
+                                            d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                                        </path>
+                                        <path
+                                            d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                                        </path>
+                                    </svg>
+                                    Stop
+                                </x-slot:button-title>
+                            </x-modal-confirmation>
+                        @else
+                            <x-forms.button canGate="deploy" :canResource="$application" wire:click='deploy'>
+                                <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning"
+                                    viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none"
+                                    stroke-linecap="round" stroke-linejoin="round">
+                                    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                                    <path d="M7 4v16l13 -8z" />
                                 </svg>
-                                Stop
-                            </x-slot:button-title>
-                        </x-modal-confirmation>
-                    @else
-                        <x-forms.button wire:click='deploy'>
-                            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning"
-                                viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none"
-                                stroke-linecap="round" stroke-linejoin="round">
-                                <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                                <path d="M7 4v16l13 -8z" />
-                            </svg>
-                            Deploy
-                        </x-forms.button>
-                    @endif
-                </div>
+                                Deploy
+                            </x-forms.button>
+                        @endif
+                    </div>
             @endif
         </div>
     </div>
diff --git a/resources/views/livewire/project/database/backup-edit.blade.php b/resources/views/livewire/project/database/backup-edit.blade.php
index bb5dcfc4d..b818e8f75 100644
--- a/resources/views/livewire/project/database/backup-edit.blade.php
+++ b/resources/views/livewire/project/database/backup-edit.blade.php
@@ -5,7 +5,7 @@
             Save
         </x-forms.button>
         @if (str($status)->startsWith('running'))
-            <livewire:project.database.backup-now :backup="$backup" />
+            <x-forms.button wire:click='backupNow'>Backup Now</x-forms.button>
         @endif
         @if ($backup->database_id !== 0)
             <x-modal-confirmation title="Confirm Backup Schedule Deletion?" buttonTitle="Delete Backups and Schedule"
diff --git a/resources/views/livewire/project/database/clickhouse/general.blade.php b/resources/views/livewire/project/database/clickhouse/general.blade.php
index ceaaac508..0cc8bbc35 100644
--- a/resources/views/livewire/project/database/clickhouse/general.blade.php
+++ b/resources/views/livewire/project/database/clickhouse/general.blade.php
@@ -17,8 +17,12 @@
             <div class="flex gap-2">
                 <x-forms.input label="Initial Username" id="clickhouseAdminUser" placeholder="If empty: clickhouse"
                     readonly helper="You can only change this in the database." canGate="update" :canResource="$database" />
-                <x-forms.input label="Initial Password" id="clickhouseAdminPassword" type="password" required readonly
-                    helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Initial Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Initial Password" id="clickhouseAdminPassword" type="password" required readonly
+                        helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                @endif
             </div>
         @else
             <div class=" dark:text-warning">Please verify these values. You can only modify them before the initial
@@ -26,8 +30,12 @@
             </div>
             <div class="flex gap-2">
                 <x-forms.input label="Username" id="clickhouseAdminUser" required canGate="update" :canResource="$database" />
-                <x-forms.input label="Password" id="clickhouseAdminPassword" type="password" required canGate="update"
-                    :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Password" id="clickhouseAdminPassword" type="password" required canGate="update"
+                        :canResource="$database" />
+                @endif
             </div>
         @endif
         <x-forms.input
@@ -41,17 +49,25 @@
                     helper="A comma separated list of ports you would like to map to the host system.<br><span class='inline-block font-bold dark:text-warning'>Example</span>3000:5432,3002:5433"
                     canGate="update" :canResource="$database" />
             </div>
-            <x-forms.input label="Clickhouse URL (internal)"
-                helper="If you change the user/password/port, this could be different. This is with the default values."
-                type="password" readonly wire:model="dbUrl" canGate="update" :canResource="$database" />
-            @if ($dbUrlPublic)
-                <x-forms.input label="Clickhouse URL (public)"
-                    helper="If you change the user/password/port, this could be different. This is with the default values."
-                    type="password" readonly wire:model="dbUrlPublic" canGate="update" :canResource="$database" />
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="Clickhouse URL (internal)" disabled value="Hidden (only admins can view)" />
             @else
-                <x-forms.input label="Clickhouse URL (public)"
+                <x-forms.input label="Clickhouse URL (internal)"
                     helper="If you change the user/password/port, this could be different. This is with the default values."
-                    readonly value="Starting the database will generate this." canGate="update" :canResource="$database" />
+                    type="password" readonly wire:model="dbUrl" canGate="update" :canResource="$database" />
+            @endif
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="Clickhouse URL (public)" disabled value="Hidden (only admins can view)" />
+            @else
+                @if ($dbUrlPublic)
+                    <x-forms.input label="Clickhouse URL (public)"
+                        helper="If you change the user/password/port, this could be different. This is with the default values."
+                        type="password" readonly wire:model="dbUrlPublic" canGate="update" :canResource="$database" />
+                @else
+                    <x-forms.input label="Clickhouse URL (public)"
+                        helper="If you change the user/password/port, this could be different. This is with the default values."
+                        readonly value="Starting the database will generate this." canGate="update" :canResource="$database" />
+                @endif
             @endif
         </div>
         <div>
diff --git a/resources/views/livewire/project/database/dragonfly/general.blade.php b/resources/views/livewire/project/database/dragonfly/general.blade.php
index e81d51c07..ddde81efc 100644
--- a/resources/views/livewire/project/database/dragonfly/general.blade.php
+++ b/resources/views/livewire/project/database/dragonfly/general.blade.php
@@ -18,16 +18,24 @@
 
         @if ($database->started_at)
             <div class="flex gap-2">
-                <x-forms.input label="Initial Password" id="dragonflyPassword" type="password" required readonly
-                    helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Initial Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Initial Password" id="dragonflyPassword" type="password" required readonly
+                        helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                @endif
             </div>
         @else
             <div class=" dark:text-warning">Please verify these values. You can only modify them before the initial
                 start. After that, you need to modify it in the database.
             </div>
             <div class="flex gap-2">
-                <x-forms.input label="Password" id="dragonflyPassword" type="password" required canGate="update"
-                    :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Password" id="dragonflyPassword" type="password" required canGate="update"
+                        :canResource="$database" />
+                @endif
             </div>
         @endif
         <div class="flex flex-col gap-2">
@@ -37,18 +45,26 @@
                     helper="A comma separated list of ports you would like to map to the host system.<br><span class='inline-block font-bold dark:text-warning'>Example</span>3000:5432,3002:5433"
                     canGate="update" :canResource="$database" />
             </div>
-            <x-forms.input label="Dragonfly URL (internal)"
-                helper="If you change the user/password/port, this could be different. This is with the default values."
-                type="password" readonly wire:model="dbUrl" canGate="update" :canResource="$database" />
-
-            @if ($dbUrlPublic)
-                <x-forms.input label="Dragonfly URL (public)"
-                    helper="If you change the user/password/port, this could be different. This is with the default values."
-                    type="password" readonly wire:model="dbUrlPublic" canGate="update" :canResource="$database" />
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="Dragonfly URL (internal)" disabled value="Hidden (only admins can view)" />
             @else
-                <x-forms.input label="Dragonfly URL (public)"
+                <x-forms.input label="Dragonfly URL (internal)"
                     helper="If you change the user/password/port, this could be different. This is with the default values."
-                    readonly value="Starting the database will generate this." canGate="update" :canResource="$database" />
+                    type="password" readonly wire:model="dbUrl" canGate="update" :canResource="$database" />
+            @endif
+
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="Dragonfly URL (public)" disabled value="Hidden (only admins can view)" />
+            @else
+                @if ($dbUrlPublic)
+                    <x-forms.input label="Dragonfly URL (public)"
+                        helper="If you change the user/password/port, this could be different. This is with the default values."
+                        type="password" readonly wire:model="dbUrlPublic" canGate="update" :canResource="$database" />
+                @else
+                    <x-forms.input label="Dragonfly URL (public)"
+                        helper="If you change the user/password/port, this could be different. This is with the default values."
+                        readonly value="Starting the database will generate this." canGate="update" :canResource="$database" />
+                @endif
             @endif
         </div>
         <div class="flex flex-col gap-2">
diff --git a/resources/views/livewire/project/database/heading.blade.php b/resources/views/livewire/project/database/heading.blade.php
index 4087769cc..890323102 100644
--- a/resources/views/livewire/project/database/heading.blade.php
+++ b/resources/views/livewire/project/database/heading.blade.php
@@ -38,72 +38,70 @@
             @endif
         </nav>
         @if ($database->destination->server->isFunctional())
-            <div class="flex flex-wrap gap-2 items-center">
-                @if (!str($database->status)->startsWith('exited'))
-                    <x-modal-confirmation title="Confirm Database Restart?" buttonTitle="Restart" submitAction="restart"
-                        :actions="[
-                            'This database will be unavailable during the restart.',
-                            'If the database is currently in use data could be lost.',
-                        ]" :confirmWithText="false" :confirmWithPassword="false" step2ButtonText="Restart Database"
-                        :dispatchEvent="true" dispatchEventType="restartEvent">
-                        <x-slot:button-title>
-                            <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
-                                xmlns="http://www.w3.org/2000/svg">
-                                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                                    stroke-width="2">
-                                    <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
-                                    <path d="M20 4v5h-5" />
-                                </g>
-                            </svg>
-                            Restart
-                        </x-slot:button-title>
-                    </x-modal-confirmation>
-                    <x-modal-confirmation title="Confirm Database Stopping?" buttonTitle="Stop" submitAction="stop"
-                        :checkboxes="$checkboxes" :actions="[
-                            'This database will be stopped.',
-                            'If the database is currently in use data could be lost.',
-                            'All non-persistent data of this database (containers, networks, unused images) will be deleted (don\'t worry, no data is lost and you can start the database again).',
-                        ]" :confirmWithText="false" :confirmWithPassword="false"
-                        step1ButtonText="Continue" step2ButtonText="Confirm">
-                        <x-slot:button-title>
-                            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
-                                stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
+                <div class="flex flex-wrap gap-2 items-center">
+                    @if (!str($database->status)->startsWith('exited'))
+                        <x-modal-confirmation :disabled="!auth()->user()->can('manage', $database)" :authDisabled="!auth()->user()->can('manage', $database)" title="Confirm Database Restart?" buttonTitle="Restart" submitAction="restart"
+                            :actions="[
+                                'This database will be unavailable during the restart.',
+                                'If the database is currently in use data could be lost.',
+                            ]" :confirmWithText="false" :confirmWithPassword="false" step2ButtonText="Restart Database"
+                            :dispatchEvent="true" dispatchEventType="restartEvent">
+                            <x-slot:button-title>
+                                <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
+                                    xmlns="http://www.w3.org/2000/svg">
+                                    <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                                        stroke-width="2">
+                                        <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                                        <path d="M20 4v5h-5" />
+                                    </g>
+                                </svg>
+                                Restart
+                            </x-slot:button-title>
+                        </x-modal-confirmation>
+                        <x-modal-confirmation :disabled="!auth()->user()->can('manage', $database)" :authDisabled="!auth()->user()->can('manage', $database)" title="Confirm Database Stopping?" buttonTitle="Stop" submitAction="stop"
+                            :checkboxes="$checkboxes" :actions="[
+                                'This database will be stopped.',
+                                'If the database is currently in use data could be lost.',
+                                'All non-persistent data of this database (containers, networks, unused images) will be deleted (don\'t worry, no data is lost and you can start the database again).',
+                            ]" :confirmWithText="false" :confirmWithPassword="false"
+                            step1ButtonText="Continue" step2ButtonText="Confirm">
+                            <x-slot:button-title>
+                                <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
+                                    stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
+                                    stroke-linejoin="round">
+                                    <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                                    <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                                    </path>
+                                    <path
+                                        d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                                    </path>
+                                </svg>
+                                Stop
+                            </x-slot:button-title>
+                        </x-modal-confirmation>
+                    @else
+                        <x-forms.button canGate="manage" :canResource="$database" @click="$wire.dispatch('startEvent')" class="gap-2">
+                            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
+                                stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
                                 stroke-linejoin="round">
-                                <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-                                <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                                </path>
-                                <path
-                                    d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                                </path>
+                                <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                                <path d="M7 4v16l13 -8z" />
                             </svg>
-                            Stop
-                        </x-slot:button-title>
-                    </x-modal-confirmation>
-                @else
-                    <button @click="$wire.dispatch('startEvent')" class="gap-2 button">
-                        <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
-                            stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
-                            stroke-linejoin="round">
-                            <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                            <path d="M7 4v16l13 -8z" />
-                        </svg>
-                        Start
-                    </button>
-                @endif
-                @script
-                    <script>
-                        $wire.$on('startEvent', () => {
-                            window.dispatchEvent(new CustomEvent('startdatabase'));
-                            $wire.$call('start');
-                        });
-                        $wire.$on('restartEvent', () => {
-                            $wire.$dispatch('info', 'Restarting database.');
-                            window.dispatchEvent(new CustomEvent('startdatabase'));
-                            $wire.$call('restart');
-                        });
-                    </script>
-                @endscript
-            </div>
+                            Start
+                        </x-forms.button>
+                    @endif
+                    @script
+                        <script>
+                            $wire.$on('startEvent', () => {
+                                $wire.$call('start');
+                            });
+                            $wire.$on('restartEvent', () => {
+                                $wire.$dispatch('info', 'Restarting database.');
+                                $wire.$call('restart');
+                            });
+                        </script>
+                    @endscript
+                </div>
         @else
             <div class="text-error">Underlying server is not functional.</div>
         @endif
diff --git a/resources/views/livewire/project/database/keydb/general.blade.php b/resources/views/livewire/project/database/keydb/general.blade.php
index 522b96c0a..fe8fe85e3 100644
--- a/resources/views/livewire/project/database/keydb/general.blade.php
+++ b/resources/views/livewire/project/database/keydb/general.blade.php
@@ -15,16 +15,24 @@
 
         @if ($database->started_at)
             <div class="flex gap-2">
-                <x-forms.input label="Initial Password" id="keydbPassword" type="password" required readonly
-                    helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Initial Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Initial Password" id="keydbPassword" type="password" required readonly
+                        helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                @endif
             </div>
         @else
             <div class=" dark:text-warning">Please verify these values. You can only modify them before the initial
                 start. After that, you need to modify it in the database.
             </div>
             <div class="flex gap-2">
-                <x-forms.input label="Password" id="keydbPassword" type="password" required canGate="update"
-                    :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Password" id="keydbPassword" type="password" required canGate="update"
+                        :canResource="$database" />
+                @endif
             </div>
         @endif
         <x-forms.input
@@ -38,17 +46,25 @@
                     helper="A comma separated list of ports you would like to map to the host system.<br><span class='inline-block font-bold dark:text-warning'>Example</span>3000:5432,3002:5433"
                     canGate="update" :canResource="$database" />
             </div>
-            <x-forms.input label="KeyDB URL (internal)"
-                helper="If you change the user/password/port, this could be different. This is with the default values."
-                type="password" readonly wire:model="dbUrl" canGate="update" :canResource="$database" />
-            @if ($dbUrlPublic)
-                <x-forms.input label="KeyDB URL (public)"
-                    helper="If you change the user/password/port, this could be different. This is with the default values."
-                    type="password" readonly wire:model="dbUrlPublic" canGate="update" :canResource="$database" />
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="KeyDB URL (internal)" disabled value="Hidden (only admins can view)" />
             @else
-                <x-forms.input label="KeyDB URL (public)"
+                <x-forms.input label="KeyDB URL (internal)"
                     helper="If you change the user/password/port, this could be different. This is with the default values."
-                    readonly value="Starting the database will generate this." canGate="update" :canResource="$database" />
+                    type="password" readonly wire:model="dbUrl" canGate="update" :canResource="$database" />
+            @endif
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="KeyDB URL (public)" disabled value="Hidden (only admins can view)" />
+            @else
+                @if ($dbUrlPublic)
+                    <x-forms.input label="KeyDB URL (public)"
+                        helper="If you change the user/password/port, this could be different. This is with the default values."
+                        type="password" readonly wire:model="dbUrlPublic" canGate="update" :canResource="$database" />
+                @else
+                    <x-forms.input label="KeyDB URL (public)"
+                        helper="If you change the user/password/port, this could be different. This is with the default values."
+                        readonly value="Starting the database will generate this." canGate="update" :canResource="$database" />
+                @endif
             @endif
         </div>
         <div class="flex flex-col gap-2">
diff --git a/resources/views/livewire/project/database/mariadb/general.blade.php b/resources/views/livewire/project/database/mariadb/general.blade.php
index eb7930d80..040846703 100644
--- a/resources/views/livewire/project/database/mariadb/general.blade.php
+++ b/resources/views/livewire/project/database/mariadb/general.blade.php
@@ -17,15 +17,23 @@
         </div>
         @if ($database->started_at)
             <div class="flex xl:flex-row flex-col gap-2">
-                <x-forms.input label="Root Password" id="mariadbRootPassword" type="password" required
-                    helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work."
-                    canGate="update" :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Root Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Root Password" id="mariadbRootPassword" type="password" required
+                        helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work."
+                        canGate="update" :canResource="$database" />
+                @endif
                 <x-forms.input label="Normal User" id="mariadbUser" required
                     helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work."
                     canGate="update" :canResource="$database" />
-                <x-forms.input label="Normal User Password" id="mariadbPassword" type="password" required
-                    helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work."
-                    canGate="update" :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Normal User Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Normal User Password" id="mariadbPassword" type="password" required
+                        helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work."
+                        canGate="update" :canResource="$database" />
+                @endif
             </div>
             <div class="flex flex-col gap-2">
                 <x-forms.input label="Initial Database" id="mariadbDatabase"
@@ -34,12 +42,20 @@
             </div>
         @else
             <div class="flex xl:flex-row flex-col gap-2 pb-2">
-                <x-forms.input label="Root Password" id="mariadbRootPassword" type="password"
-                    helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Root Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Root Password" id="mariadbRootPassword" type="password"
+                        helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                @endif
                 <x-forms.input label="Normal User" id="mariadbUser" required
                     helper="You can only change this in the database." canGate="update" :canResource="$database" />
-                <x-forms.input label="Normal User Password" id="mariadbPassword" type="password" required
-                    helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Normal User Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Normal User Password" id="mariadbPassword" type="password" required
+                        helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                @endif
             </div>
             <div class="flex flex-col gap-2">
                 <x-forms.input label="Initial Database" id="mariadbDatabase"
@@ -61,13 +77,21 @@
                     helper="A comma separated list of ports you would like to map to the host system.<br><span class='inline-block font-bold dark:text-warning'>Example</span>3000:5432,3002:5433"
                     canGate="update" :canResource="$database" />
             </div>
-            <x-forms.input label="MariaDB URL (internal)"
-                helper="If you change the user/password/port, this could be different. This is with the default values."
-                type="password" readonly wire:model="db_url" canGate="update" :canResource="$database" />
-            @if ($db_url_public)
-                <x-forms.input label="MariaDB URL (public)"
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="MariaDB URL (internal)" disabled value="Hidden (only admins can view)" />
+            @else
+                <x-forms.input label="MariaDB URL (internal)"
                     helper="If you change the user/password/port, this could be different. This is with the default values."
-                    type="password" readonly wire:model="db_url_public" canGate="update" :canResource="$database" />
+                    type="password" readonly wire:model="db_url" canGate="update" :canResource="$database" />
+            @endif
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="MariaDB URL (public)" disabled value="Hidden (only admins can view)" />
+            @else
+                @if ($db_url_public)
+                    <x-forms.input label="MariaDB URL (public)"
+                        helper="If you change the user/password/port, this could be different. This is with the default values."
+                        type="password" readonly wire:model="db_url_public" canGate="update" :canResource="$database" />
+                @endif
             @endif
         </div>
 
diff --git a/resources/views/livewire/project/database/mongodb/general.blade.php b/resources/views/livewire/project/database/mongodb/general.blade.php
index fa34b9795..07c6f6437 100644
--- a/resources/views/livewire/project/database/mongodb/general.blade.php
+++ b/resources/views/livewire/project/database/mongodb/general.blade.php
@@ -21,10 +21,14 @@
                     placeholder="If empty: postgres"
                     helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work."
                     canGate="update" :canResource="$database" />
-                <x-forms.input label="Initial Password" id="mongoInitdbRootPassword" type="password"
-                    required
-                    helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work."
-                    canGate="update" :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Initial Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Initial Password" id="mongoInitdbRootPassword" type="password"
+                        required
+                        helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work."
+                        canGate="update" :canResource="$database" />
+                @endif
                 <x-forms.input label="Initial Database" id="mongoInitdbDatabase"
                     placeholder="If empty, it will be the same as Username." readonly
                     helper="You can only change this in the database." canGate="update" :canResource="$database" />
@@ -33,8 +37,12 @@
             <div class="flex xl:flex-row flex-col gap-2 pb-2">
                 <x-forms.input required label="Username" id="mongoInitdbRootUsername"
                     placeholder="If empty: postgres" canGate="update" :canResource="$database" />
-                <x-forms.input label="Password" id="mongoInitdbRootPassword" type="password" required
-                    canGate="update" :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Password" id="mongoInitdbRootPassword" type="password" required
+                        canGate="update" :canResource="$database" />
+                @endif
                 <x-forms.input required label="Database" id="mongoInitdbDatabase"
                     placeholder="If empty, it will be the same as Username." canGate="update" :canResource="$database" />
             </div>
@@ -50,13 +58,21 @@
                     helper="A comma separated list of ports you would like to map to the host system.<br><span class='inline-block font-bold dark:text-warning'>Example</span>3000:5432,3002:5433"
                     canGate="update" :canResource="$database" />
             </div>
-            <x-forms.input label="Mongo URL (internal)"
-                helper="If you change the user/password/port, this could be different. This is with the default values."
-                type="password" readonly wire:model="db_url" canGate="update" :canResource="$database" />
-            @if ($db_url_public)
-                <x-forms.input label="Mongo URL (public)"
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="Mongo URL (internal)" disabled value="Hidden (only admins can view)" />
+            @else
+                <x-forms.input label="Mongo URL (internal)"
                     helper="If you change the user/password/port, this could be different. This is with the default values."
-                    type="password" readonly wire:model="db_url_public" canGate="update" :canResource="$database" />
+                    type="password" readonly wire:model="db_url" canGate="update" :canResource="$database" />
+            @endif
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="Mongo URL (public)" disabled value="Hidden (only admins can view)" />
+            @else
+                @if ($db_url_public)
+                    <x-forms.input label="Mongo URL (public)"
+                        helper="If you change the user/password/port, this could be different. This is with the default values."
+                        type="password" readonly wire:model="db_url_public" canGate="update" :canResource="$database" />
+                @endif
             @endif
         </div>
 
diff --git a/resources/views/livewire/project/database/mysql/general.blade.php b/resources/views/livewire/project/database/mysql/general.blade.php
index b1a75c455..d3169c9b6 100644
--- a/resources/views/livewire/project/database/mysql/general.blade.php
+++ b/resources/views/livewire/project/database/mysql/general.blade.php
@@ -17,12 +17,20 @@
         </div>
         @if ($database->started_at)
             <div class="flex xl:flex-row flex-col gap-2">
-                <x-forms.input label="Root Password" id="mysqlRootPassword" type="password" required
-                    helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." canGate="update" :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Root Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Root Password" id="mysqlRootPassword" type="password" required
+                        helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." canGate="update" :canResource="$database" />
+                @endif
                 <x-forms.input label="Normal User" id="mysqlUser" required
                     helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." canGate="update" :canResource="$database" />
-                <x-forms.input label="Normal User Password" id="mysqlPassword" type="password" required
-                    helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." canGate="update" :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Normal User Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Normal User Password" id="mysqlPassword" type="password" required
+                        helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." canGate="update" :canResource="$database" />
+                @endif
             </div>
             <div class="flex flex-col gap-2">
                 <x-forms.input label="Initial Database" id="mysqlDatabase"
@@ -31,12 +39,20 @@
             </div>
         @else
             <div class="flex xl:flex-row flex-col gap-4 pb-2">
-                <x-forms.input label="Root Password" id="mysqlRootPassword" type="password"
-                    helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Root Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Root Password" id="mysqlRootPassword" type="password"
+                        helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                @endif
                 <x-forms.input label="Normal User" id="mysqlUser" required
                     helper="You can only change this in the database." canGate="update" :canResource="$database" />
-                <x-forms.input label="Normal User Password" id="mysqlPassword" type="password" required
-                    helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Normal User Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Normal User Password" id="mysqlPassword" type="password" required
+                        helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                @endif
             </div>
             <div class="flex flex-col gap-2">
                 <x-forms.input label="Initial Database" id="mysqlDatabase"
@@ -56,13 +72,21 @@
                 <x-forms.input placeholder="3000:5432" id="portsMappings" label="Ports Mappings"
                     helper="A comma separated list of ports you would like to map to the host system.<br><span class='inline-block font-bold dark:text-warning'>Example</span>3000:5432,3002:5433" canGate="update" :canResource="$database" />
             </div>
-            <x-forms.input label="MySQL URL (internal)"
-                helper="If you change the user/password/port, this could be different. This is with the default values."
-                type="password" readonly wire:model="db_url" />
-            @if ($db_url_public)
-                <x-forms.input label="MySQL URL (public)"
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="MySQL URL (internal)" disabled value="Hidden (only admins can view)" />
+            @else
+                <x-forms.input label="MySQL URL (internal)"
                     helper="If you change the user/password/port, this could be different. This is with the default values."
-                    type="password" readonly wire:model="db_url_public" />
+                    type="password" readonly wire:model="db_url" />
+            @endif
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="MySQL URL (public)" disabled value="Hidden (only admins can view)" />
+            @else
+                @if ($db_url_public)
+                    <x-forms.input label="MySQL URL (public)"
+                        helper="If you change the user/password/port, this could be different. This is with the default values."
+                        type="password" readonly wire:model="db_url_public" />
+                @endif
             @endif
         </div>
 
diff --git a/resources/views/livewire/project/database/postgresql/general.blade.php b/resources/views/livewire/project/database/postgresql/general.blade.php
index 74b1a03a8..2282d090f 100644
--- a/resources/views/livewire/project/database/postgresql/general.blade.php
+++ b/resources/views/livewire/project/database/postgresql/general.blade.php
@@ -34,9 +34,13 @@
                 <x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres" canGate="update"
                     :canResource="$database"
                     helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." />
-                <x-forms.input label="Password" id="postgresPassword" type="password" required canGate="update"
-                    :canResource="$database"
-                    helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Password" id="postgresPassword" type="password" required canGate="update"
+                        :canResource="$database"
+                        helper="If you change this in the database, please sync it here, otherwise automations (like backups) won't work." />
+                @endif
                 <x-forms.input label="Initial Database" id="postgresDb"
                     placeholder="If empty, it will be the same as Username." readonly
                     helper="You can only change this in the database." />
@@ -45,8 +49,12 @@
             <div class="flex xl:flex-row flex-col gap-2 pb-2">
                 <x-forms.input label="Username" id="postgresUser" placeholder="If empty: postgres" canGate="update"
                     :canResource="$database" />
-                <x-forms.input label="Password" id="postgresPassword" type="password" required canGate="update"
-                    :canResource="$database" />
+                @if ($isPasswordHiddenForMember)
+                    <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input label="Password" id="postgresPassword" type="password" required canGate="update"
+                        :canResource="$database" />
+                @endif
                 <x-forms.input label="Initial Database" id="postgresDb"
                     placeholder="If empty, it will be the same as Username." canGate="update" :canResource="$database" />
             </div>
@@ -69,13 +77,21 @@
                     canGate="update" :canResource="$database" />
             </div>
 
-            <x-forms.input label="Postgres URL (internal)"
-                helper="If you change the user/password/port, this could be different. This is with the default values."
-                type="password" readonly wire:model="db_url" />
-            @if ($db_url_public)
-                <x-forms.input label="Postgres URL (public)"
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="Postgres URL (internal)" disabled value="Hidden (only admins can view)" />
+            @else
+                <x-forms.input label="Postgres URL (internal)"
                     helper="If you change the user/password/port, this could be different. This is with the default values."
-                    type="password" readonly wire:model="db_url_public" />
+                    type="password" readonly wire:model="db_url" />
+            @endif
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="Postgres URL (public)" disabled value="Hidden (only admins can view)" />
+            @else
+                @if ($db_url_public)
+                    <x-forms.input label="Postgres URL (public)"
+                        helper="If you change the user/password/port, this could be different. This is with the default values."
+                        type="password" readonly wire:model="db_url_public" />
+                @endif
             @endif
         </div>
         <div class="flex flex-col gap-2">
diff --git a/resources/views/livewire/project/database/redis/general.blade.php b/resources/views/livewire/project/database/redis/general.blade.php
index 11ffddd81..8c5456ad2 100644
--- a/resources/views/livewire/project/database/redis/general.blade.php
+++ b/resources/views/livewire/project/database/redis/general.blade.php
@@ -23,8 +23,12 @@
                         <x-forms.input label="Username" id="redisUsername"
                             helper="You can only change this in the database." canGate="update" :canResource="$database" />
                     @endif
-                    <x-forms.input label="Password" id="redisPassword" type="password"
-                        helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                    @if ($isPasswordHiddenForMember)
+                        <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />
+                    @else
+                        <x-forms.input label="Password" id="redisPassword" type="password"
+                            helper="You can only change this in the database." canGate="update" :canResource="$database" />
+                    @endif
                 </div>
             @else
                 <div class="pt-2 dark:text-warning">You can only change the username and password in the database after
@@ -39,13 +43,17 @@
                     Note: If the environment variable REDIS_USERNAME is set as a shared variable (environment, project, or team-based), this input field will become read-only."
                             :disabled="$this->isSharedVariable('REDIS_USERNAME')" canGate="update" :canResource="$database" />
                     @endif
-                    <x-forms.input label="Password" id="redisPassword" type="password" required
-                        helper="You can change the Redis Password in the input field below or by editing the value of the REDIS_PASSWORD environment variable.
+                    @if ($isPasswordHiddenForMember)
+                        <x-forms.input label="Password" disabled value="Hidden (only admins can view)" />
+                    @else
+                        <x-forms.input label="Password" id="redisPassword" type="password" required
+                            helper="You can change the Redis Password in the input field below or by editing the value of the REDIS_PASSWORD environment variable.
                 <br><br>
                 If you change the Redis Password in the database, please sync it here, otherwise automations (like backups) won't work.
                 <br><br>
                 Note: If the environment variable REDIS_PASSWORD is set as a shared variable (environment, project, or team-based), this input field will become read-only."
-                        :disabled="$this->isSharedVariable('REDIS_PASSWORD')" canGate="update" :canResource="$database" />
+                            :disabled="$this->isSharedVariable('REDIS_PASSWORD')" canGate="update" :canResource="$database" />
+                    @endif
                 </div>
             @endif
         </div>
@@ -60,13 +68,21 @@
                     helper="A comma separated list of ports you would like to map to the host system.<br><span class='inline-block font-bold dark:text-warning'>Example</span>3000:5432,3002:5433"
                     canGate="update" :canResource="$database" />
             </div>
-            <x-forms.input label="Redis URL (internal)"
-                helper="If you change the user/password/port, this could be different. This is with the default values."
-                type="password" readonly wire:model="dbUrl" canGate="update" :canResource="$database" />
-            @if ($dbUrlPublic)
-                <x-forms.input label="Redis URL (public)"
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="Redis URL (internal)" disabled value="Hidden (only admins can view)" />
+            @else
+                <x-forms.input label="Redis URL (internal)"
                     helper="If you change the user/password/port, this could be different. This is with the default values."
-                    type="password" readonly wire:model="dbUrlPublic" canGate="update" :canResource="$database" />
+                    type="password" readonly wire:model="dbUrl" canGate="update" :canResource="$database" />
+            @endif
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="Redis URL (public)" disabled value="Hidden (only admins can view)" />
+            @else
+                @if ($dbUrlPublic)
+                    <x-forms.input label="Redis URL (public)"
+                        helper="If you change the user/password/port, this could be different. This is with the default values."
+                        type="password" readonly wire:model="dbUrlPublic" canGate="update" :canResource="$database" />
+                @endif
             @endif
         </div>
         <div class="flex flex-col gap-2">
diff --git a/resources/views/livewire/project/service/file-storage.blade.php b/resources/views/livewire/project/service/file-storage.blade.php
index 1dd58fe17..472398db8 100644
--- a/resources/views/livewire/project/service/file-storage.blade.php
+++ b/resources/views/livewire/project/service/file-storage.blade.php
@@ -87,7 +87,7 @@
             @else
                 {{-- Read-only view --}}
                 @if (!$fileStorage->is_directory)
-                    @can('view', $resource)
+                    @can('update', $resource)
                         <div class="flex gap-2">
                             <x-forms.button type="button" wire:click="loadStorageOnServer">Load from
                                 server</x-forms.button>
diff --git a/resources/views/livewire/project/service/heading.blade.php b/resources/views/livewire/project/service/heading.blade.php
index c33ebc279..db21f3317 100644
--- a/resources/views/livewire/project/service/heading.blade.php
+++ b/resources/views/livewire/project/service/heading.blade.php
@@ -30,7 +30,7 @@
             <div class="flex flex-wrap order-first gap-2 items-center sm:order-last">
                 <x-services.advanced :service="$service" />
                 @if (str($service->status)->contains('running'))
-                    <x-forms.button title="Restart" @click="$wire.dispatch('restartEvent')">
+                    <x-forms.button canGate="deploy" :canResource="$service" title="Restart" @click="$wire.dispatch('restartEvent')">
                         <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                             <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
                                 stroke-width="2">
@@ -40,7 +40,7 @@
                         </svg>
                         Restart
                     </x-forms.button>
-                    <x-modal-confirmation title="Confirm Service Stopping?" buttonTitle="Stop" :dispatchEvent="true"
+                    <x-modal-confirmation :disabled="!auth()->user()->can('stop', $service)" :authDisabled="!auth()->user()->can('stop', $service)" title="Confirm Service Stopping?" buttonTitle="Stop" :dispatchEvent="true"
                         submitAction="stop" dispatchEventType="stopEvent" :checkboxes="$checkboxes" :actions="[__('service.stop'), __('resource.non_persistent')]"
                         :confirmWithText="false" :confirmWithPassword="false" step1ButtonText="Continue" step2ButtonText="Confirm">
                         <x-slot:button-title>
@@ -58,7 +58,7 @@
                         </x-slot:button-title>
                     </x-modal-confirmation>
                 @elseif (str($service->status)->contains('degraded'))
-                    <x-forms.button title="Restart" @click="$wire.dispatch('restartEvent')">
+                    <x-forms.button canGate="deploy" :canResource="$service" title="Restart" @click="$wire.dispatch('restartEvent')">
                         <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                             <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
                                 stroke-width="2">
@@ -68,7 +68,7 @@
                         </svg>
                         Restart
                     </x-forms.button>
-                    <x-modal-confirmation title="Confirm Service Stopping?" buttonTitle="Stop" :dispatchEvent="true"
+                    <x-modal-confirmation :disabled="!auth()->user()->can('stop', $service)" :authDisabled="!auth()->user()->can('stop', $service)" title="Confirm Service Stopping?" buttonTitle="Stop" :dispatchEvent="true"
                         submitAction="stop" dispatchEventType="stopEvent" :checkboxes="$checkboxes" :actions="[__('service.stop'), __('resource.non_persistent')]"
                         :confirmWithText="false" :confirmWithPassword="false" step1ButtonText="Continue" step2ButtonText="Confirm">
                         <x-slot:button-title>
@@ -86,7 +86,7 @@
                         </x-slot:button-title>
                     </x-modal-confirmation>
                 @elseif (str($service->status)->contains('exited'))
-                    <button @click="$wire.dispatch('startEvent')" class="gap-2 button">
+                    <x-forms.button canGate="deploy" :canResource="$service" @click="$wire.dispatch('startEvent')" class="gap-2">
                         <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
                             stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
                             stroke-linejoin="round">
@@ -94,9 +94,9 @@
                             <path d="M7 4v16l13 -8z" />
                         </svg>
                         Deploy
-                    </button>
+                    </x-forms.button>
                 @else
-                    <x-modal-confirmation title="Confirm Service Stopping?" buttonTitle="Stop" :dispatchEvent="true"
+                    <x-modal-confirmation :disabled="!auth()->user()->can('stop', $service)" :authDisabled="!auth()->user()->can('stop', $service)" title="Confirm Service Stopping?" buttonTitle="Stop" :dispatchEvent="true"
                         submitAction="stop" dispatchEventType="stopEvent" :checkboxes="$checkboxes" :actions="[__('service.stop'), __('resource.non_persistent')]"
                         :confirmWithText="false" :confirmWithPassword="false" step1ButtonText="Continue" step2ButtonText="Confirm">
                         <x-slot:button-title>
@@ -113,7 +113,7 @@
                             Stop
                         </x-slot:button-title>
                     </x-modal-confirmation>
-                    <button @click="$wire.dispatch('startEvent')" class="gap-2 button">
+                    <x-forms.button canGate="deploy" :canResource="$service" @click="$wire.dispatch('startEvent')" class="gap-2">
                         <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
                             stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
                             stroke-linejoin="round">
@@ -121,7 +121,7 @@
                             <path d="M7 4v16l13 -8z" />
                         </svg>
                         Deploy
-                    </button>
+                    </x-forms.button>
                 @endif
             </div>
         @else
@@ -149,11 +149,9 @@
                     );
                     return;
                 }
-                window.dispatchEvent(new CustomEvent('startservice'));
                 $wire.$call('start');
             });
             $wire.$on('forceDeployEvent', () => {
-                window.dispatchEvent(new CustomEvent('startservice'));
                 $wire.$call('forceDeploy');
             });
             $wire.$on('restartEvent', async () => {
@@ -166,12 +164,10 @@
                 }
                 $wire.$dispatch('info',
                     'Gracefully stopping service.<br/><br/>It could take a while depending on the service.');
-                window.dispatchEvent(new CustomEvent('startservice'));
                 $wire.$call('restart');
             });
             $wire.$on('pullAndRestartEvent', () => {
                 $wire.$dispatch('info', 'Pulling new images and restarting service.');
-                window.dispatchEvent(new CustomEvent('startservice'));
                 $wire.$call('pullAndRestartEvent');
             });
             $wire.on('imagePulled', () => {
diff --git a/resources/views/livewire/project/service/stack-form.blade.php b/resources/views/livewire/project/service/stack-form.blade.php
index 8972345bc..2cdf57266 100644
--- a/resources/views/livewire/project/service/stack-form.blade.php
+++ b/resources/views/livewire/project/service/stack-form.blade.php
@@ -39,10 +39,14 @@
                         <x-helper helper="Variable name: {{ $serviceName }}" />
                     @endif
                 </div>
-                <x-forms.input canGate="update" :canResource="$service"
-                    type="{{ data_get($field, 'isPassword') ? 'password' : 'text' }}"
-                    required="{{ str(data_get($field, 'rules'))?->contains('required') }}"
-                    id="fields.{{ $serviceName }}.value"></x-forms.input>
+                @if ($isPasswordHiddenForMember && data_get($field, 'isPassword'))
+                    <x-forms.input disabled value="Hidden (only admins can view)" />
+                @else
+                    <x-forms.input canGate="update" :canResource="$service"
+                        type="{{ data_get($field, 'isPassword') ? 'password' : 'text' }}"
+                        required="{{ str(data_get($field, 'rules'))?->contains('required') }}"
+                        id="fields.{{ $serviceName }}.value"></x-forms.input>
+                @endif
             @endforeach
         </div>
     @endif
diff --git a/resources/views/livewire/project/shared/environment-variable/show.blade.php b/resources/views/livewire/project/shared/environment-variable/show.blade.php
index 86faeeeb4..9ca92602c 100644
--- a/resources/views/livewire/project/shared/environment-variable/show.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/show.blade.php
@@ -158,24 +158,45 @@
                                 <x-forms.textarea :required="$is_redis_credential" type="password" id="value" />
                             @else
                                 <x-forms.input :disabled="$is_redis_credential" :required="$is_redis_credential" id="key" />
-                                <x-forms.input :required="$is_redis_credential" type="password" id="value" />
+                                <x-forms.env-var-input
+                                    :required="$is_redis_credential"
+                                    type="password"
+                                    id="value"
+                                    :availableVars="$this->availableSharedVariables"
+                                    :projectUuid="data_get($parameters, 'project_uuid')"
+                                    :environmentUuid="data_get($parameters, 'environment_uuid')" />
                             @endif
                             @if ($is_shared)
                                 <x-forms.input :disabled="$is_redis_credential" :required="$is_redis_credential" disabled
                                     type="password" id="real_value" />
                             @endif
                         </div>
-                        <x-forms.input instantSave id="comment" label="Comment"
-                            helper="Add a note to document what this environment variable is used for." maxlength="256" />
+                        @if (!$isMagicVariable)
+                            <x-forms.input instantSave id="comment" label="Comment"
+                                helper="Add a note to document what this environment variable is used for." maxlength="256" />
+                        @endif
                     </div>
                 @endif
             @else
                 <div class="flex flex-col w-full gap-2">
                     <div class="flex flex-col w-full gap-2 lg:flex-row">
                         <x-forms.input disabled id="key" />
-                        <x-forms.input disabled type="password" id="value" />
-                        @if ($is_shared)
-                            <x-forms.input disabled type="password" id="real_value" />
+                        @if ($isValueHidden)
+                            <div class="w-full">
+                                <input disabled type="text" value="Hidden (only admins can view)"
+                                    class="input italic !text-neutral-500 dark:!text-neutral-500" />
+                            </div>
+                        @else
+                            <x-forms.env-var-input
+                                disabled
+                                type="password"
+                                id="value"
+                                :availableVars="$this->availableSharedVariables"
+                                :projectUuid="data_get($parameters, 'project_uuid')"
+                                :environmentUuid="data_get($parameters, 'environment_uuid')" />
+                            @if ($is_shared)
+                                <x-forms.input disabled type="password" id="real_value" />
+                            @endif
                         @endif
                     </div>
                     @if (!$isMagicVariable)
diff --git a/resources/views/livewire/project/shared/health-checks.blade.php b/resources/views/livewire/project/shared/health-checks.blade.php
index 8662b0b50..01f42dace 100644
--- a/resources/views/livewire/project/shared/health-checks.blade.php
+++ b/resources/views/livewire/project/shared/health-checks.blade.php
@@ -3,12 +3,12 @@
         <h2>Healthchecks</h2>
         <x-forms.button canGate="update" :canResource="$resource" type="submit">Save</x-forms.button>
         @if (!$healthCheckEnabled)
-            <x-modal-confirmation title="Confirm Healthcheck Enable?" buttonTitle="Enable Healthcheck"
-                submitAction="toggleHealthcheck" :actions="['Enable healthcheck for this resource.']"
-                warningMessage="If the health check fails, your application will become inaccessible. Please review the <a href='https://coolify.io/docs/knowledge-base/health-checks' target='_blank' class='underline text-white'>Health Checks</a> guide before proceeding!"
-                step2ButtonText="Enable Healthcheck" :confirmWithText="false" :confirmWithPassword="false"
-                isHighlightedButton>
-            </x-modal-confirmation>
+                <x-modal-confirmation :disabled="!auth()->user()->can('update', $resource)" :authDisabled="!auth()->user()->can('update', $resource)" title="Confirm Healthcheck Enable?" buttonTitle="Enable Healthcheck"
+                    submitAction="toggleHealthcheck" :actions="['Enable healthcheck for this resource.']"
+                    warningMessage="If the health check fails, your application will become inaccessible. Please review the <a href='https://coolify.io/docs/knowledge-base/health-checks' target='_blank' class='underline text-white'>Health Checks</a> guide before proceeding!"
+                    step2ButtonText="Enable Healthcheck" :confirmWithText="false" :confirmWithPassword="false"
+                    isHighlightedButton>
+                </x-modal-confirmation>
         @else
             <x-forms.button canGate="update" :canResource="$resource" wire:click="toggleHealthcheck">Disable Healthcheck</x-forms.button>
         @endif
diff --git a/resources/views/livewire/project/shared/scheduled-task/show.blade.php b/resources/views/livewire/project/shared/scheduled-task/show.blade.php
index f312c0bf3..6777e96a0 100644
--- a/resources/views/livewire/project/shared/scheduled-task/show.blade.php
+++ b/resources/views/livewire/project/shared/scheduled-task/show.blade.php
@@ -13,36 +13,43 @@
         <div class="flex flex-col gap-2 pb-2">
             <div class="flex gap-2 items-end">
                 <h2>Scheduled Task</h2>
-                <x-forms.button type="submit">
+                <x-forms.button canGate="update" :canResource="$resource" type="submit">
                     Save
                 </x-forms.button>
                 @if ($resource->isRunning())
-                    <x-forms.button type="button" wire:click="executeNow">
-                        Execute Now
-                    </x-forms.button>
+                    @can('update', $resource)
+                        <x-forms.button type="button" wire:click="executeNow">
+                            Execute Now
+                        </x-forms.button>
+                    @endcan
                 @endif
-                <x-modal-confirmation title="Confirm Scheduled Task Deletion?" isErrorButton buttonTitle="Delete"
-                    submitAction="delete({{ $task->id }})" :actions="['The selected scheduled task will be permanently deleted.']" confirmationText="{{ $task->name }}"
-                    confirmationLabel="Please confirm the execution of the actions by entering the Scheduled Task Name below"
-                    shortConfirmationLabel="Scheduled Task Name" :confirmWithPassword="false"
-                    step2ButtonText="Permanently Delete" />
-
+                @can('update', $resource)
+                    <x-modal-confirmation title="Confirm Scheduled Task Deletion?" isErrorButton buttonTitle="Delete"
+                        submitAction="delete({{ $task->id }})" :actions="['The selected scheduled task will be permanently deleted.']" confirmationText="{{ $task->name }}"
+                        confirmationLabel="Please confirm the execution of the actions by entering the Scheduled Task Name below"
+                        shortConfirmationLabel="Scheduled Task Name" :confirmWithPassword="false"
+                        step2ButtonText="Permanently Delete" />
+                @endcan
             </div>
             <div class="w-48">
-                <x-forms.checkbox instantSave id="isEnabled" label="Enabled" />
+                @can('update', $resource)
+                    <x-forms.checkbox instantSave id="isEnabled" label="Enabled" />
+                @else
+                    <x-forms.checkbox disabled id="isEnabled" label="Enabled" />
+                @endcan
             </div>
             <div class="flex gap-2 w-full">
-                <x-forms.input placeholder="Name" id="name" label="Name" required />
-                <x-forms.input placeholder="php artisan schedule:run" id="command" label="Command" required />
-                <x-forms.input placeholder="0 0 * * * or daily" id="frequency" label="Frequency" required />
-                <x-forms.input type="number" placeholder="300" id="timeout"
+                <x-forms.input :disabled="!auth()->user()->can('update', $resource)" placeholder="Name" id="name" label="Name" required />
+                <x-forms.input :disabled="!auth()->user()->can('update', $resource)" placeholder="php artisan schedule:run" id="command" label="Command" required />
+                <x-forms.input :disabled="!auth()->user()->can('update', $resource)" placeholder="0 0 * * * or daily" id="frequency" label="Frequency" required />
+                <x-forms.input :disabled="!auth()->user()->can('update', $resource)" type="number" placeholder="300" id="timeout"
                     helper="Maximum execution time in seconds (60-36000)." label="Timeout (seconds)" required />
                 @if ($type === 'application')
-                    <x-forms.input placeholder="php"
+                    <x-forms.input :disabled="!auth()->user()->can('update', $resource)" placeholder="php"
                         helper="You can leave this empty if your resource only has one container." id="container"
                         label="Container name" />
                 @elseif ($type === 'service')
-                    <x-forms.input placeholder="php"
+                    <x-forms.input :disabled="!auth()->user()->can('update', $resource)" placeholder="php"
                         helper="You can leave this empty if your resource only has one service in your stack. Otherwise use the stack name, without the random generated ID. So if you have a mysql service in your stack, use mysql."
                         id="container" label="Service name" />
                 @endif
diff --git a/resources/views/livewire/security/api-tokens.blade.php b/resources/views/livewire/security/api-tokens.blade.php
index 23f0e263e..bf04aad2a 100644
--- a/resources/views/livewire/security/api-tokens.blade.php
+++ b/resources/views/livewire/security/api-tokens.blade.php
@@ -18,21 +18,23 @@
                 <x-forms.input required id="description" label="Description" />
                 <x-forms.button type="submit">Create</x-forms.button>
             </div>
-            <div class="flex">
-                Permissions
-                <x-helper class="px-1" helper="These permissions will be granted to the token." /><span
-                    class="pr-1">:</span>
-                <div class="flex gap-1 font-bold dark:text-white">
-                    @if ($permissions)
+            <div class="flex items-center gap-2">
+                <span>Permissions</span>
+                <x-helper helper="These permissions will be granted to the token." />
+                @if ($permissions)
+                    <div class="flex gap-1.5 flex-wrap">
                         @foreach ($permissions as $permission)
-                            <div>{{ $permission }}</div>
+                            <span
+                                class="px-2 py-0.5 text-xs rounded-sm font-medium {{ $permission === 'root' ? 'bg-red-500/20 text-red-400' : ($permission === 'write' || $permission === 'write:sensitive' ? 'bg-amber-500/20 text-amber-400' : ($permission === 'deploy' ? 'bg-blue-500/20 text-blue-400' : 'bg-neutral-500/20 text-neutral-300')) }}">
+                                {{ $permission }}
+                            </span>
                         @endforeach
-                    @endif
-                </div>
+                    </div>
+                @endif
             </div>
 
             <h4>Token Permissions</h4>
-            <div class="w-64">
+            <div class="w-96">
                 @if ($canUseRootPermissions)
                     <x-forms.checkbox label="root" wire:model.live="permissions" domValue="root"
                         helper="Root access, be careful!" :checked="in_array('root', $permissions)"></x-forms.checkbox>
@@ -50,13 +52,23 @@
                             helper="Write access requires admin or owner role" :checked="false"></x-forms.checkbox>
                     @endif
 
-                    <x-forms.checkbox label="deploy" wire:model.live="permissions" domValue="deploy"
-                        helper="Can trigger deploy webhooks." :checked="in_array('deploy', $permissions)"></x-forms.checkbox>
+                    @if ($canUseDeployPermissions)
+                        <x-forms.checkbox label="deploy" wire:model.live="permissions" domValue="deploy"
+                            helper="Can trigger deploy webhooks." :checked="in_array('deploy', $permissions)"></x-forms.checkbox>
+                    @else
+                        <x-forms.checkbox label="deploy (admin/owner only)" disabled domValue="deploy"
+                            helper="Deploy access requires admin or owner role" :checked="false"></x-forms.checkbox>
+                    @endif
                     <x-forms.checkbox label="read" domValue="read" wire:model.live="permissions" domValue="read"
                         :checked="in_array('read', $permissions)"></x-forms.checkbox>
-                    <x-forms.checkbox label="read:sensitive" wire:model.live="permissions" domValue="read:sensitive"
-                        helper="Responses will include secrets, logs, passwords, and compose file contents."
-                        :checked="in_array('read:sensitive', $permissions)"></x-forms.checkbox>
+                    @if ($canUseSensitivePermissions)
+                        <x-forms.checkbox label="read:sensitive" wire:model.live="permissions" domValue="read:sensitive"
+                            helper="Responses will include secrets, logs, passwords, and compose file contents."
+                            :checked="in_array('read:sensitive', $permissions)"></x-forms.checkbox>
+                    @else
+                        <x-forms.checkbox label="read:sensitive (admin/owner only)" disabled domValue="read:sensitive"
+                            helper="Read:sensitive access requires admin or owner role" :checked="false"></x-forms.checkbox>
+                    @endif
                 @endif
             </div>
             @if (in_array('root', $permissions))
@@ -65,44 +77,74 @@
         </form>
     @endcan
     @if (session()->has('token'))
-        <div class="py-4 font-bold dark:text-warning">Please copy this token now. For your security, it won't be shown
-            again.
+        <div class="p-4 my-4 border rounded dark:border-coolgray-200 dark:bg-coolgray-100">
+            <div class="pb-2 font-bold dark:text-warning">Please copy this token now. For your security, it won't
+                be shown again.</div>
+            <div class="relative" x-data="{ copied: false, isSecure: window.isSecureContext }">
+                <input type="text" value="{{ session('token') }}" readonly
+                    class="input !text-white !bg-coolgray-200 font-mono" />
+                <button x-show="isSecure"
+                    @click.prevent="copied = true; navigator.clipboard.writeText({{ Js::from(session('token')) }}); setTimeout(() => copied = false, 1000)"
+                    class="absolute right-2 top-1/2 -translate-y-1/2 p-1.5 text-gray-400 hover:text-gray-300 transition-colors"
+                    title="Copy to clipboard">
+                    <svg x-show="!copied" class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                            d="M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z" />
+                    </svg>
+                    <svg x-show="copied" class="w-5 h-5 text-green-500" fill="none" stroke="currentColor"
+                        viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                            d="M5 13l4 4L19 7" />
+                    </svg>
+                </button>
+            </div>
         </div>
-        <div class="pb-4 font-bold dark:text-white"> {{ session('token') }}</div>
     @endif
-    <h3 class="py-4">Issued Tokens</h3>
-    <div class="grid gap-2 lg:grid-cols-1">
-        @forelse ($tokens as $token)
-            <div wire:key="token-{{ $token->id }}"
-                class="flex flex-col gap-1 p-2 border dark:border-coolgray-200 hover:no-underline">
-                <div>Description: {{ $token->name }}</div>
-                <div>Last used: {{ $token->last_used_at ? $token->last_used_at->diffForHumans() : 'Never' }}</div>
-                <div class="flex gap-1">
-                    @if ($token->abilities)
-                        Permissions:
-                        @foreach ($token->abilities as $ability)
-                            <div class="font-bold dark:text-white">{{ $ability }}</div>
-                        @endforeach
+    <div x-data="{ search: '' }">
+        <div class="flex items-center justify-between py-4">
+            <h3>Issued Tokens</h3>
+            @if ($tokens->count() > 1)
+                <input type="text" x-model="search" placeholder="Filter tokens..."
+                    class="input w-64" />
+            @endif
+        </div>
+        <div class="flex flex-col gap-2">
+            @forelse ($tokens as $token)
+                <div wire:key="token-{{ $token->id }}"
+                    x-show="!search || '{{ strtolower($token->name) }} {{ strtolower(implode(' ', $token->abilities ?? [])) }}'.includes(search.toLowerCase())"
+                    class="flex items-center justify-between p-3 border rounded dark:border-coolgray-200">
+                    <div>
+                        <div class="flex items-center gap-2">
+                            <span class="font-bold dark:text-white">{{ $token->name }}</span>
+                            @if ($token->abilities)
+                                @foreach ($token->abilities as $ability)
+                                    <span
+                                        class="px-2 py-0.5 text-xs rounded-sm font-medium {{ $ability === 'root' ? 'bg-red-500/20 text-red-400' : ($ability === 'write' || $ability === 'write:sensitive' ? 'bg-amber-500/20 text-amber-400' : ($ability === 'deploy' ? 'bg-blue-500/20 text-blue-400' : 'bg-neutral-500/20 text-neutral-300')) }}">
+                                        {{ $ability }}
+                                    </span>
+                                @endforeach
+                            @endif
+                        </div>
+                        <div class="text-xs text-neutral-400">
+                            Last used: {{ $token->last_used_at ? $token->last_used_at->diffForHumans() : 'Never' }}
+                        </div>
+                    </div>
+                    @if (auth()->id() === $token->tokenable_id)
+                        <x-modal-confirmation title="Confirm API Token Revocation?" isErrorButton
+                            buttonTitle="Revoke" submitAction="revoke({{ data_get($token, 'id') }})"
+                            :actions="[
+                                'This API Token will be revoked and permanently deleted.',
+                                'Any API call made with this token will fail.',
+                            ]" confirmationText="{{ $token->name }}"
+                            confirmationLabel="Please confirm the execution of the actions by entering the API Token Description below"
+                            shortConfirmationLabel="API Token Description" :confirmWithPassword="false"
+                            step2ButtonText="Revoke API Token" />
                     @endif
                 </div>
-
-                @if (auth()->id() === $token->tokenable_id)
-                    <x-modal-confirmation title="Confirm API Token Revocation?" isErrorButton buttonTitle="Revoke token"
-                        submitAction="revoke({{ data_get($token, 'id') }})" :actions="[
-                            'This API Token will be revoked and permanently deleted.',
-                            'Any API call made with this token will fail.',
-                        ]"
-                        confirmationText="{{ $token->name }}"
-                        confirmationLabel="Please confirm the execution of the actions by entering the API Token Description below"
-                        shortConfirmationLabel="API Token Description" :confirmWithPassword="false"
-                        step2ButtonText="Revoke API Token" />
-                @endif
-            </div>
-        @empty
-            <div>
-                <div>No API tokens found.</div>
-            </div>
-        @endforelse
+            @empty
+                <div class="text-neutral-400">No API tokens found.</div>
+            @endforelse
+        </div>
     </div>
     @endif
 </div>
diff --git a/resources/views/livewire/server/navbar.blade.php b/resources/views/livewire/server/navbar.blade.php
index 4be11f51a..413f0ee57 100644
--- a/resources/views/livewire/server/navbar.blade.php
+++ b/resources/views/livewire/server/navbar.blade.php
@@ -62,7 +62,7 @@
     <div class="subtitle">{{ data_get($server, 'name') }}</div>
     <div class="navbar-main">
         <nav
-            class="flex items-center gap-4 overflow-x-scroll sm:overflow-x-hidden scrollbar min-h-10 whitespace-nowrap pt-2">
+            class="flex items-center gap-6 overflow-x-scroll sm:overflow-x-hidden scrollbar min-h-10 whitespace-nowrap pt-2">
             <a class="{{ request()->routeIs('server.show') ? 'dark:text-white' : '' }}" href="{{ route('server.show', [
     'server_uuid' => data_get($server, 'uuid'),
 ]) }}" {{ wireNavigate() }}>
@@ -105,6 +105,7 @@
         <div class="order-first sm:order-last">
             <div>
                 @if ($server->proxySet())
+                    @can('manageProxy', $server)
                     @if ($proxyStatus === 'running')
                             <div class="flex gap-2">
                                 <div class="mt-1" wire:loading wire:target="loadProxyConfiguration">
@@ -169,6 +170,7 @@
                             Start Proxy
                         </button>
                     @endif
+                    @endcan
                 @endif
                 @script
                 <script>
diff --git a/resources/views/livewire/server/resources.blade.php b/resources/views/livewire/server/resources.blade.php
index 8610cd704..a13f88e83 100644
--- a/resources/views/livewire/server/resources.blade.php
+++ b/resources/views/livewire/server/resources.blade.php
@@ -134,22 +134,22 @@
                                                             {{ data_get($resource, 'State') }}
                                                         </td>
                                                         <td class="flex gap-2 px-5 py-4 text-sm whitespace-nowrap">
-                                                            @if (data_get($resource, 'State') === 'running')
-                                                                <x-forms.button
-                                                                    wire:click="restartUnmanaged('{{ data_get($resource, 'ID') }}')"
-                                                                    wire:key="{{ data_get($resource, 'ID') }}">Restart</x-forms.button>
-                                                                <x-forms.button isError
-                                                                    wire:click="stopUnmanaged('{{ data_get($resource, 'ID') }}')"
-                                                                    wire:key="{{ data_get($resource, 'ID') }}">Stop</x-forms.button>
-                                                            @elseif (data_get($resource, 'State') === 'exited')
-                                                                <x-forms.button
-                                                                    wire:click="startUnmanaged('{{ data_get($resource, 'ID') }}')"
-                                                                    wire:key="{{ data_get($resource, 'ID') }}">Start</x-forms.button>
-                                                            @elseif (data_get($resource, 'State') === 'restarting')
-                                                                <x-forms.button
-                                                                    wire:click="stopUnmanaged('{{ data_get($resource, 'ID') }}')"
-                                                                    wire:key="{{ data_get($resource, 'ID') }}">Stop</x-forms.button>
-                                                            @endif
+                                                                @if (data_get($resource, 'State') === 'running')
+                                                                    <x-forms.button canGate="update" :canResource="$server"
+                                                                        wire:click="restartUnmanaged('{{ data_get($resource, 'ID') }}')"
+                                                                        wire:key="{{ data_get($resource, 'ID') }}">Restart</x-forms.button>
+                                                                    <x-forms.button canGate="update" :canResource="$server" isError
+                                                                        wire:click="stopUnmanaged('{{ data_get($resource, 'ID') }}')"
+                                                                        wire:key="{{ data_get($resource, 'ID') }}">Stop</x-forms.button>
+                                                                @elseif (data_get($resource, 'State') === 'exited')
+                                                                    <x-forms.button canGate="update" :canResource="$server"
+                                                                        wire:click="startUnmanaged('{{ data_get($resource, 'ID') }}')"
+                                                                        wire:key="{{ data_get($resource, 'ID') }}">Start</x-forms.button>
+                                                                @elseif (data_get($resource, 'State') === 'restarting')
+                                                                    <x-forms.button canGate="update" :canResource="$server"
+                                                                        wire:click="stopUnmanaged('{{ data_get($resource, 'ID') }}')"
+                                                                        wire:key="{{ data_get($resource, 'ID') }}">Stop</x-forms.button>
+                                                                @endif
                                                         </td>
                                                     </tr>
                                                 @endforeach
diff --git a/resources/views/livewire/storage/form.blade.php b/resources/views/livewire/storage/form.blade.php
index 850d7735f..432193593 100644
--- a/resources/views/livewire/storage/form.blade.php
+++ b/resources/views/livewire/storage/form.blade.php
@@ -41,10 +41,15 @@
             <x-forms.input canGate="update" :canResource="$storage" required label="Region" id="region" />
         </div>
         <div class="flex gap-2">
-            <x-forms.input canGate="update" :canResource="$storage" required type="password" label="Access Key"
-                id="key" />
-            <x-forms.input canGate="update" :canResource="$storage" required type="password" label="Secret Key"
-                id="secret" />
+            @if ($isPasswordHiddenForMember)
+                <x-forms.input label="Access Key" disabled value="Hidden (only admins can view)" />
+                <x-forms.input label="Secret Key" disabled value="Hidden (only admins can view)" />
+            @else
+                <x-forms.input canGate="update" :canResource="$storage" required type="password" label="Access Key"
+                    id="key" />
+                <x-forms.input canGate="update" :canResource="$storage" required type="password" label="Secret Key"
+                    id="secret" />
+            @endif
         </div>
         @can('validateConnection', $storage)
             <x-forms.button class="mt-4" isHighlighted wire:click="testConnection">
diff --git a/tests/Feature/ApplicationHealthCheckApiTest.php b/tests/Feature/Api/ApplicationHealthCheckApiTest.php
similarity index 100%
rename from tests/Feature/ApplicationHealthCheckApiTest.php
rename to tests/Feature/Api/ApplicationHealthCheckApiTest.php
diff --git a/tests/Feature/CloudProviderTokenApiTest.php b/tests/Feature/Api/CloudProviderTokenApiTest.php
similarity index 100%
rename from tests/Feature/CloudProviderTokenApiTest.php
rename to tests/Feature/Api/CloudProviderTokenApiTest.php
diff --git a/tests/Feature/Api/DatabaseBackupCreationApiTest.php b/tests/Feature/Api/DatabaseBackupCreationApiTest.php
new file mode 100644
index 000000000..70933ccf3
--- /dev/null
+++ b/tests/Feature/Api/DatabaseBackupCreationApiTest.php
@@ -0,0 +1,167 @@
+<?php
+
+use App\Models\InstanceSettings;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\StandaloneDocker;
+use App\Models\StandalonePostgresql;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Str;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
+    $this->team = Team::factory()->create();
+    $this->user = User::factory()->create();
+    $this->team->members()->attach($this->user->id, ['role' => 'owner']);
+
+    session(['currentTeam' => $this->team]);
+
+    $this->token = $this->user->createToken('test-token', ['*']);
+    $this->bearerToken = $this->token->plainTextToken;
+
+    $this->server = Server::factory()->create(['team_id' => $this->team->id]);
+
+    StandaloneDocker::withoutEvents(function () {
+        $this->destination = StandaloneDocker::firstOrCreate(
+            ['server_id' => $this->server->id, 'network' => 'coolify'],
+            ['uuid' => (string) Str::uuid(), 'name' => 'test-docker']
+        );
+    });
+
+    $this->project = Project::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Project',
+        'team_id' => $this->team->id,
+    ]);
+
+    $this->environment = $this->project->environments()->first();
+
+    $this->database = StandalonePostgresql::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test DB',
+        'postgres_user' => 'postgres',
+        'postgres_password' => 'password',
+        'postgres_db' => 'testdb',
+        'image' => 'postgres:15',
+        'status' => 'running',
+        'environment_id' => $this->environment->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+    ]);
+});
+
+function backupHeaders(): array
+{
+    return [
+        'Authorization' => 'Bearer '.test()->bearerToken,
+        'Content-Type' => 'application/json',
+    ];
+}
+
+describe('POST /api/v1/databases/{uuid}/backups', function () {
+    test('creates backup configuration with valid frequency', function () {
+        $response = $this->withHeaders(backupHeaders())
+            ->postJson("/api/v1/databases/{$this->database->uuid}/backups", [
+                'frequency' => 'daily',
+            ]);
+
+        $response->assertStatus(201);
+        $response->assertJsonStructure(['uuid', 'message']);
+        $response->assertJson(['message' => 'Backup configuration created successfully.']);
+    });
+
+    test('creates backup with valid cron expression', function () {
+        $response = $this->withHeaders(backupHeaders())
+            ->postJson("/api/v1/databases/{$this->database->uuid}/backups", [
+                'frequency' => '0 2 * * *',
+            ]);
+
+        $response->assertStatus(201);
+        $response->assertJsonStructure(['uuid', 'message']);
+    });
+
+    test('accepts all predefined frequency values', function () {
+        $frequencies = ['every_minute', 'hourly', 'daily', 'weekly', 'monthly', 'yearly'];
+
+        foreach ($frequencies as $frequency) {
+            $response = $this->withHeaders(backupHeaders())
+                ->postJson("/api/v1/databases/{$this->database->uuid}/backups", [
+                    'frequency' => $frequency,
+                ]);
+
+            $response->assertStatus(201, "Expected 201 for frequency '{$frequency}', got {$response->status()}");
+        }
+    });
+
+    test('validates frequency is required', function () {
+        $response = $this->withHeaders(backupHeaders())
+            ->postJson("/api/v1/databases/{$this->database->uuid}/backups", [
+                'enabled' => true,
+            ]);
+
+        $response->assertStatus(422);
+        $response->assertJsonValidationErrors(['frequency']);
+    });
+
+    test('rejects invalid frequency format', function () {
+        $response = $this->withHeaders(backupHeaders())
+            ->postJson("/api/v1/databases/{$this->database->uuid}/backups", [
+                'frequency' => 'invalid-frequency',
+            ]);
+
+        $response->assertStatus(422);
+    });
+
+    test('validates s3_storage_uuid required when save_s3 is true', function () {
+        $response = $this->withHeaders(backupHeaders())
+            ->postJson("/api/v1/databases/{$this->database->uuid}/backups", [
+                'frequency' => 'daily',
+                'save_s3' => true,
+            ]);
+
+        $response->assertStatus(422);
+    });
+
+    test('validates retention fields are integers with minimum 0', function () {
+        $response = $this->withHeaders(backupHeaders())
+            ->postJson("/api/v1/databases/{$this->database->uuid}/backups", [
+                'frequency' => 'daily',
+                'database_backup_retention_amount_locally' => -1,
+            ]);
+
+        $response->assertStatus(422);
+    });
+
+    test('rejects extra fields not in allowed list', function () {
+        $response = $this->withHeaders(backupHeaders())
+            ->postJson("/api/v1/databases/{$this->database->uuid}/backups", [
+                'frequency' => 'daily',
+                'invalid_field' => 'invalid_value',
+            ]);
+
+        $response->assertStatus(422);
+    });
+
+    test('rejects request without authentication', function () {
+        $response = $this->postJson("/api/v1/databases/{$this->database->uuid}/backups", [
+            'frequency' => 'daily',
+        ]);
+
+        $response->assertStatus(401);
+    });
+
+    test('returns 404 for non-existent database uuid', function () {
+        $response = $this->withHeaders(backupHeaders())
+            ->postJson('/api/v1/databases/non-existent-uuid/backups', [
+                'frequency' => 'daily',
+            ]);
+
+        $response->assertStatus(404);
+        $response->assertJson(['message' => 'Database not found.']);
+    });
+});
diff --git a/tests/Feature/DeploymentCancellationApiTest.php b/tests/Feature/Api/DeploymentCancellationApiTest.php
similarity index 73%
rename from tests/Feature/DeploymentCancellationApiTest.php
rename to tests/Feature/Api/DeploymentCancellationApiTest.php
index eee689e13..046af059a 100644
--- a/tests/Feature/DeploymentCancellationApiTest.php
+++ b/tests/Feature/Api/DeploymentCancellationApiTest.php
@@ -2,6 +2,7 @@
 
 use App\Enums\ApplicationDeploymentStatus;
 use App\Models\ApplicationDeploymentQueue;
+use App\Models\InstanceSettings;
 use App\Models\Server;
 use App\Models\Team;
 use App\Models\User;
@@ -10,13 +11,17 @@ use Illuminate\Foundation\Testing\RefreshDatabase;
 uses(RefreshDatabase::class);
 
 beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
     // Create a team with owner
     $this->team = Team::factory()->create();
     $this->user = User::factory()->create();
     $this->team->members()->attach($this->user->id, ['role' => 'owner']);
 
+    session(['currentTeam' => $this->team]);
+
     // Create an API token for the user
-    $this->token = $this->user->createToken('test-token', ['*'], $this->team->id);
+    $this->token = $this->user->createToken('test-token', ['*']);
     $this->bearerToken = $this->token->plainTextToken;
 
     // Create a server for the team
@@ -76,7 +81,7 @@ describe('POST /api/v1/deployments/{uuid}/cancel', function () {
         ])->postJson("/api/v1/deployments/{$deployment->deployment_uuid}/cancel");
 
         $response->assertStatus(400);
-        $response->assertJsonFragment(['Deployment cannot be cancelled']);
+        expect($response->json('message'))->toContain('Deployment cannot be cancelled');
     });
 
     test('returns 400 when deployment is already failed', function () {
@@ -93,7 +98,7 @@ describe('POST /api/v1/deployments/{uuid}/cancel', function () {
         ])->postJson("/api/v1/deployments/{$deployment->deployment_uuid}/cancel");
 
         $response->assertStatus(400);
-        $response->assertJsonFragment(['Deployment cannot be cancelled']);
+        expect($response->json('message'))->toContain('Deployment cannot be cancelled');
     });
 
     test('returns 400 when deployment is already cancelled', function () {
@@ -110,10 +115,10 @@ describe('POST /api/v1/deployments/{uuid}/cancel', function () {
         ])->postJson("/api/v1/deployments/{$deployment->deployment_uuid}/cancel");
 
         $response->assertStatus(400);
-        $response->assertJsonFragment(['Deployment cannot be cancelled']);
+        expect($response->json('message'))->toContain('Deployment cannot be cancelled');
     });
 
-    test('successfully cancels queued deployment', function () {
+    test('cancels queued deployment and updates status in database', function () {
         $deployment = ApplicationDeploymentQueue::create([
             'deployment_uuid' => 'queued-deployment-uuid',
             'application_id' => 1,
@@ -121,20 +126,17 @@ describe('POST /api/v1/deployments/{uuid}/cancel', function () {
             'status' => ApplicationDeploymentStatus::QUEUED->value,
         ]);
 
-        $response = $this->withHeaders([
+        $this->withHeaders([
             'Authorization' => 'Bearer '.$this->bearerToken,
             'Content-Type' => 'application/json',
         ])->postJson("/api/v1/deployments/{$deployment->deployment_uuid}/cancel");
 
-        // Expect success (200) or 500 if server connection fails (which is expected in test environment)
-        expect($response->status())->toBeIn([200, 500]);
-
-        // Verify deployment status was updated to cancelled
+        // The controller updates status before SSH calls, so DB state is always correct
         $deployment->refresh();
         expect($deployment->status)->toBe(ApplicationDeploymentStatus::CANCELLED_BY_USER->value);
     });
 
-    test('successfully cancels in-progress deployment', function () {
+    test('cancels in-progress deployment and updates status in database', function () {
         $deployment = ApplicationDeploymentQueue::create([
             'deployment_uuid' => 'in-progress-deployment-uuid',
             'application_id' => 1,
@@ -142,42 +144,13 @@ describe('POST /api/v1/deployments/{uuid}/cancel', function () {
             'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
         ]);
 
-        $response = $this->withHeaders([
+        $this->withHeaders([
             'Authorization' => 'Bearer '.$this->bearerToken,
             'Content-Type' => 'application/json',
         ])->postJson("/api/v1/deployments/{$deployment->deployment_uuid}/cancel");
 
-        // Expect success (200) or 500 if server connection fails (which is expected in test environment)
-        expect($response->status())->toBeIn([200, 500]);
-
-        // Verify deployment status was updated to cancelled
+        // The controller updates status before SSH calls, so DB state is always correct
         $deployment->refresh();
         expect($deployment->status)->toBe(ApplicationDeploymentStatus::CANCELLED_BY_USER->value);
     });
-
-    test('returns correct response structure on success', function () {
-        $deployment = ApplicationDeploymentQueue::create([
-            'deployment_uuid' => 'success-deployment-uuid',
-            'application_id' => 1,
-            'server_id' => $this->server->id,
-            'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
-        ]);
-
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer '.$this->bearerToken,
-            'Content-Type' => 'application/json',
-        ])->postJson("/api/v1/deployments/{$deployment->deployment_uuid}/cancel");
-
-        if ($response->status() === 200) {
-            $response->assertJsonStructure([
-                'message',
-                'deployment_uuid',
-                'status',
-            ]);
-            $response->assertJson([
-                'deployment_uuid' => $deployment->deployment_uuid,
-                'status' => ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
-            ]);
-        }
-    });
 });
diff --git a/tests/Feature/DomainsByServerApiTest.php b/tests/Feature/Api/DomainsByServerApiTest.php
similarity index 93%
rename from tests/Feature/DomainsByServerApiTest.php
rename to tests/Feature/Api/DomainsByServerApiTest.php
index 1e799bec5..8c675c202 100644
--- a/tests/Feature/DomainsByServerApiTest.php
+++ b/tests/Feature/Api/DomainsByServerApiTest.php
@@ -25,7 +25,7 @@ beforeEach(function () {
     $this->environment = Environment::factory()->create(['project_id' => $this->project->id]);
 });
 
-function authHeaders(): array
+function domainApiAuthHeaders(): array
 {
     return [
         'Authorization' => 'Bearer '.test()->bearerToken,
@@ -40,7 +40,7 @@ test('returns domains for own team application via uuid query param', function (
         'destination_type' => $this->destination->getMorphClass(),
     ]);
 
-    $response = $this->withHeaders(authHeaders())
+    $response = $this->withHeaders(domainApiAuthHeaders())
         ->getJson("/api/v1/servers/{$this->server->uuid}/domains?uuid={$application->uuid}");
 
     $response->assertOk();
@@ -64,7 +64,7 @@ test('returns 404 when application uuid belongs to another team', function () {
         'destination_type' => $otherDestination->getMorphClass(),
     ]);
 
-    $response = $this->withHeaders(authHeaders())
+    $response = $this->withHeaders(domainApiAuthHeaders())
         ->getJson("/api/v1/servers/{$this->server->uuid}/domains?uuid={$otherApplication->uuid}");
 
     $response->assertNotFound();
@@ -72,7 +72,7 @@ test('returns 404 when application uuid belongs to another team', function () {
 });
 
 test('returns 404 for nonexistent application uuid', function () {
-    $response = $this->withHeaders(authHeaders())
+    $response = $this->withHeaders(domainApiAuthHeaders())
         ->getJson("/api/v1/servers/{$this->server->uuid}/domains?uuid=nonexistent-uuid");
 
     $response->assertNotFound();
diff --git a/tests/Feature/EnvironmentVariableUpdateApiTest.php b/tests/Feature/Api/EnvironmentVariableUpdateApiTest.php
similarity index 100%
rename from tests/Feature/EnvironmentVariableUpdateApiTest.php
rename to tests/Feature/Api/EnvironmentVariableUpdateApiTest.php
diff --git a/tests/Feature/GithubAppsListApiTest.php b/tests/Feature/Api/GithubAppsListApiTest.php
similarity index 100%
rename from tests/Feature/GithubAppsListApiTest.php
rename to tests/Feature/Api/GithubAppsListApiTest.php
diff --git a/tests/Feature/HetznerApiTest.php b/tests/Feature/Api/HetznerApiTest.php
similarity index 100%
rename from tests/Feature/HetznerApiTest.php
rename to tests/Feature/Api/HetznerApiTest.php
diff --git a/tests/Feature/ScheduledTaskApiTest.php b/tests/Feature/Api/ScheduledTaskApiTest.php
similarity index 100%
rename from tests/Feature/ScheduledTaskApiTest.php
rename to tests/Feature/Api/ScheduledTaskApiTest.php
diff --git a/tests/Feature/ApplicationBuildpackCleanupTest.php b/tests/Feature/Application/ApplicationBuildpackCleanupTest.php
similarity index 100%
rename from tests/Feature/ApplicationBuildpackCleanupTest.php
rename to tests/Feature/Application/ApplicationBuildpackCleanupTest.php
diff --git a/tests/Feature/BuildpackSwitchCleanupTest.php b/tests/Feature/Application/BuildpackSwitchCleanupTest.php
similarity index 100%
rename from tests/Feature/BuildpackSwitchCleanupTest.php
rename to tests/Feature/Application/BuildpackSwitchCleanupTest.php
diff --git a/tests/Feature/GithubSourceChangeTest.php b/tests/Feature/Application/GithubSourceChangeTest.php
similarity index 100%
rename from tests/Feature/GithubSourceChangeTest.php
rename to tests/Feature/Application/GithubSourceChangeTest.php
diff --git a/tests/Feature/GithubSourceCreateTest.php b/tests/Feature/Application/GithubSourceCreateTest.php
similarity index 100%
rename from tests/Feature/GithubSourceCreateTest.php
rename to tests/Feature/Application/GithubSourceCreateTest.php
diff --git a/tests/Feature/DeletesUserSessionsTest.php b/tests/Feature/Auth/DeletesUserSessionsTest.php
similarity index 100%
rename from tests/Feature/DeletesUserSessionsTest.php
rename to tests/Feature/Auth/DeletesUserSessionsTest.php
diff --git a/tests/Feature/Auth/LoginRateLimitIPTest.php b/tests/Feature/Auth/LoginRateLimitIPTest.php
new file mode 100644
index 000000000..e1b85ae5c
--- /dev/null
+++ b/tests/Feature/Auth/LoginRateLimitIPTest.php
@@ -0,0 +1,68 @@
+<?php
+
+use App\Models\InstanceSettings;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\RateLimiter;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+    RateLimiter::clear('login');
+
+    $this->user = User::factory()->create([
+        'email' => 'test@example.com',
+        'password' => bcrypt('password'),
+    ]);
+});
+
+test('login is rate limited after 5 failed attempts from same IP', function () {
+    $email = 'test@example.com';
+
+    // First 5 attempts should be accepted (302 redirect back with error, not 429)
+    for ($i = 1; $i <= 5; $i++) {
+        $response = $this->post('/login', [
+            'email' => $email,
+            'password' => 'wrong-password',
+        ]);
+
+        expect($response->status())->toBe(302, "Attempt {$i} should redirect (302), got {$response->status()}");
+    }
+
+    // 6th attempt from same IP should be throttled
+    $response = $this->post('/login', [
+        'email' => $email,
+        'password' => 'wrong-password',
+    ]);
+
+    expect($response->status())->toBe(429, 'Expected 429 Too Many Requests after exceeding rate limit');
+});
+
+test('rate limit is scoped per email and IP combination', function () {
+    // Exhaust rate limit for first email
+    for ($i = 1; $i <= 5; $i++) {
+        $this->post('/login', [
+            'email' => 'test@example.com',
+            'password' => 'wrong-password',
+        ]);
+    }
+
+    // Different email from same IP should still work (different composite key)
+    $response = $this->post('/login', [
+        'email' => 'other@example.com',
+        'password' => 'wrong-password',
+    ]);
+
+    expect($response->status())->toBe(302, 'Different email should not be rate limited');
+});
+
+test('successful login is still possible within rate limit', function () {
+    $response = $this->post('/login', [
+        'email' => 'test@example.com',
+        'password' => 'password',
+    ]);
+
+    $response->assertRedirect();
+    expect($response->status())->not->toBe(429);
+});
diff --git a/tests/Feature/TwoFactorChallengeAccessTest.php b/tests/Feature/Auth/TwoFactorChallengeAccessTest.php
similarity index 100%
rename from tests/Feature/TwoFactorChallengeAccessTest.php
rename to tests/Feature/Auth/TwoFactorChallengeAccessTest.php
diff --git a/tests/Feature/Authorization/ApiAuthorizationTest.php b/tests/Feature/Authorization/ApiAuthorizationTest.php
new file mode 100644
index 000000000..66a6900a3
--- /dev/null
+++ b/tests/Feature/Authorization/ApiAuthorizationTest.php
@@ -0,0 +1,218 @@
+<?php
+
+use App\Models\Application;
+use App\Models\InstanceSettings;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\StandaloneDocker;
+use App\Models\StandalonePostgresql;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0], ['is_api_enabled' => true]);
+
+    $this->team = Team::factory()->create();
+
+    $this->admin = User::factory()->create();
+    $this->admin->teams()->attach($this->team, ['role' => 'admin']);
+
+    $this->member = User::factory()->create();
+    $this->member->teams()->attach($this->team, ['role' => 'member']);
+
+    $keyId = DB::table('private_keys')->insertGetId([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Key',
+        'private_key' => 'test-key',
+        'team_id' => $this->team->id,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $this->server = Server::factory()->create([
+        'team_id' => $this->team->id,
+        'private_key_id' => $keyId,
+    ]);
+
+    StandaloneDocker::withoutEvents(function () {
+        $this->destination = StandaloneDocker::firstOrCreate(
+            ['server_id' => $this->server->id, 'network' => 'coolify'],
+            ['uuid' => (string) Str::uuid(), 'name' => 'test-docker']
+        );
+    });
+
+    $this->project = Project::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Project',
+        'team_id' => $this->team->id,
+    ]);
+
+    $this->environment = $this->project->environments()->first();
+
+    $this->application = Application::factory()->create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test App',
+        'environment_id' => $this->environment->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+        'status' => 'running',
+    ]);
+
+    $this->database = StandalonePostgresql::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test DB',
+        'postgres_user' => 'postgres',
+        'postgres_password' => 'password',
+        'postgres_db' => 'testdb',
+        'image' => 'postgres:15',
+        'status' => 'running',
+        'environment_id' => $this->environment->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+    ]);
+
+    // Create real tokens with team_id (createToken reads from session)
+    session(['currentTeam' => $this->team]);
+    $this->adminRootToken = $this->admin->createToken('admin-root', ['root']);
+    $this->adminReadToken = $this->admin->createToken('admin-read', ['read']);
+    $this->memberRootToken = $this->member->createToken('member-root', ['root']);
+});
+
+// --- Unauthenticated Access ---
+
+test('unauthenticated request to api returns 401', function () {
+    $this->getJson('/api/v1/projects')->assertStatus(401);
+});
+
+// --- Admin with root token ---
+
+test('admin with root token can list projects', function () {
+    $this->withToken($this->adminRootToken->plainTextToken)
+        ->getJson('/api/v1/projects')
+        ->assertSuccessful();
+});
+
+test('admin with root token can view project', function () {
+    $this->withToken($this->adminRootToken->plainTextToken)
+        ->getJson("/api/v1/projects/{$this->project->uuid}")
+        ->assertSuccessful();
+});
+
+test('admin with root token can view application', function () {
+    $this->withToken($this->adminRootToken->plainTextToken)
+        ->getJson("/api/v1/applications/{$this->application->uuid}")
+        ->assertSuccessful();
+});
+
+test('admin with root token can view server', function () {
+    $this->withToken($this->adminRootToken->plainTextToken)
+        ->getJson("/api/v1/servers/{$this->server->uuid}")
+        ->assertSuccessful();
+});
+
+test('admin with root token can view database', function () {
+    $this->withToken($this->adminRootToken->plainTextToken)
+        ->getJson("/api/v1/databases/{$this->database->uuid}")
+        ->assertSuccessful();
+});
+
+// --- Member with root token (policy should deny mutations) ---
+
+test('member with root token is blocked by middleware', function () {
+    $this->withToken($this->memberRootToken->plainTextToken)
+        ->getJson("/api/v1/projects/{$this->project->uuid}")
+        ->assertStatus(403);
+});
+
+test('member with root token cannot delete project', function () {
+    $this->withToken($this->memberRootToken->plainTextToken)
+        ->deleteJson("/api/v1/projects/{$this->project->uuid}")
+        ->assertStatus(403);
+});
+
+test('member with root token cannot update application', function () {
+    $this->withToken($this->memberRootToken->plainTextToken)
+        ->patchJson("/api/v1/applications/{$this->application->uuid}", [
+            'name' => 'New Name',
+        ])
+        ->assertStatus(403);
+});
+
+test('member with root token cannot delete application', function () {
+    $this->withToken($this->memberRootToken->plainTextToken)
+        ->deleteJson("/api/v1/applications/{$this->application->uuid}")
+        ->assertStatus(403);
+});
+
+test('member with root token cannot delete server', function () {
+    $this->withToken($this->memberRootToken->plainTextToken)
+        ->deleteJson("/api/v1/servers/{$this->server->uuid}")
+        ->assertStatus(403);
+});
+
+test('member with root token cannot update server', function () {
+    $this->withToken($this->memberRootToken->plainTextToken)
+        ->patchJson("/api/v1/servers/{$this->server->uuid}", [
+            'name' => 'New Server Name',
+        ])
+        ->assertStatus(403);
+});
+
+// --- Token ability checks ---
+
+test('read-only token cannot create project', function () {
+    $this->withToken($this->adminReadToken->plainTextToken)
+        ->postJson('/api/v1/projects', [
+            'name' => 'New Project',
+        ])
+        ->assertStatus(403);
+});
+
+test('read-only token cannot delete application', function () {
+    $this->withToken($this->adminReadToken->plainTextToken)
+        ->deleteJson("/api/v1/applications/{$this->application->uuid}")
+        ->assertStatus(403);
+});
+
+// --- Cross-team isolation ---
+
+test('user from different team cannot view project via api', function () {
+    $otherTeam = Team::factory()->create();
+    $otherUser = User::factory()->create();
+    $otherUser->teams()->attach($otherTeam, ['role' => 'admin']);
+    session(['currentTeam' => $otherTeam]);
+    $otherToken = $otherUser->createToken('other-root', ['root']);
+
+    $this->withToken($otherToken->plainTextToken)
+        ->getJson("/api/v1/projects/{$this->project->uuid}")
+        ->assertStatus(404);
+});
+
+test('user from different team cannot view application via api', function () {
+    $otherTeam = Team::factory()->create();
+    $otherUser = User::factory()->create();
+    $otherUser->teams()->attach($otherTeam, ['role' => 'admin']);
+    session(['currentTeam' => $otherTeam]);
+    $otherToken = $otherUser->createToken('other-root', ['root']);
+
+    $this->withToken($otherToken->plainTextToken)
+        ->getJson("/api/v1/applications/{$this->application->uuid}")
+        ->assertStatus(404);
+});
+
+test('user from different team cannot view server via api', function () {
+    $otherTeam = Team::factory()->create();
+    $otherUser = User::factory()->create();
+    $otherUser->teams()->attach($otherTeam, ['role' => 'admin']);
+    session(['currentTeam' => $otherTeam]);
+    $otherToken = $otherUser->createToken('other-root', ['root']);
+
+    $this->withToken($otherToken->plainTextToken)
+        ->getJson("/api/v1/servers/{$this->server->uuid}")
+        ->assertStatus(404);
+});
diff --git a/tests/Feature/ApiTokenPermissionTest.php b/tests/Feature/Authorization/ApiTokenPermissionTest.php
similarity index 95%
rename from tests/Feature/ApiTokenPermissionTest.php
rename to tests/Feature/Authorization/ApiTokenPermissionTest.php
index 44efb7e06..b10afb58e 100644
--- a/tests/Feature/ApiTokenPermissionTest.php
+++ b/tests/Feature/Authorization/ApiTokenPermissionTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Models\InstanceSettings;
 use App\Models\Team;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -7,6 +8,8 @@ use Illuminate\Foundation\Testing\RefreshDatabase;
 uses(RefreshDatabase::class);
 
 beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0], ['is_api_enabled' => true]);
+
     $this->team = Team::factory()->create();
     $this->user = User::factory()->create();
     $this->team->members()->attach($this->user->id, ['role' => 'owner']);
diff --git a/tests/Feature/Authorization/ApplicationConfigAuthorizationTest.php b/tests/Feature/Authorization/ApplicationConfigAuthorizationTest.php
new file mode 100644
index 000000000..2c3aa123f
--- /dev/null
+++ b/tests/Feature/Authorization/ApplicationConfigAuthorizationTest.php
@@ -0,0 +1,243 @@
+<?php
+
+use App\Livewire\Project\Application\Advanced as ApplicationAdvanced;
+use App\Livewire\Project\Application\Heading as ApplicationHeading;
+use App\Livewire\Project\Application\Rollback as ApplicationRollback;
+use App\Models\Application;
+use App\Models\InstanceSettings;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\StandaloneDocker;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
+    $this->team = Team::factory()->create();
+
+    $this->admin = User::factory()->create();
+    $this->admin->teams()->attach($this->team, ['role' => 'admin']);
+
+    $this->member = User::factory()->create();
+    $this->member->teams()->attach($this->team, ['role' => 'member']);
+
+    $keyId = DB::table('private_keys')->insertGetId([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Key',
+        'private_key' => 'test-key',
+        'team_id' => $this->team->id,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $this->server = Server::factory()->create([
+        'team_id' => $this->team->id,
+        'private_key_id' => $keyId,
+    ]);
+
+    $this->server->settings()->update([
+        'is_reachable' => true,
+        'is_usable' => true,
+    ]);
+
+    StandaloneDocker::withoutEvents(function () {
+        $this->destination = StandaloneDocker::firstOrCreate(
+            ['server_id' => $this->server->id, 'network' => 'coolify'],
+            ['uuid' => (string) Str::uuid(), 'name' => 'test-docker']
+        );
+    });
+
+    $this->project = Project::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Project',
+        'team_id' => $this->team->id,
+    ]);
+
+    $this->environment = $this->project->environments()->first();
+
+    $this->application = Application::factory()->create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test App',
+        'environment_id' => $this->environment->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+        'status' => 'running',
+    ]);
+});
+
+// --- Application Policy: view ---
+
+test('admin can view application', function () {
+    expect($this->admin->can('view', $this->application))->toBeTrue();
+});
+
+test('member can view application', function () {
+    expect($this->member->can('view', $this->application))->toBeTrue();
+});
+
+// --- Application Policy: update ---
+
+test('admin can update application', function () {
+    expect($this->admin->can('update', $this->application))->toBeTrue();
+});
+
+test('member cannot update application', function () {
+    expect($this->member->can('update', $this->application))->toBeFalse();
+});
+
+// --- Application Policy: deploy ---
+
+test('admin can deploy application', function () {
+    expect($this->admin->can('deploy', $this->application))->toBeTrue();
+});
+
+test('member cannot deploy application', function () {
+    expect($this->member->can('deploy', $this->application))->toBeFalse();
+});
+
+// --- Application Policy: delete ---
+
+test('admin can delete application', function () {
+    expect($this->admin->can('delete', $this->application))->toBeTrue();
+});
+
+test('member cannot delete application', function () {
+    expect($this->member->can('delete', $this->application))->toBeFalse();
+});
+
+// --- Application Policy: manageEnvironment ---
+
+test('admin can manage application environment', function () {
+    expect($this->admin->can('manageEnvironment', $this->application))->toBeTrue();
+});
+
+test('member cannot manage application environment', function () {
+    expect($this->member->can('manageEnvironment', $this->application))->toBeFalse();
+});
+
+// --- Application Heading Livewire actions ---
+
+test('member cannot call deploy on application heading', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationHeading::class, ['application' => $this->application])
+        ->call('deploy')
+        ->assertDispatched('error');
+});
+
+test('member cannot call restart on application heading', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationHeading::class, ['application' => $this->application])
+        ->call('restart')
+        ->assertDispatched('error');
+});
+
+test('member cannot call stop on application heading', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationHeading::class, ['application' => $this->application])
+        ->call('stop')
+        ->assertDispatched('error');
+});
+
+test('member cannot call force deploy on application heading', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationHeading::class, ['application' => $this->application])
+        ->call('force_deploy_without_cache')
+        ->assertDispatched('error');
+});
+
+// --- Application General policy (Livewire mount requires full app data) ---
+
+test('member cannot update application general settings', function () {
+    expect($this->member->can('update', $this->application))->toBeFalse();
+});
+
+// --- Application Advanced Livewire actions ---
+
+test('member cannot save application advanced settings', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationAdvanced::class, ['application' => $this->application])
+        ->call('instantSave')
+        ->assertDispatched('error');
+});
+
+test('member cannot submit application advanced settings', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationAdvanced::class, ['application' => $this->application])
+        ->call('submit')
+        ->assertDispatched('error');
+});
+
+// --- Application Rollback Livewire actions ---
+
+test('member cannot save rollback settings', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationRollback::class, ['application' => $this->application])
+        ->call('saveSettings')
+        ->assertDispatched('error');
+});
+
+test('member cannot rollback image', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationRollback::class, ['application' => $this->application])
+        ->call('rollbackImage', 'test-image:latest')
+        ->assertForbidden();
+});
+
+// --- Application Heading visibility ---
+
+test('member does not see terminal link for application', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationHeading::class, ['application' => $this->application])
+        ->assertDontSee('Terminal');
+});
+
+test('admin sees terminal link for application', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationHeading::class, ['application' => $this->application])
+        ->assertSee('Terminal');
+});
+
+// --- Cross-team isolation ---
+
+test('user from different team cannot view application', function () {
+    $otherTeam = Team::factory()->create();
+    $otherUser = User::factory()->create();
+    $otherUser->teams()->attach($otherTeam, ['role' => 'admin']);
+
+    expect($otherUser->can('view', $this->application))->toBeFalse();
+});
+
+test('user from different team cannot update application', function () {
+    $otherTeam = Team::factory()->create();
+    $otherUser = User::factory()->create();
+    $otherUser->teams()->attach($otherTeam, ['role' => 'admin']);
+
+    expect($otherUser->can('update', $this->application))->toBeFalse();
+});
diff --git a/tests/Feature/Authorization/CloudProviderAuthorizationTest.php b/tests/Feature/Authorization/CloudProviderAuthorizationTest.php
new file mode 100644
index 000000000..46185e9bb
--- /dev/null
+++ b/tests/Feature/Authorization/CloudProviderAuthorizationTest.php
@@ -0,0 +1,162 @@
+<?php
+
+use App\Models\CloudInitScript;
+use App\Models\CloudProviderToken;
+use App\Models\InstanceSettings;
+use App\Models\PersonalAccessToken;
+use App\Models\PrivateKey;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
+    $this->team = Team::factory()->create();
+
+    $this->admin = User::factory()->create();
+    $this->admin->teams()->attach($this->team, ['role' => 'admin']);
+
+    $this->member = User::factory()->create();
+    $this->member->teams()->attach($this->team, ['role' => 'member']);
+
+    DB::table('private_keys')->insert([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Team SSH Key',
+        'description' => 'Key for testing',
+        'private_key' => 'test-key-content',
+        'team_id' => $this->team->id,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $this->privateKey = PrivateKey::where('team_id', $this->team->id)->first();
+});
+
+// --- Private Key Policy ---
+
+test('admin can create private key', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('create', PrivateKey::class))->toBeTrue();
+});
+
+test('member cannot create private key', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('create', PrivateKey::class))->toBeFalse();
+});
+
+test('admin can view private key', function () {
+    expect($this->admin->can('view', $this->privateKey))->toBeTrue();
+});
+
+test('member can view own team private key', function () {
+    expect($this->member->can('view', $this->privateKey))->toBeTrue();
+});
+
+test('admin can update private key', function () {
+    expect($this->admin->can('update', $this->privateKey))->toBeTrue();
+});
+
+test('member cannot update private key', function () {
+    expect($this->member->can('update', $this->privateKey))->toBeFalse();
+});
+
+test('admin can delete private key', function () {
+    expect($this->admin->can('delete', $this->privateKey))->toBeTrue();
+});
+
+test('member cannot delete private key', function () {
+    expect($this->member->can('delete', $this->privateKey))->toBeFalse();
+});
+
+test('user from different team cannot view private key', function () {
+    $otherTeam = Team::factory()->create();
+    $otherUser = User::factory()->create();
+    $otherUser->teams()->attach($otherTeam, ['role' => 'admin']);
+
+    expect($otherUser->can('view', $this->privateKey))->toBeFalse();
+});
+
+// --- Cloud Provider Token Policy ---
+
+test('admin can create cloud provider token', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('create', CloudProviderToken::class))->toBeTrue();
+});
+
+test('member cannot create cloud provider token', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('create', CloudProviderToken::class))->toBeFalse();
+});
+
+test('admin can view any cloud provider tokens', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('viewAny', CloudProviderToken::class))->toBeTrue();
+});
+
+// --- Cloud Init Script Policy ---
+
+test('admin can create cloud init script', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('create', CloudInitScript::class))->toBeTrue();
+});
+
+test('member cannot create cloud init script', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('create', CloudInitScript::class))->toBeFalse();
+});
+
+test('admin can view any cloud init scripts', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('viewAny', CloudInitScript::class))->toBeTrue();
+});
+
+// --- Personal Access Token (API Token) Policy ---
+
+test('any user can create personal access token', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('create', PersonalAccessToken::class))->toBeTrue();
+});
+
+test('admin can use root permissions for api tokens', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('useRootPermissions', PersonalAccessToken::class))->toBeTrue();
+});
+
+test('member cannot use root permissions for api tokens', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('useRootPermissions', PersonalAccessToken::class))->toBeFalse();
+});
+
+test('member cannot use write permissions for api tokens', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('useWritePermissions', PersonalAccessToken::class))->toBeFalse();
+});
diff --git a/tests/Feature/Authorization/DashboardAuthorizationTest.php b/tests/Feature/Authorization/DashboardAuthorizationTest.php
new file mode 100644
index 000000000..26a39af0a
--- /dev/null
+++ b/tests/Feature/Authorization/DashboardAuthorizationTest.php
@@ -0,0 +1,97 @@
+<?php
+
+use App\Livewire\Dashboard;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+function setupDashboardUser(string $role): array
+{
+    $team = Team::factory()->create();
+
+    $user = User::factory()->create();
+    $user->teams()->attach($team, ['role' => $role]);
+
+    return [$user, $team];
+}
+
+function createProjectForTeam(Team $team): void
+{
+    Project::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Project',
+        'team_id' => $team->id,
+    ]);
+}
+
+function createServerWithKeyForTeam(Team $team): void
+{
+    $keyId = DB::table('private_keys')->insertGetId([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Key',
+        'private_key' => 'test-key',
+        'team_id' => $team->id,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    Server::factory()->create([
+        'team_id' => $team->id,
+        'private_key_id' => $keyId,
+    ]);
+}
+
+test('admin sees add project button on dashboard', function () {
+    [$user, $team] = setupDashboardUser('admin');
+
+    $this->actingAs($user);
+    session(['currentTeam' => $team]);
+
+    createProjectForTeam($team);
+
+    Livewire::test(Dashboard::class)
+        ->assertSee('New Project');
+});
+
+test('member does not see add project button on dashboard', function () {
+    [$user, $team] = setupDashboardUser('member');
+
+    $this->actingAs($user);
+    session(['currentTeam' => $team]);
+
+    createProjectForTeam($team);
+
+    Livewire::test(Dashboard::class)
+        ->assertDontSee('New Project');
+});
+
+test('admin sees add server button on dashboard', function () {
+    [$user, $team] = setupDashboardUser('admin');
+
+    $this->actingAs($user);
+    session(['currentTeam' => $team]);
+
+    createServerWithKeyForTeam($team);
+
+    Livewire::test(Dashboard::class)
+        ->assertSee('New Server');
+});
+
+test('member does not see add server button on dashboard', function () {
+    [$user, $team] = setupDashboardUser('member');
+
+    $this->actingAs($user);
+    session(['currentTeam' => $team]);
+
+    createServerWithKeyForTeam($team);
+
+    Livewire::test(Dashboard::class)
+        ->assertDontSee('New Server');
+});
diff --git a/tests/Feature/Authorization/DatabaseConfigAuthorizationTest.php b/tests/Feature/Authorization/DatabaseConfigAuthorizationTest.php
new file mode 100644
index 000000000..89c3d5e2f
--- /dev/null
+++ b/tests/Feature/Authorization/DatabaseConfigAuthorizationTest.php
@@ -0,0 +1,188 @@
+<?php
+
+use App\Models\InstanceSettings;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\StandaloneDocker;
+use App\Models\StandalonePostgresql;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
+    $this->team = Team::factory()->create();
+
+    $this->admin = User::factory()->create();
+    $this->admin->teams()->attach($this->team, ['role' => 'admin']);
+
+    $this->member = User::factory()->create();
+    $this->member->teams()->attach($this->team, ['role' => 'member']);
+
+    $keyId = DB::table('private_keys')->insertGetId([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Key',
+        'private_key' => 'test-key',
+        'team_id' => $this->team->id,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $this->server = Server::factory()->create([
+        'team_id' => $this->team->id,
+        'private_key_id' => $keyId,
+    ]);
+
+    StandaloneDocker::withoutEvents(function () {
+        $this->destination = StandaloneDocker::firstOrCreate(
+            ['server_id' => $this->server->id, 'network' => 'coolify'],
+            ['uuid' => (string) Str::uuid(), 'name' => 'test-docker']
+        );
+    });
+
+    $this->project = Project::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Project',
+        'team_id' => $this->team->id,
+    ]);
+
+    $this->environment = $this->project->environments()->first();
+
+    $this->database = StandalonePostgresql::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test DB',
+        'postgres_user' => 'postgres',
+        'postgres_password' => 'password',
+        'postgres_db' => 'testdb',
+        'image' => 'postgres:15',
+        'status' => 'running',
+        'environment_id' => $this->environment->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+    ]);
+
+    $this->databaseUrl = "/project/{$this->project->uuid}/environment/{$this->environment->uuid}/database/{$this->database->uuid}";
+});
+
+// --- Database Policy: view ---
+
+test('admin can view database', function () {
+    expect($this->admin->can('view', $this->database))->toBeTrue();
+});
+
+test('member can view database', function () {
+    expect($this->member->can('view', $this->database))->toBeTrue();
+});
+
+// --- Database Policy: update ---
+
+test('admin can update database', function () {
+    expect($this->admin->can('update', $this->database))->toBeTrue();
+});
+
+test('member cannot update database', function () {
+    expect($this->member->can('update', $this->database))->toBeFalse();
+});
+
+// --- Database Policy: delete ---
+
+test('admin can delete database', function () {
+    expect($this->admin->can('delete', $this->database))->toBeTrue();
+});
+
+test('member cannot delete database', function () {
+    expect($this->member->can('delete', $this->database))->toBeFalse();
+});
+
+// --- Database Policy: manage ---
+
+test('admin can manage database', function () {
+    expect($this->admin->can('manage', $this->database))->toBeTrue();
+});
+
+test('member cannot manage database', function () {
+    expect($this->member->can('manage', $this->database))->toBeFalse();
+});
+
+// --- Database Policy: manageBackups ---
+
+test('admin can manage database backups', function () {
+    expect($this->admin->can('manageBackups', $this->database))->toBeTrue();
+});
+
+test('member cannot manage database backups', function () {
+    expect($this->member->can('manageBackups', $this->database))->toBeFalse();
+});
+
+// --- Database Policy: manageEnvironment ---
+
+test('admin can manage database environment variables', function () {
+    expect($this->admin->can('manageEnvironment', $this->database))->toBeTrue();
+});
+
+test('member cannot manage database environment variables', function () {
+    expect($this->member->can('manageEnvironment', $this->database))->toBeFalse();
+});
+
+// --- Database page access ---
+
+test('admin can access database page', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    $this->get($this->databaseUrl)->assertSuccessful();
+});
+
+test('member can access database page', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    $this->get($this->databaseUrl)->assertSuccessful();
+});
+
+// --- Terminal access ---
+
+test('admin can access terminal for database', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('canAccessTerminal'))->toBeTrue();
+});
+
+test('member cannot access terminal for database', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('canAccessTerminal'))->toBeFalse();
+});
+
+// --- Cross-team isolation ---
+
+test('user from different team cannot view database', function () {
+    $otherTeam = Team::factory()->create();
+    $otherUser = User::factory()->create();
+    $otherUser->teams()->attach($otherTeam, ['role' => 'admin']);
+
+    expect($otherUser->can('view', $this->database))->toBeFalse();
+});
+
+test('user from different team cannot update database', function () {
+    $otherTeam = Team::factory()->create();
+    $otherUser = User::factory()->create();
+    $otherUser->teams()->attach($otherTeam, ['role' => 'admin']);
+
+    expect($otherUser->can('update', $this->database))->toBeFalse();
+});
+
+test('user from different team cannot manage database', function () {
+    $otherTeam = Team::factory()->create();
+    $otherUser = User::factory()->create();
+    $otherUser->teams()->attach($otherTeam, ['role' => 'admin']);
+
+    expect($otherUser->can('manage', $this->database))->toBeFalse();
+});
diff --git a/tests/Feature/Authorization/DestinationOwnershipTest.php b/tests/Feature/Authorization/DestinationOwnershipTest.php
new file mode 100644
index 000000000..1a8bf4a97
--- /dev/null
+++ b/tests/Feature/Authorization/DestinationOwnershipTest.php
@@ -0,0 +1,60 @@
+<?php
+
+use App\Livewire\Destination\Show;
+use App\Models\InstanceSettings;
+use App\Models\Server;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
+    // Team A owns the destination
+    $this->teamA = Team::factory()->create();
+    $this->userA = User::factory()->create();
+    $this->userA->teams()->attach($this->teamA, ['role' => 'admin']);
+
+    $keyId = DB::table('private_keys')->insertGetId([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Key A',
+        'private_key' => 'test-key-a',
+        'team_id' => $this->teamA->id,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $this->server = Server::factory()->create([
+        'team_id' => $this->teamA->id,
+        'private_key_id' => $keyId,
+    ]);
+
+    // Use the StandaloneDocker created by the Server factory
+    $this->destination = $this->server->standaloneDockers()->first();
+
+    // Team B is a different team
+    $this->teamB = Team::factory()->create();
+    $this->userB = User::factory()->create();
+    $this->userB->teams()->attach($this->teamB, ['role' => 'admin']);
+});
+
+test('team member can view their own destination', function () {
+    $this->actingAs($this->userA);
+    session(['currentTeam' => $this->teamA]);
+
+    Livewire::test(Show::class, ['destination_uuid' => $this->destination->uuid])
+        ->assertSet('name', $this->destination->name);
+});
+
+test('cross-team user cannot view destination', function () {
+    $this->actingAs($this->userB);
+    session(['currentTeam' => $this->teamB]);
+
+    Livewire::test(Show::class, ['destination_uuid' => $this->destination->uuid])
+        ->assertStatus(403);
+});
diff --git a/tests/Feature/Authorization/EnvironmentVariableValueHidingTest.php b/tests/Feature/Authorization/EnvironmentVariableValueHidingTest.php
new file mode 100644
index 000000000..e30e2ad62
--- /dev/null
+++ b/tests/Feature/Authorization/EnvironmentVariableValueHidingTest.php
@@ -0,0 +1,274 @@
+<?php
+
+use App\Livewire\Project\Shared\EnvironmentVariable\All as EnvironmentVariableAll;
+use App\Livewire\Project\Shared\EnvironmentVariable\Show as EnvironmentVariableShow;
+use App\Models\Application;
+use App\Models\EnvironmentVariable;
+use App\Models\InstanceSettings;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\StandaloneDocker;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0], ['is_api_enabled' => true]);
+
+    $this->team = Team::factory()->create();
+
+    $this->admin = User::factory()->create();
+    $this->admin->teams()->attach($this->team, ['role' => 'admin']);
+
+    $this->member = User::factory()->create();
+    $this->member->teams()->attach($this->team, ['role' => 'member']);
+
+    $keyId = DB::table('private_keys')->insertGetId([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Key',
+        'private_key' => 'test-key',
+        'team_id' => $this->team->id,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $this->server = Server::factory()->create([
+        'team_id' => $this->team->id,
+        'private_key_id' => $keyId,
+    ]);
+
+    StandaloneDocker::withoutEvents(function () {
+        $this->destination = StandaloneDocker::firstOrCreate(
+            ['server_id' => $this->server->id, 'network' => 'coolify'],
+            ['uuid' => (string) Str::uuid(), 'name' => 'test-docker']
+        );
+    });
+
+    $this->project = Project::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Project',
+        'team_id' => $this->team->id,
+    ]);
+
+    $this->environment = $this->project->environments()->first();
+
+    $this->application = Application::factory()->create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test App',
+        'environment_id' => $this->environment->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+    ]);
+
+    $this->unlockedEnv = EnvironmentVariable::create([
+        'key' => 'UNLOCKED_VAR',
+        'value' => 'secret-unlocked-value',
+        'resourceable_type' => Application::class,
+        'resourceable_id' => $this->application->id,
+        'is_preview' => false,
+        'is_shown_once' => false,
+        'is_multiline' => false,
+        'is_literal' => false,
+        'is_runtime' => true,
+        'is_buildtime' => true,
+    ]);
+
+    $this->lockedEnv = EnvironmentVariable::create([
+        'key' => 'LOCKED_VAR',
+        'value' => 'secret-locked-value',
+        'resourceable_type' => Application::class,
+        'resourceable_id' => $this->application->id,
+        'is_preview' => false,
+        'is_shown_once' => true,
+        'is_multiline' => false,
+        'is_literal' => false,
+        'is_runtime' => true,
+        'is_buildtime' => true,
+    ]);
+});
+
+// --- Livewire Show component: locked env values ---
+
+test('admin sees unlocked env value in Show component', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    $component = Livewire::test(EnvironmentVariableShow::class, [
+        'env' => $this->unlockedEnv,
+        'type' => 'application',
+    ]);
+
+    expect($component->get('value'))->toBe('secret-unlocked-value');
+});
+
+test('admin cannot see locked env value in Show component', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    $component = Livewire::test(EnvironmentVariableShow::class, [
+        'env' => $this->lockedEnv,
+        'type' => 'application',
+    ]);
+
+    expect($component->get('value'))->toBeNull();
+    expect($component->get('real_value'))->toBeNull();
+});
+
+test('member cannot see any env value in Show component', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    $component = Livewire::test(EnvironmentVariableShow::class, [
+        'env' => $this->unlockedEnv,
+        'type' => 'application',
+    ]);
+
+    expect($component->get('value'))->toBeNull();
+    expect($component->get('real_value'))->toBeNull();
+});
+
+test('member has isValueHidden flag set to true', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    $component = Livewire::test(EnvironmentVariableShow::class, [
+        'env' => $this->unlockedEnv,
+        'type' => 'application',
+    ]);
+
+    expect($component->get('isValueHidden'))->toBeTrue();
+});
+
+test('admin has isValueHidden flag set to false', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    $component = Livewire::test(EnvironmentVariableShow::class, [
+        'env' => $this->unlockedEnv,
+        'type' => 'application',
+    ]);
+
+    expect($component->get('isValueHidden'))->toBeFalse();
+});
+
+// --- Livewire All component: dev view ---
+
+test('admin dev view shows unlocked env value', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    $component = Livewire::test(EnvironmentVariableAll::class, [
+        'resource' => $this->application,
+    ]);
+
+    expect($component->get('variables'))->toContain('UNLOCKED_VAR=secret-unlocked-value');
+});
+
+test('admin dev view hides locked env value', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    $component = Livewire::test(EnvironmentVariableAll::class, [
+        'resource' => $this->application,
+    ]);
+
+    expect($component->get('variables'))->toContain('LOCKED_VAR=(Locked Secret, delete and add again to change)');
+    expect($component->get('variables'))->not->toContain('secret-locked-value');
+});
+
+test('member dev view hides all env values', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    $component = Livewire::test(EnvironmentVariableAll::class, [
+        'resource' => $this->application,
+    ]);
+
+    expect($component->get('variables'))->not->toContain('secret-unlocked-value');
+    expect($component->get('variables'))->not->toContain('secret-locked-value');
+    expect($component->get('variables'))->toContain('UNLOCKED_VAR=(Hidden');
+});
+
+// --- API: locked env values hidden ---
+
+test('API hides locked env value even with read:sensitive token', function () {
+    session(['currentTeam' => $this->team]);
+    $token = $this->admin->createToken('admin-sensitive', ['read', 'read:sensitive']);
+
+    $response = $this->withHeaders([
+        'Authorization' => 'Bearer '.$token->plainTextToken,
+    ])->getJson("/api/v1/applications/{$this->application->uuid}/envs");
+
+    $response->assertOk();
+
+    $envs = collect($response->json());
+    $locked = $envs->firstWhere('key', 'LOCKED_VAR');
+    $unlocked = $envs->firstWhere('key', 'UNLOCKED_VAR');
+
+    expect($locked)->not->toBeNull();
+    expect($locked)->not->toHaveKey('value');
+    expect($locked)->not->toHaveKey('real_value');
+
+    expect($unlocked)->not->toBeNull();
+    expect($unlocked)->toHaveKey('value');
+});
+
+test('API hides locked env value with root token', function () {
+    session(['currentTeam' => $this->team]);
+    $token = $this->admin->createToken('admin-root', ['root']);
+
+    $response = $this->withHeaders([
+        'Authorization' => 'Bearer '.$token->plainTextToken,
+    ])->getJson("/api/v1/applications/{$this->application->uuid}/envs");
+
+    $response->assertOk();
+
+    $envs = collect($response->json());
+    $locked = $envs->firstWhere('key', 'LOCKED_VAR');
+
+    expect($locked)->not->toBeNull();
+    expect($locked)->not->toHaveKey('value');
+    expect($locked)->not->toHaveKey('real_value');
+});
+
+// --- API: member role hides env values ---
+
+test('API hides env values for member even with read:sensitive token', function () {
+    session(['currentTeam' => $this->team]);
+    $token = $this->member->createToken('member-sensitive', ['read', 'read:sensitive']);
+
+    $response = $this->withHeaders([
+        'Authorization' => 'Bearer '.$token->plainTextToken,
+    ])->getJson("/api/v1/applications/{$this->application->uuid}/envs");
+
+    $response->assertOk();
+
+    $envs = collect($response->json());
+    $unlocked = $envs->firstWhere('key', 'UNLOCKED_VAR');
+
+    expect($unlocked)->not->toBeNull();
+    expect($unlocked)->not->toHaveKey('value');
+    expect($unlocked)->not->toHaveKey('real_value');
+});
+
+test('API shows env values for admin with read:sensitive token', function () {
+    session(['currentTeam' => $this->team]);
+    $token = $this->admin->createToken('admin-sensitive-2', ['read', 'read:sensitive']);
+
+    $response = $this->withHeaders([
+        'Authorization' => 'Bearer '.$token->plainTextToken,
+    ])->getJson("/api/v1/applications/{$this->application->uuid}/envs");
+
+    $response->assertOk();
+
+    $envs = collect($response->json());
+    $unlocked = $envs->firstWhere('key', 'UNLOCKED_VAR');
+
+    expect($unlocked)->not->toBeNull();
+    expect($unlocked)->toHaveKey('value');
+});
diff --git a/tests/Feature/Authorization/LegacyMemberTokenTest.php b/tests/Feature/Authorization/LegacyMemberTokenTest.php
new file mode 100644
index 000000000..273327985
--- /dev/null
+++ b/tests/Feature/Authorization/LegacyMemberTokenTest.php
@@ -0,0 +1,127 @@
+<?php
+
+use App\Models\InstanceSettings;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::create(['id' => 0, 'is_api_enabled' => true]);
+
+    $this->team = Team::factory()->create();
+    $this->member = User::factory()->create();
+    $this->admin = User::factory()->create();
+
+    $this->team->members()->attach($this->member->id, ['role' => 'member']);
+    $this->team->members()->attach($this->admin->id, ['role' => 'admin']);
+
+    session(['currentTeam' => $this->team]);
+});
+
+function apiRequest($test, string $token, string $method = 'get', string $url = '/api/v1/version')
+{
+    return $test->withHeaders([
+        'Authorization' => 'Bearer '.$token,
+        'Content-Type' => 'application/json',
+    ])->{$method.'Json'}($url);
+}
+
+describe('member with legacy elevated token is rejected', function () {
+    test('member with legacy write token gets 403 with descriptive message', function () {
+        $token = $this->member->createToken('legacy-write', ['read', 'write']);
+
+        $response = apiRequest($this, $token->plainTextToken);
+
+        $response->assertStatus(403);
+        $response->assertJsonFragment([
+            'message' => 'This API token has permissions (write) that exceed your current role as a team member. Members are restricted to read-only API access. Please revoke this token and create a new one with only read permissions.',
+        ]);
+    });
+
+    test('member with legacy deploy token gets 403', function () {
+        $token = $this->member->createToken('legacy-deploy', ['read', 'deploy']);
+
+        $response = apiRequest($this, $token->plainTextToken);
+
+        $response->assertStatus(403);
+        $response->assertSee('deploy');
+        $response->assertSee('revoke this token');
+    });
+
+    test('member with legacy root token gets 403', function () {
+        $token = $this->member->createToken('legacy-root', ['root']);
+
+        $response = apiRequest($this, $token->plainTextToken);
+
+        $response->assertStatus(403);
+        $response->assertSee('root');
+    });
+
+    test('member with legacy read:sensitive token gets 403', function () {
+        $token = $this->member->createToken('legacy-sensitive', ['read', 'read:sensitive']);
+
+        $response = apiRequest($this, $token->plainTextToken);
+
+        $response->assertStatus(403);
+        $response->assertSee('read:sensitive');
+    });
+
+    test('member with legacy write:sensitive token gets 403', function () {
+        $token = $this->member->createToken('legacy-ws', ['read', 'write:sensitive']);
+
+        $response = apiRequest($this, $token->plainTextToken);
+
+        $response->assertStatus(403);
+        $response->assertSee('write:sensitive');
+    });
+
+    test('member with multiple disallowed abilities lists them all', function () {
+        $token = $this->member->createToken('legacy-multi', ['read', 'write', 'deploy', 'read:sensitive']);
+
+        $response = apiRequest($this, $token->plainTextToken);
+
+        $response->assertStatus(403);
+        $json = $response->json();
+        expect($json['message'])->toContain('write');
+        expect($json['message'])->toContain('deploy');
+        expect($json['message'])->toContain('read:sensitive');
+    });
+});
+
+describe('member with read-only token passes through', function () {
+    test('member with read token can access read endpoints', function () {
+        $token = $this->member->createToken('read-only', ['read']);
+
+        $response = apiRequest($this, $token->plainTextToken);
+
+        $response->assertStatus(200);
+    });
+});
+
+describe('admin with elevated token passes through', function () {
+    test('admin with write token is not blocked', function () {
+        $token = $this->admin->createToken('admin-write', ['read', 'write']);
+
+        $response = apiRequest($this, $token->plainTextToken);
+
+        $response->assertStatus(200);
+    });
+
+    test('admin with root token is not blocked', function () {
+        $token = $this->admin->createToken('admin-root', ['root']);
+
+        $response = apiRequest($this, $token->plainTextToken);
+
+        $response->assertStatus(200);
+    });
+
+    test('admin with deploy token is not blocked', function () {
+        $token = $this->admin->createToken('admin-deploy', ['read', 'deploy']);
+
+        $response = apiRequest($this, $token->plainTextToken);
+
+        $response->assertStatus(200);
+    });
+});
diff --git a/tests/Feature/Authorization/NavbarDeleteTeamAuthorizationTest.php b/tests/Feature/Authorization/NavbarDeleteTeamAuthorizationTest.php
new file mode 100644
index 000000000..580b83299
--- /dev/null
+++ b/tests/Feature/Authorization/NavbarDeleteTeamAuthorizationTest.php
@@ -0,0 +1,46 @@
+<?php
+
+use App\Livewire\NavbarDeleteTeam;
+use App\Models\InstanceSettings;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
+    $this->owner = User::factory()->create();
+    $this->personalTeam = $this->owner->teams()->first();
+    $this->owner->teams()->updateExistingPivot($this->personalTeam->id, ['role' => 'owner']);
+
+    $this->teamToDelete = Team::create(['name' => 'Deletable Team', 'personal_team' => false]);
+    $this->teamToDelete->members()->attach($this->owner->id, ['role' => 'owner']);
+
+    $this->member = User::factory()->create();
+    $this->teamToDelete->members()->attach($this->member->id, ['role' => 'member']);
+});
+
+test('owner can delete team via navbar', function () {
+    $this->actingAs($this->owner);
+    session(['currentTeam' => $this->teamToDelete]);
+
+    Livewire::test(NavbarDeleteTeam::class)
+        ->call('delete', 'password')
+        ->assertRedirect(route('team.index'));
+
+    expect(Team::find($this->teamToDelete->id))->toBeNull();
+});
+
+test('member cannot delete team via navbar', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->teamToDelete]);
+
+    Livewire::test(NavbarDeleteTeam::class)
+        ->call('delete', 'password')
+        ->assertDispatched('error');
+
+    expect(Team::find($this->teamToDelete->id))->not->toBeNull();
+});
diff --git a/tests/Feature/Authorization/NotificationAuthorizationTest.php b/tests/Feature/Authorization/NotificationAuthorizationTest.php
new file mode 100644
index 000000000..7a7ac94aa
--- /dev/null
+++ b/tests/Feature/Authorization/NotificationAuthorizationTest.php
@@ -0,0 +1,277 @@
+<?php
+
+use App\Livewire\Notifications\Discord as DiscordNotification;
+use App\Livewire\Notifications\Email as EmailNotification;
+use App\Livewire\Notifications\Pushover as PushoverNotification;
+use App\Livewire\Notifications\Slack as SlackNotification;
+use App\Livewire\Notifications\Telegram as TelegramNotification;
+use App\Livewire\Notifications\Webhook as WebhookNotification;
+use App\Models\InstanceSettings;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
+    $this->team = Team::factory()->create();
+
+    $this->admin = User::factory()->create();
+    $this->admin->teams()->attach($this->team, ['role' => 'admin']);
+
+    $this->member = User::factory()->create();
+    $this->member->teams()->attach($this->team, ['role' => 'member']);
+});
+
+// --- Discord ---
+
+test('member cannot send test notification on discord', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    $settings = $this->team->discordNotificationSettings;
+    $settings->update([
+        'discord_enabled' => true,
+        'discord_webhook_url' => 'https://discord.com/api/webhooks/test',
+    ]);
+
+    Livewire::test(DiscordNotification::class)
+        ->call('sendTestNotification')
+        ->assertDispatched('error');
+});
+
+test('member cannot update discord notification settings', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(DiscordNotification::class)
+        ->call('syncData', true)
+        ->assertForbidden();
+});
+
+test('admin can update discord notification settings', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    $settings = $this->team->discordNotificationSettings;
+
+    expect($this->admin->can('update', $settings))->toBeTrue();
+});
+
+// --- Slack ---
+
+test('member cannot send test notification on slack', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    $settings = $this->team->slackNotificationSettings;
+    $settings->update([
+        'slack_enabled' => true,
+        'slack_webhook_url' => 'https://hooks.slack.com/services/test',
+    ]);
+
+    Livewire::test(SlackNotification::class)
+        ->call('sendTestNotification')
+        ->assertDispatched('error');
+});
+
+test('member cannot update slack notification settings', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(SlackNotification::class)
+        ->call('syncData', true)
+        ->assertForbidden();
+});
+
+test('admin can update slack notification settings', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    $settings = $this->team->slackNotificationSettings;
+
+    expect($this->admin->can('update', $settings))->toBeTrue();
+});
+
+// --- Telegram ---
+
+test('member cannot send test notification on telegram', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    $settings = $this->team->telegramNotificationSettings;
+    $settings->update([
+        'telegram_enabled' => true,
+        'telegram_token' => 'test-token',
+        'telegram_chat_id' => '123456',
+    ]);
+
+    Livewire::test(TelegramNotification::class)
+        ->call('sendTestNotification')
+        ->assertDispatched('error');
+});
+
+test('member cannot update telegram notification settings', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(TelegramNotification::class)
+        ->call('syncData', true)
+        ->assertForbidden();
+});
+
+test('admin can update telegram notification settings', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    $settings = $this->team->telegramNotificationSettings;
+
+    expect($this->admin->can('update', $settings))->toBeTrue();
+});
+
+// --- Email ---
+
+test('member cannot send test email notification', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    $settings = $this->team->emailNotificationSettings;
+    $settings->update([
+        'smtp_enabled' => true,
+        'smtp_host' => 'localhost',
+        'smtp_port' => 587,
+        'smtp_from_address' => 'test@test.com',
+        'smtp_from_name' => 'Test',
+    ]);
+
+    Livewire::test(EmailNotification::class)
+        ->call('sendTestEmail')
+        ->assertDispatched('error');
+});
+
+test('member cannot update email notification settings', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(EmailNotification::class)
+        ->call('syncData', true)
+        ->assertForbidden();
+});
+
+test('member cannot copy instance email settings', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(EmailNotification::class)
+        ->call('copyFromInstanceSettings')
+        ->assertForbidden();
+});
+
+test('admin can update email notification settings', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    $settings = $this->team->emailNotificationSettings;
+
+    expect($this->admin->can('update', $settings))->toBeTrue();
+});
+
+// --- Pushover ---
+
+test('member cannot send test notification on pushover', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    $settings = $this->team->pushoverNotificationSettings;
+    $settings->update([
+        'pushover_enabled' => true,
+        'pushover_app_token' => 'test-token',
+        'pushover_user_key' => 'test-user-key',
+    ]);
+
+    Livewire::test(PushoverNotification::class)
+        ->call('sendTestNotification')
+        ->assertDispatched('error');
+});
+
+test('member cannot update pushover notification settings', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(PushoverNotification::class)
+        ->call('syncData', true)
+        ->assertForbidden();
+});
+
+test('admin can update pushover notification settings', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    $settings = $this->team->pushoverNotificationSettings;
+
+    expect($this->admin->can('update', $settings))->toBeTrue();
+});
+
+// --- Webhook ---
+
+test('member cannot send test notification on webhook', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    $settings = $this->team->webhookNotificationSettings;
+    $settings->update([
+        'webhook_enabled' => true,
+        'webhook_url' => 'https://example.com/webhook',
+    ]);
+
+    Livewire::test(WebhookNotification::class)
+        ->call('sendTestNotification')
+        ->assertDispatched('error');
+});
+
+test('member cannot update webhook notification settings', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(WebhookNotification::class)
+        ->call('syncData', true)
+        ->assertForbidden();
+});
+
+test('admin can update webhook notification settings', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    $settings = $this->team->webhookNotificationSettings;
+
+    expect($this->admin->can('update', $settings))->toBeTrue();
+});
+
+// --- Send test policy checks ---
+
+test('admin can send test on all notification channels', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect($this->admin->can('sendTest', $this->team->discordNotificationSettings))->toBeTrue();
+    expect($this->admin->can('sendTest', $this->team->slackNotificationSettings))->toBeTrue();
+    expect($this->admin->can('sendTest', $this->team->telegramNotificationSettings))->toBeTrue();
+    expect($this->admin->can('sendTest', $this->team->emailNotificationSettings))->toBeTrue();
+    expect($this->admin->can('sendTest', $this->team->pushoverNotificationSettings))->toBeTrue();
+    expect($this->admin->can('sendTest', $this->team->webhookNotificationSettings))->toBeTrue();
+});
+
+test('member cannot send test on any notification channel', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect($this->member->can('sendTest', $this->team->discordNotificationSettings))->toBeFalse();
+    expect($this->member->can('sendTest', $this->team->slackNotificationSettings))->toBeFalse();
+    expect($this->member->can('sendTest', $this->team->telegramNotificationSettings))->toBeFalse();
+    expect($this->member->can('sendTest', $this->team->emailNotificationSettings))->toBeFalse();
+    expect($this->member->can('sendTest', $this->team->pushoverNotificationSettings))->toBeFalse();
+    expect($this->member->can('sendTest', $this->team->webhookNotificationSettings))->toBeFalse();
+});
diff --git a/tests/Feature/Authorization/ProjectEnvironmentAuthorizationTest.php b/tests/Feature/Authorization/ProjectEnvironmentAuthorizationTest.php
new file mode 100644
index 000000000..d1e01f0e6
--- /dev/null
+++ b/tests/Feature/Authorization/ProjectEnvironmentAuthorizationTest.php
@@ -0,0 +1,55 @@
+<?php
+
+use App\Livewire\Project\Show;
+use App\Models\Environment;
+use App\Models\InstanceSettings;
+use App\Models\Project;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Str;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
+    $this->team = Team::factory()->create();
+
+    $this->admin = User::factory()->create();
+    $this->admin->teams()->attach($this->team, ['role' => 'admin']);
+
+    $this->member = User::factory()->create();
+    $this->member->teams()->attach($this->team, ['role' => 'member']);
+
+    $this->project = Project::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Project',
+        'team_id' => $this->team->id,
+    ]);
+});
+
+test('admin can create environment in project', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(Show::class, ['project_uuid' => $this->project->uuid])
+        ->set('name', 'staging')
+        ->call('submit')
+        ->assertRedirect();
+
+    expect(Environment::where('name', 'staging')->exists())->toBeTrue();
+});
+
+test('member cannot create environment in project', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(Show::class, ['project_uuid' => $this->project->uuid])
+        ->set('name', 'staging')
+        ->call('submit')
+        ->assertDispatched('error');
+
+    expect(Environment::where('name', 'staging')->exists())->toBeFalse();
+});
diff --git a/tests/Feature/Authorization/ResourceHeadingAuthorizationTest.php b/tests/Feature/Authorization/ResourceHeadingAuthorizationTest.php
new file mode 100644
index 000000000..03f11c22f
--- /dev/null
+++ b/tests/Feature/Authorization/ResourceHeadingAuthorizationTest.php
@@ -0,0 +1,248 @@
+<?php
+
+use App\Livewire\Project\Application\Heading as ApplicationHeading;
+use App\Livewire\Project\Service\Heading as ServiceHeading;
+use App\Models\Application;
+use App\Models\InstanceSettings;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\Service;
+use App\Models\StandaloneDocker;
+use App\Models\StandalonePostgresql;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
+    $this->team = Team::factory()->create();
+
+    $this->admin = User::factory()->create();
+    $this->admin->teams()->attach($this->team, ['role' => 'admin']);
+
+    $this->member = User::factory()->create();
+    $this->member->teams()->attach($this->team, ['role' => 'member']);
+
+    $keyId = DB::table('private_keys')->insertGetId([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Key',
+        'private_key' => 'test-key',
+        'team_id' => $this->team->id,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $this->server = Server::factory()->create([
+        'team_id' => $this->team->id,
+        'private_key_id' => $keyId,
+    ]);
+
+    $this->server->settings()->update([
+        'is_reachable' => true,
+        'is_usable' => true,
+    ]);
+
+    StandaloneDocker::withoutEvents(function () {
+        $this->destination = StandaloneDocker::firstOrCreate(
+            ['server_id' => $this->server->id, 'network' => 'coolify'],
+            ['uuid' => (string) Str::uuid(), 'name' => 'test-docker']
+        );
+    });
+
+    $this->project = Project::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Project',
+        'team_id' => $this->team->id,
+    ]);
+
+    $this->environment = $this->project->environments()->first();
+
+    $this->application = Application::factory()->create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test App',
+        'environment_id' => $this->environment->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+        'status' => 'running',
+    ]);
+
+    $this->database = StandalonePostgresql::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test DB',
+        'postgres_user' => 'postgres',
+        'postgres_password' => 'password',
+        'postgres_db' => 'testdb',
+        'image' => 'postgres:15',
+        'status' => 'running',
+        'environment_id' => $this->environment->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+    ]);
+
+    $this->service = Service::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Service',
+        'environment_id' => $this->environment->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+        'docker_compose_raw' => 'version: "3"',
+    ]);
+
+    $this->serviceParams = [
+        'project_uuid' => $this->project->uuid,
+        'environment_uuid' => $this->environment->uuid,
+        'service_uuid' => $this->service->uuid,
+    ];
+
+    $this->databaseUrl = "/project/{$this->project->uuid}/environment/{$this->environment->uuid}/database/{$this->database->uuid}";
+});
+
+// --- Application Heading ---
+
+test('admin sees deploy controls for application', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationHeading::class, ['application' => $this->application])
+        ->assertSee('Redeploy')
+        ->assertSee('Restart')
+        ->assertSee('Stop');
+});
+
+test('member cannot call deploy on application', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationHeading::class, ['application' => $this->application])
+        ->call('deploy')
+        ->assertDispatched('error');
+});
+
+test('member cannot call restart on application', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationHeading::class, ['application' => $this->application])
+        ->call('restart')
+        ->assertDispatched('error');
+});
+
+test('member cannot call stop on application', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationHeading::class, ['application' => $this->application])
+        ->call('stop')
+        ->assertDispatched('error');
+});
+
+test('member does not see terminal link for application', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationHeading::class, ['application' => $this->application])
+        ->assertDontSee('Terminal');
+});
+
+test('admin sees terminal link for application', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ApplicationHeading::class, ['application' => $this->application])
+        ->assertSee('Terminal');
+});
+
+// --- Database Heading (via page route for rendering, policy checks for actions) ---
+
+test('admin can access database page', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    $this->get($this->databaseUrl)->assertSuccessful();
+});
+
+test('member can access database page', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    $this->get($this->databaseUrl)->assertSuccessful();
+});
+
+test('admin can manage database', function () {
+    expect($this->admin->can('manage', $this->database))->toBeTrue();
+});
+
+test('member cannot manage database', function () {
+    expect($this->member->can('manage', $this->database))->toBeFalse();
+});
+
+test('admin can access terminal for database', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('canAccessTerminal'))->toBeTrue();
+});
+
+test('member cannot access terminal for database', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('canAccessTerminal'))->toBeFalse();
+});
+
+// --- Service Heading ---
+
+test('admin sees service deploy button', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ServiceHeading::class, [
+        'service' => $this->service,
+        'parameters' => $this->serviceParams,
+        'query' => [],
+    ])
+        ->assertSee('Deploy');
+});
+
+test('member cannot call stop on service', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ServiceHeading::class, [
+        'service' => $this->service,
+        'parameters' => $this->serviceParams,
+        'query' => [],
+    ])
+        ->call('stop')
+        ->assertDispatched('error');
+});
+
+test('member does not see terminal link for service', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ServiceHeading::class, [
+        'service' => $this->service,
+        'parameters' => $this->serviceParams,
+        'query' => [],
+    ])
+        ->assertDontSee('Terminal');
+});
+
+test('admin sees terminal link for service', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ServiceHeading::class, [
+        'service' => $this->service,
+        'parameters' => $this->serviceParams,
+        'query' => [],
+    ])
+        ->assertSee('Terminal');
+});
diff --git a/tests/Feature/ResourceOperationsCrossTenantTest.php b/tests/Feature/Authorization/ResourceOperationsCrossTenantTest.php
similarity index 100%
rename from tests/Feature/ResourceOperationsCrossTenantTest.php
rename to tests/Feature/Authorization/ResourceOperationsCrossTenantTest.php
diff --git a/tests/Feature/Authorization/SecurityPageAuthorizationTest.php b/tests/Feature/Authorization/SecurityPageAuthorizationTest.php
new file mode 100644
index 000000000..94975f3c2
--- /dev/null
+++ b/tests/Feature/Authorization/SecurityPageAuthorizationTest.php
@@ -0,0 +1,112 @@
+<?php
+
+use App\Livewire\Notifications\Discord as DiscordNotification;
+use App\Livewire\Security\PrivateKey\Index as PrivateKeyIndex;
+use App\Livewire\Team\Member\Index as TeamMemberIndex;
+use App\Models\DiscordNotificationSettings;
+use App\Models\InstanceSettings;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
+    $this->team = Team::factory()->create();
+
+    $this->admin = User::factory()->create();
+    $this->admin->teams()->attach($this->team, ['role' => 'admin']);
+
+    $this->member = User::factory()->create();
+    $this->member->teams()->attach($this->team, ['role' => 'member']);
+
+    // Create a private key for the team (bypass model validation via DB insert)
+    DB::table('private_keys')->insert([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Team SSH Key',
+        'description' => 'Key for testing',
+        'private_key' => 'test-key-content',
+        'team_id' => $this->team->id,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+});
+
+// --- Private Key Index ---
+
+test('admin sees add and cleanup buttons on private key page', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(PrivateKeyIndex::class)
+        ->assertSee('+ Add')
+        ->assertSee('Delete unused SSH Keys');
+});
+
+test('member does not see add or cleanup buttons on private key page', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(PrivateKeyIndex::class)
+        ->assertDontSee('+ Add')
+        ->assertDontSee('Delete unused SSH Keys');
+});
+
+test('member can view private key names on index page', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    // Member can see key names (view is allowed for same-team members)
+    // but cannot see create/delete buttons (tested separately above)
+    Livewire::test(PrivateKeyIndex::class)
+        ->assertSee('Team SSH Key');
+});
+
+test('member cannot call cleanup unused keys', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(PrivateKeyIndex::class)
+        ->call('cleanupUnusedKeys')
+        ->assertDispatched('error');
+});
+
+// --- Team Member Index (Invitations) ---
+
+test('admin sees invite section on team members page', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(TeamMemberIndex::class)
+        ->assertSee('Invite New Member');
+});
+
+test('member does not see invite section on team members page', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(TeamMemberIndex::class)
+        ->assertDontSee('Invite New Member');
+});
+
+// --- Notification Settings (Discord as representative) ---
+
+test('member cannot send test notification on discord', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    $settings = DiscordNotificationSettings::where('team_id', $this->team->id)->first();
+    $settings->update([
+        'discord_enabled' => true,
+        'discord_webhook_url' => 'https://discord.com/api/webhooks/test',
+    ]);
+
+    Livewire::test(DiscordNotification::class)
+        ->call('sendTestNotification')
+        ->assertDispatched('error');
+});
diff --git a/tests/Feature/Authorization/ServerAuthorizationTest.php b/tests/Feature/Authorization/ServerAuthorizationTest.php
new file mode 100644
index 000000000..80b7aed40
--- /dev/null
+++ b/tests/Feature/Authorization/ServerAuthorizationTest.php
@@ -0,0 +1,222 @@
+<?php
+
+use App\Livewire\Server\Navbar as ServerNavbar;
+use App\Models\InstanceSettings;
+use App\Models\Server;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
+    $this->team = Team::factory()->create();
+
+    $this->admin = User::factory()->create();
+    $this->admin->teams()->attach($this->team, ['role' => 'admin']);
+
+    $this->member = User::factory()->create();
+    $this->member->teams()->attach($this->team, ['role' => 'member']);
+
+    $keyId = DB::table('private_keys')->insertGetId([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Key',
+        'private_key' => 'test-key',
+        'team_id' => $this->team->id,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $this->server = Server::factory()->create([
+        'team_id' => $this->team->id,
+        'private_key_id' => $keyId,
+    ]);
+
+    $this->server->settings()->update([
+        'is_reachable' => true,
+        'is_usable' => true,
+    ]);
+});
+
+// --- Server Policy: update ---
+
+test('admin can update server', function () {
+    expect($this->admin->can('update', $this->server))->toBeTrue();
+});
+
+test('member cannot update server', function () {
+    expect($this->member->can('update', $this->server))->toBeFalse();
+});
+
+// --- Server Policy: delete ---
+
+test('admin can delete server', function () {
+    expect($this->admin->can('delete', $this->server))->toBeTrue();
+});
+
+test('member cannot delete server', function () {
+    expect($this->member->can('delete', $this->server))->toBeFalse();
+});
+
+// --- Server Policy: view ---
+
+test('admin can view server', function () {
+    expect($this->admin->can('view', $this->server))->toBeTrue();
+});
+
+test('member can view server', function () {
+    expect($this->member->can('view', $this->server))->toBeTrue();
+});
+
+// --- Server Policy: manageProxy ---
+
+test('admin can manage proxy', function () {
+    expect($this->admin->can('manageProxy', $this->server))->toBeTrue();
+});
+
+test('member cannot manage proxy', function () {
+    expect($this->member->can('manageProxy', $this->server))->toBeFalse();
+});
+
+// --- Server Policy: manageSentinel ---
+
+test('admin can manage sentinel', function () {
+    expect($this->admin->can('manageSentinel', $this->server))->toBeTrue();
+});
+
+test('member cannot manage sentinel', function () {
+    expect($this->member->can('manageSentinel', $this->server))->toBeFalse();
+});
+
+// --- Server Policy: manageCaCertificate ---
+
+test('admin can manage CA certificate', function () {
+    expect($this->admin->can('manageCaCertificate', $this->server))->toBeTrue();
+});
+
+test('member cannot manage CA certificate', function () {
+    expect($this->member->can('manageCaCertificate', $this->server))->toBeFalse();
+});
+
+// --- Server Policy: viewSecurity ---
+
+test('admin can view security', function () {
+    expect($this->admin->can('viewSecurity', $this->server))->toBeTrue();
+});
+
+test('member cannot view security', function () {
+    expect($this->member->can('viewSecurity', $this->server))->toBeFalse();
+});
+
+// --- Server Policy: create ---
+
+test('admin can create server', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('create', Server::class))->toBeTrue();
+});
+
+test('member cannot create server', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('create', Server::class))->toBeFalse();
+});
+
+// --- Cross-team isolation ---
+
+test('user from different team cannot view server', function () {
+    $otherTeam = Team::factory()->create();
+    $otherUser = User::factory()->create();
+    $otherUser->teams()->attach($otherTeam, ['role' => 'admin']);
+
+    expect($otherUser->can('view', $this->server))->toBeFalse();
+});
+
+test('user from different team cannot update server', function () {
+    $otherTeam = Team::factory()->create();
+    $otherUser = User::factory()->create();
+    $otherUser->teams()->attach($otherTeam, ['role' => 'admin']);
+
+    expect($otherUser->can('update', $this->server))->toBeFalse();
+});
+
+// --- Navbar Livewire component actions ---
+
+test('member cannot restart proxy via navbar', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ServerNavbar::class, ['server' => $this->server])
+        ->call('restart')
+        ->assertDispatched('error');
+});
+
+test('member cannot check proxy via navbar', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ServerNavbar::class, ['server' => $this->server])
+        ->call('checkProxy')
+        ->assertDispatched('error');
+});
+
+test('member cannot start proxy via navbar', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ServerNavbar::class, ['server' => $this->server])
+        ->call('startProxy')
+        ->assertDispatched('error');
+});
+
+test('member cannot stop proxy via navbar', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ServerNavbar::class, ['server' => $this->server])
+        ->call('stop')
+        ->assertDispatched('error');
+});
+
+// --- Terminal access gate ---
+
+test('admin can access terminal', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('canAccessTerminal'))->toBeTrue();
+});
+
+test('member cannot access terminal', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('canAccessTerminal'))->toBeFalse();
+});
+
+// --- Server page access ---
+
+test('admin can access server page', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    $this->get("/server/{$this->server->uuid}")->assertSuccessful();
+});
+
+test('member can access server page', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    $this->get("/server/{$this->server->uuid}")->assertSuccessful();
+});
+
+test('unauthenticated user cannot access server page', function () {
+    $this->get("/server/{$this->server->uuid}")->assertRedirect('/login');
+});
diff --git a/tests/Feature/Authorization/ServiceConfigAuthorizationTest.php b/tests/Feature/Authorization/ServiceConfigAuthorizationTest.php
new file mode 100644
index 000000000..ab5c12376
--- /dev/null
+++ b/tests/Feature/Authorization/ServiceConfigAuthorizationTest.php
@@ -0,0 +1,242 @@
+<?php
+
+use App\Livewire\Project\Service\Heading as ServiceHeading;
+use App\Models\InstanceSettings;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\Service;
+use App\Models\StandaloneDocker;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
+    $this->team = Team::factory()->create();
+
+    $this->admin = User::factory()->create();
+    $this->admin->teams()->attach($this->team, ['role' => 'admin']);
+
+    $this->member = User::factory()->create();
+    $this->member->teams()->attach($this->team, ['role' => 'member']);
+
+    $keyId = DB::table('private_keys')->insertGetId([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Key',
+        'private_key' => 'test-key',
+        'team_id' => $this->team->id,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $this->server = Server::factory()->create([
+        'team_id' => $this->team->id,
+        'private_key_id' => $keyId,
+    ]);
+
+    StandaloneDocker::withoutEvents(function () {
+        $this->destination = StandaloneDocker::firstOrCreate(
+            ['server_id' => $this->server->id, 'network' => 'coolify'],
+            ['uuid' => (string) Str::uuid(), 'name' => 'test-docker']
+        );
+    });
+
+    $this->project = Project::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Project',
+        'team_id' => $this->team->id,
+    ]);
+
+    $this->environment = $this->project->environments()->first();
+
+    $this->service = Service::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Service',
+        'environment_id' => $this->environment->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+        'docker_compose_raw' => 'version: "3"',
+    ]);
+
+    $this->serviceParams = [
+        'project_uuid' => $this->project->uuid,
+        'environment_uuid' => $this->environment->uuid,
+        'service_uuid' => $this->service->uuid,
+    ];
+});
+
+// --- Service Policy: view ---
+
+test('admin can view service', function () {
+    expect($this->admin->can('view', $this->service))->toBeTrue();
+});
+
+test('member can view service', function () {
+    expect($this->member->can('view', $this->service))->toBeTrue();
+});
+
+// --- Service Policy: update ---
+
+test('admin can update service', function () {
+    expect($this->admin->can('update', $this->service))->toBeTrue();
+});
+
+test('member cannot update service', function () {
+    expect($this->member->can('update', $this->service))->toBeFalse();
+});
+
+// --- Service Policy: delete ---
+
+test('admin can delete service', function () {
+    expect($this->admin->can('delete', $this->service))->toBeTrue();
+});
+
+test('member cannot delete service', function () {
+    expect($this->member->can('delete', $this->service))->toBeFalse();
+});
+
+// --- Service Policy: deploy ---
+
+test('admin can deploy service', function () {
+    expect($this->admin->can('deploy', $this->service))->toBeTrue();
+});
+
+test('member cannot deploy service', function () {
+    expect($this->member->can('deploy', $this->service))->toBeFalse();
+});
+
+// --- Service Policy: stop ---
+
+test('admin can stop service', function () {
+    expect($this->admin->can('stop', $this->service))->toBeTrue();
+});
+
+test('member cannot stop service', function () {
+    expect($this->member->can('stop', $this->service))->toBeFalse();
+});
+
+// --- Service Policy: manageEnvironment ---
+
+test('admin can manage service environment variables', function () {
+    expect($this->admin->can('manageEnvironment', $this->service))->toBeTrue();
+});
+
+test('member cannot manage service environment variables', function () {
+    expect($this->member->can('manageEnvironment', $this->service))->toBeFalse();
+});
+
+// --- Service Heading Livewire actions ---
+
+test('member cannot call start on service heading', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ServiceHeading::class, [
+        'service' => $this->service,
+        'parameters' => $this->serviceParams,
+        'query' => [],
+    ])
+        ->call('start')
+        ->assertDispatched('error');
+});
+
+test('member cannot call stop on service heading', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ServiceHeading::class, [
+        'service' => $this->service,
+        'parameters' => $this->serviceParams,
+        'query' => [],
+    ])
+        ->call('stop')
+        ->assertDispatched('error');
+});
+
+test('member cannot call restart on service heading', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ServiceHeading::class, [
+        'service' => $this->service,
+        'parameters' => $this->serviceParams,
+        'query' => [],
+    ])
+        ->call('restart')
+        ->assertDispatched('error');
+});
+
+test('member cannot call force deploy on service heading', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ServiceHeading::class, [
+        'service' => $this->service,
+        'parameters' => $this->serviceParams,
+        'query' => [],
+    ])
+        ->call('forceDeploy')
+        ->assertDispatched('error');
+});
+
+// --- Service Heading visibility ---
+
+test('member does not see terminal link for service', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ServiceHeading::class, [
+        'service' => $this->service,
+        'parameters' => $this->serviceParams,
+        'query' => [],
+    ])
+        ->assertDontSee('Terminal');
+});
+
+test('admin sees terminal link for service', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ServiceHeading::class, [
+        'service' => $this->service,
+        'parameters' => $this->serviceParams,
+        'query' => [],
+    ])
+        ->assertSee('Terminal');
+});
+
+test('admin sees deploy button for service', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(ServiceHeading::class, [
+        'service' => $this->service,
+        'parameters' => $this->serviceParams,
+        'query' => [],
+    ])
+        ->assertSee('Deploy');
+});
+
+// --- Cross-team isolation ---
+
+test('user from different team cannot view service', function () {
+    $otherTeam = Team::factory()->create();
+    $otherUser = User::factory()->create();
+    $otherUser->teams()->attach($otherTeam, ['role' => 'admin']);
+
+    expect($otherUser->can('view', $this->service))->toBeFalse();
+});
+
+test('user from different team cannot update service', function () {
+    $otherTeam = Team::factory()->create();
+    $otherUser = User::factory()->create();
+    $otherUser->teams()->attach($otherTeam, ['role' => 'admin']);
+
+    expect($otherUser->can('update', $this->service))->toBeFalse();
+});
diff --git a/tests/Feature/Authorization/SharedResourceAuthorizationTest.php b/tests/Feature/Authorization/SharedResourceAuthorizationTest.php
new file mode 100644
index 000000000..23f134458
--- /dev/null
+++ b/tests/Feature/Authorization/SharedResourceAuthorizationTest.php
@@ -0,0 +1,256 @@
+<?php
+
+use App\Livewire\Project\Shared\Danger;
+use App\Livewire\Project\Shared\Tags;
+use App\Livewire\Project\Shared\Webhooks;
+use App\Models\Application;
+use App\Models\InstanceSettings;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\Service;
+use App\Models\StandaloneDocker;
+use App\Models\StandalonePostgresql;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
+    $this->team = Team::factory()->create();
+
+    $this->admin = User::factory()->create();
+    $this->admin->teams()->attach($this->team, ['role' => 'admin']);
+
+    $this->member = User::factory()->create();
+    $this->member->teams()->attach($this->team, ['role' => 'member']);
+
+    $keyId = DB::table('private_keys')->insertGetId([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Key',
+        'private_key' => 'test-key',
+        'team_id' => $this->team->id,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $this->server = Server::factory()->create([
+        'team_id' => $this->team->id,
+        'private_key_id' => $keyId,
+    ]);
+
+    StandaloneDocker::withoutEvents(function () {
+        $this->destination = StandaloneDocker::firstOrCreate(
+            ['server_id' => $this->server->id, 'network' => 'coolify'],
+            ['uuid' => (string) Str::uuid(), 'name' => 'test-docker']
+        );
+    });
+
+    $this->project = Project::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Project',
+        'team_id' => $this->team->id,
+    ]);
+
+    $this->environment = $this->project->environments()->first();
+
+    $this->application = Application::factory()->create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test App',
+        'environment_id' => $this->environment->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+        'status' => 'running',
+    ]);
+
+    $this->database = StandalonePostgresql::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test DB',
+        'postgres_user' => 'postgres',
+        'postgres_password' => 'password',
+        'postgres_db' => 'testdb',
+        'image' => 'postgres:15',
+        'status' => 'running',
+        'environment_id' => $this->environment->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+    ]);
+
+    $this->service = Service::create([
+        'uuid' => (string) Str::uuid(),
+        'name' => 'Test Service',
+        'environment_id' => $this->environment->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+        'docker_compose_raw' => 'version: "3"',
+    ]);
+});
+
+// --- Danger Zone: Application ---
+
+test('admin can delete application', function () {
+    expect($this->admin->can('delete', $this->application))->toBeTrue();
+});
+
+test('member cannot delete application via danger zone', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(Danger::class, ['resource' => $this->application])
+        ->call('delete', 'password')
+        ->assertDispatched('error');
+});
+
+// --- Danger Zone: Database ---
+
+test('admin can delete database', function () {
+    expect($this->admin->can('delete', $this->database))->toBeTrue();
+});
+
+test('member cannot delete database via danger zone', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(Danger::class, ['resource' => $this->database])
+        ->call('delete', 'password')
+        ->assertDispatched('error');
+});
+
+// --- Danger Zone: Service ---
+
+test('admin can delete service', function () {
+    expect($this->admin->can('delete', $this->service))->toBeTrue();
+});
+
+test('member cannot delete service via danger zone', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(Danger::class, ['resource' => $this->service])
+        ->call('delete', 'password')
+        ->assertDispatched('error');
+});
+
+// --- Tags: Application ---
+
+test('member cannot add tag to application', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(Tags::class, ['resource' => $this->application])
+        ->set('newTags', 'test-tag')
+        ->call('submit')
+        ->assertDispatched('error');
+});
+
+test('admin can add tag to application', function () {
+    expect($this->admin->can('update', $this->application))->toBeTrue();
+});
+
+// --- Webhooks: Application ---
+
+test('member cannot update application webhooks', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(Webhooks::class, ['resource' => $this->application])
+        ->call('submit')
+        ->assertDispatched('error');
+});
+
+test('admin can update application webhooks', function () {
+    expect($this->admin->can('update', $this->application))->toBeTrue();
+});
+
+// --- Resource Limits (policy checks, mount requires full resource data) ---
+
+test('member cannot update application resource limits', function () {
+    expect($this->member->can('update', $this->application))->toBeFalse();
+});
+
+test('admin can update application resource limits', function () {
+    expect($this->admin->can('update', $this->application))->toBeTrue();
+});
+
+test('member cannot update database resource limits', function () {
+    expect($this->member->can('update', $this->database))->toBeFalse();
+});
+
+test('member cannot update service resource limits', function () {
+    expect($this->member->can('update', $this->service))->toBeFalse();
+});
+
+// --- Environment Variables (Policy checks) ---
+
+test('admin can manage application environment variables', function () {
+    expect($this->admin->can('manageEnvironment', $this->application))->toBeTrue();
+});
+
+test('member cannot manage application environment variables', function () {
+    expect($this->member->can('manageEnvironment', $this->application))->toBeFalse();
+});
+
+test('admin can manage database environment variables', function () {
+    expect($this->admin->can('manageEnvironment', $this->database))->toBeTrue();
+});
+
+test('member cannot manage database environment variables', function () {
+    expect($this->member->can('manageEnvironment', $this->database))->toBeFalse();
+});
+
+test('admin can manage service environment variables', function () {
+    expect($this->admin->can('manageEnvironment', $this->service))->toBeTrue();
+});
+
+test('member cannot manage service environment variables', function () {
+    expect($this->member->can('manageEnvironment', $this->service))->toBeFalse();
+});
+
+// --- Project Policy ---
+
+test('admin can update project', function () {
+    expect($this->admin->can('update', $this->project))->toBeTrue();
+});
+
+test('member cannot update project', function () {
+    expect($this->member->can('update', $this->project))->toBeFalse();
+});
+
+test('admin can delete project', function () {
+    expect($this->admin->can('delete', $this->project))->toBeTrue();
+});
+
+test('member cannot delete project', function () {
+    expect($this->member->can('delete', $this->project))->toBeFalse();
+});
+
+// --- Environment Policy ---
+
+test('admin can delete environment', function () {
+    expect($this->admin->can('delete', $this->environment))->toBeTrue();
+});
+
+test('member cannot delete environment', function () {
+    expect($this->member->can('delete', $this->environment))->toBeFalse();
+});
+
+// --- Team Policy ---
+
+test('admin can update team', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('update', $this->team))->toBeTrue();
+});
+
+test('member cannot update team', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('update', $this->team))->toBeFalse();
+});
diff --git a/tests/Feature/Authorization/TeamAuthorizationTest.php b/tests/Feature/Authorization/TeamAuthorizationTest.php
new file mode 100644
index 000000000..e99e55a2c
--- /dev/null
+++ b/tests/Feature/Authorization/TeamAuthorizationTest.php
@@ -0,0 +1,327 @@
+<?php
+
+use App\Livewire\Team\Index as TeamIndex;
+use App\Livewire\Team\Member as TeamMember;
+use App\Models\InstanceSettings;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
+    $this->team = Team::factory()->create(['personal_team' => false]);
+
+    $this->owner = User::factory()->create();
+    $this->owner->teams()->attach($this->team, ['role' => 'owner']);
+
+    $this->admin = User::factory()->create();
+    $this->admin->teams()->attach($this->team, ['role' => 'admin']);
+
+    $this->member = User::factory()->create();
+    $this->member->teams()->attach($this->team, ['role' => 'member']);
+});
+
+// --- Team Policy: update ---
+
+test('owner can update team', function () {
+    $this->actingAs($this->owner);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('update', $this->team))->toBeTrue();
+});
+
+test('admin can update team', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('update', $this->team))->toBeTrue();
+});
+
+test('member cannot update team', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('update', $this->team))->toBeFalse();
+});
+
+// --- Team Policy: delete ---
+
+test('owner can delete team', function () {
+    $this->actingAs($this->owner);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('delete', $this->team))->toBeTrue();
+});
+
+test('admin can delete team', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('delete', $this->team))->toBeTrue();
+});
+
+test('member cannot delete team', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('delete', $this->team))->toBeFalse();
+});
+
+// --- Team Policy: manageMembers ---
+
+test('owner can manage team members', function () {
+    $this->actingAs($this->owner);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('manageMembers', $this->team))->toBeTrue();
+});
+
+test('admin can manage team members', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('manageMembers', $this->team))->toBeTrue();
+});
+
+test('member cannot manage team members', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('manageMembers', $this->team))->toBeFalse();
+});
+
+// --- Team Policy: manageInvitations ---
+
+test('owner can manage invitations', function () {
+    $this->actingAs($this->owner);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('manageInvitations', $this->team))->toBeTrue();
+});
+
+test('admin can manage invitations', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('manageInvitations', $this->team))->toBeTrue();
+});
+
+test('member cannot manage invitations', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('manageInvitations', $this->team))->toBeFalse();
+});
+
+// --- Team Index Livewire: update ---
+
+test('member cannot submit team settings via policy', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('update', $this->team))->toBeFalse();
+});
+
+// --- Team Index Livewire: delete ---
+
+test('member cannot delete team via index', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(TeamIndex::class)
+        ->call('delete', 'password')
+        ->assertDispatched('error');
+
+    expect(Team::find($this->team->id))->not->toBeNull();
+});
+
+test('admin can delete team via policy', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('delete', $this->team))->toBeTrue();
+});
+
+// --- Team Member Livewire: role changes ---
+
+test('member cannot change roles via team member component', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(TeamMember::class, ['member' => $this->admin])
+        ->call('makeAdmin')
+        ->assertDispatched('error');
+});
+
+test('member cannot remove team members', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    Livewire::test(TeamMember::class, ['member' => $this->admin])
+        ->call('remove')
+        ->assertDispatched('error');
+});
+
+// --- Invitations & Invite Link (policy checks — views wrapped in @can render empty for members) ---
+
+test('member cannot manage invitations via policy', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('manageInvitations', $this->team))->toBeFalse();
+});
+
+test('owner can manage invitations via policy', function () {
+    $this->actingAs($this->owner);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('manageInvitations', $this->team))->toBeTrue();
+});
+
+// --- Cross-team isolation ---
+
+test('user from different team cannot update team', function () {
+    $otherTeam = Team::factory()->create();
+    $otherUser = User::factory()->create();
+    $otherUser->teams()->attach($otherTeam, ['role' => 'owner']);
+
+    $this->actingAs($otherUser);
+    session(['currentTeam' => $otherTeam]);
+
+    expect(auth()->user()->can('update', $this->team))->toBeFalse();
+});
+
+test('user from different team cannot manage members', function () {
+    $otherTeam = Team::factory()->create();
+    $otherUser = User::factory()->create();
+    $otherUser->teams()->attach($otherTeam, ['role' => 'owner']);
+
+    $this->actingAs($otherUser);
+    session(['currentTeam' => $otherTeam]);
+
+    expect(auth()->user()->can('manageMembers', $this->team))->toBeFalse();
+});
+
+// --- Team Policy: view ---
+
+test('owner can view team', function () {
+    $this->actingAs($this->owner);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('view', $this->team))->toBeTrue();
+});
+
+test('admin can view team', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('view', $this->team))->toBeTrue();
+});
+
+test('member can view team', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('view', $this->team))->toBeTrue();
+});
+
+test('non-team member cannot view team', function () {
+    $outsider = User::factory()->create();
+    $this->actingAs($outsider);
+    session(['currentTeam' => $this->team]);
+
+    expect($outsider->can('view', $this->team))->toBeFalse();
+});
+
+// --- Team Policy: viewAdmin ---
+
+test('owner can view admin panel', function () {
+    $this->actingAs($this->owner);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('viewAdmin', $this->team))->toBeTrue();
+});
+
+test('admin can view admin panel', function () {
+    $this->actingAs($this->admin);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('viewAdmin', $this->team))->toBeTrue();
+});
+
+test('member cannot view admin panel', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(auth()->user()->can('viewAdmin', $this->team))->toBeFalse();
+});
+
+test('non-team member cannot view admin panel', function () {
+    $outsider = User::factory()->create();
+    $this->actingAs($outsider);
+    session(['currentTeam' => $this->team]);
+
+    expect($outsider->can('viewAdmin', $this->team))->toBeFalse();
+});
+
+// --- Non-team member isolation ---
+
+test('non-team member cannot update team', function () {
+    $outsider = User::factory()->create();
+    $this->actingAs($outsider);
+    session(['currentTeam' => $this->team]);
+
+    expect($outsider->can('update', $this->team))->toBeFalse();
+});
+
+test('non-team member cannot delete team', function () {
+    $outsider = User::factory()->create();
+    $this->actingAs($outsider);
+    session(['currentTeam' => $this->team]);
+
+    expect($outsider->can('delete', $this->team))->toBeFalse();
+});
+
+test('non-team member cannot manage members', function () {
+    $outsider = User::factory()->create();
+    $this->actingAs($outsider);
+    session(['currentTeam' => $this->team]);
+
+    expect($outsider->can('manageMembers', $this->team))->toBeFalse();
+});
+
+test('non-team member cannot manage invitations', function () {
+    $outsider = User::factory()->create();
+    $this->actingAs($outsider);
+    session(['currentTeam' => $this->team]);
+
+    expect($outsider->can('manageInvitations', $this->team))->toBeFalse();
+});
+
+// --- Team creation and model-level protection ---
+
+test('member can create a new independent team', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    $newTeam = Team::create([
+        'name' => 'New Team',
+        'description' => 'Created by member',
+        'personal_team' => false,
+    ]);
+
+    expect($newTeam)->toBeInstanceOf(Team::class)
+        ->and($newTeam->name)->toBe('New Team');
+});
+
+test('member cannot update an existing team at model level', function () {
+    $this->actingAs($this->member);
+    session(['currentTeam' => $this->team]);
+
+    expect(fn () => $this->team->update(['name' => 'Hacked']))
+        ->toThrow(\Exception::class, 'You are not allowed to update this team.');
+});
diff --git a/tests/Feature/CoolifyTaskRetryTest.php b/tests/Feature/CoolifyTaskRetryTest.php
deleted file mode 100644
index f46ced311..000000000
--- a/tests/Feature/CoolifyTaskRetryTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-use App\Jobs\CoolifyTask;
-use App\Models\Server;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Support\Facades\Queue;
-
-uses(RefreshDatabase::class);
-
-it('can dispatch CoolifyTask successfully', function () {
-    // Skip if no servers available
-    $server = Server::where('ip', '!=', '1.2.3.4')->first();
-
-    if (! $server) {
-        $this->markTestSkipped('No servers available for testing');
-    }
-
-    Queue::fake();
-
-    // Create an activity for the task
-    $activity = activity()
-        ->withProperties([
-            'server_uuid' => $server->uuid,
-            'command' => 'echo "test"',
-            'type' => 'inline',
-        ])
-        ->event('inline')
-        ->log('[]');
-
-    // Dispatch the job
-    CoolifyTask::dispatch(
-        activity: $activity,
-        ignore_errors: false,
-        call_event_on_finish: null,
-        call_event_data: null
-    );
-
-    // Assert job was dispatched
-    Queue::assertPushed(CoolifyTask::class);
-});
-
-it('has correct retry configuration on CoolifyTask', function () {
-    $server = Server::where('ip', '!=', '1.2.3.4')->first();
-
-    if (! $server) {
-        $this->markTestSkipped('No servers available for testing');
-    }
-
-    $activity = activity()
-        ->withProperties([
-            'server_uuid' => $server->uuid,
-            'command' => 'echo "test"',
-            'type' => 'inline',
-        ])
-        ->event('inline')
-        ->log('[]');
-
-    $job = new CoolifyTask(
-        activity: $activity,
-        ignore_errors: false,
-        call_event_on_finish: null,
-        call_event_data: null
-    );
-
-    // Assert retry configuration
-    expect($job->tries)->toBe(3);
-    expect($job->maxExceptions)->toBe(1);
-    expect($job->timeout)->toBe(600);
-    expect($job->backoff())->toBe([30, 90, 180]);
-});
diff --git a/tests/Feature/DatabaseBackupCreationApiTest.php b/tests/Feature/DatabaseBackupCreationApiTest.php
deleted file mode 100644
index 893141de3..000000000
--- a/tests/Feature/DatabaseBackupCreationApiTest.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-use App\Models\StandalonePostgresql;
-use App\Models\Team;
-use App\Models\User;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-
-uses(RefreshDatabase::class);
-
-beforeEach(function () {
-    // Create a team with owner
-    $this->team = Team::factory()->create();
-    $this->user = User::factory()->create();
-    $this->team->members()->attach($this->user->id, ['role' => 'owner']);
-
-    // Create an API token for the user
-    $this->token = $this->user->createToken('test-token', ['*'], $this->team->id);
-    $this->bearerToken = $this->token->plainTextToken;
-
-    // Mock a database - we'll use Mockery to avoid needing actual database setup
-    $this->database = \Mockery::mock(StandalonePostgresql::class);
-    $this->database->shouldReceive('getAttribute')->with('id')->andReturn(1);
-    $this->database->shouldReceive('getAttribute')->with('uuid')->andReturn('test-db-uuid');
-    $this->database->shouldReceive('getAttribute')->with('postgres_db')->andReturn('testdb');
-    $this->database->shouldReceive('type')->andReturn('standalone-postgresql');
-    $this->database->shouldReceive('getMorphClass')->andReturn('App\Models\StandalonePostgresql');
-});
-
-afterEach(function () {
-    \Mockery::close();
-});
-
-describe('POST /api/v1/databases/{uuid}/backups', function () {
-    test('creates backup configuration with minimal required fields', function () {
-        // This is a unit-style test using mocks to avoid database dependency
-        // For full integration testing, this should be run inside Docker
-
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer '.$this->bearerToken,
-            'Content-Type' => 'application/json',
-        ])->postJson('/api/v1/databases/test-db-uuid/backups', [
-            'frequency' => 'daily',
-        ]);
-
-        // Since we're mocking, this test verifies the endpoint exists and basic validation
-        // Full integration tests should be run in Docker environment
-        expect($response->status())->toBeIn([201, 404, 422]);
-    });
-
-    test('validates frequency is required', function () {
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer '.$this->bearerToken,
-            'Content-Type' => 'application/json',
-        ])->postJson('/api/v1/databases/test-db-uuid/backups', [
-            'enabled' => true,
-        ]);
-
-        $response->assertStatus(422);
-        $response->assertJsonValidationErrors(['frequency']);
-    });
-
-    test('validates s3_storage_uuid required when save_s3 is true', function () {
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer '.$this->bearerToken,
-            'Content-Type' => 'application/json',
-        ])->postJson('/api/v1/databases/test-db-uuid/backups', [
-            'frequency' => 'daily',
-            'save_s3' => true,
-        ]);
-
-        // Should fail validation because s3_storage_uuid is missing
-        expect($response->status())->toBeIn([404, 422]);
-    });
-
-    test('rejects invalid frequency format', function () {
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer '.$this->bearerToken,
-            'Content-Type' => 'application/json',
-        ])->postJson('/api/v1/databases/test-db-uuid/backups', [
-            'frequency' => 'invalid-frequency',
-        ]);
-
-        expect($response->status())->toBeIn([404, 422]);
-    });
-
-    test('rejects request without authentication', function () {
-        $response = $this->postJson('/api/v1/databases/test-db-uuid/backups', [
-            'frequency' => 'daily',
-        ]);
-
-        $response->assertStatus(401);
-    });
-
-    test('validates retention fields are integers with minimum 0', function () {
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer '.$this->bearerToken,
-            'Content-Type' => 'application/json',
-        ])->postJson('/api/v1/databases/test-db-uuid/backups', [
-            'frequency' => 'daily',
-            'database_backup_retention_amount_locally' => -1,
-        ]);
-
-        expect($response->status())->toBeIn([404, 422]);
-    });
-
-    test('accepts valid cron expressions', function () {
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer '.$this->bearerToken,
-            'Content-Type' => 'application/json',
-        ])->postJson('/api/v1/databases/test-db-uuid/backups', [
-            'frequency' => '0 2 * * *', // Daily at 2 AM
-        ]);
-
-        // Will fail with 404 because database doesn't exist, but validates the request format
-        expect($response->status())->toBeIn([201, 404, 422]);
-    });
-
-    test('accepts predefined frequency values', function () {
-        $frequencies = ['every_minute', 'hourly', 'daily', 'weekly', 'monthly', 'yearly'];
-
-        foreach ($frequencies as $frequency) {
-            $response = $this->withHeaders([
-                'Authorization' => 'Bearer '.$this->bearerToken,
-                'Content-Type' => 'application/json',
-            ])->postJson('/api/v1/databases/test-db-uuid/backups', [
-                'frequency' => $frequency,
-            ]);
-
-            // Will fail with 404 because database doesn't exist, but validates the request format
-            expect($response->status())->toBeIn([201, 404, 422]);
-        }
-    });
-
-    test('rejects extra fields not in allowed list', function () {
-        $response = $this->withHeaders([
-            'Authorization' => 'Bearer '.$this->bearerToken,
-            'Content-Type' => 'application/json',
-        ])->postJson('/api/v1/databases/test-db-uuid/backups', [
-            'frequency' => 'daily',
-            'invalid_field' => 'invalid_value',
-        ]);
-
-        expect($response->status())->toBeIn([404, 422]);
-    });
-});
diff --git a/tests/Feature/ConvertContainerEnvsToArray.php b/tests/Feature/EnvironmentVariable/ConvertContainerEnvsToArrayTest.php
similarity index 100%
rename from tests/Feature/ConvertContainerEnvsToArray.php
rename to tests/Feature/EnvironmentVariable/ConvertContainerEnvsToArrayTest.php
diff --git a/tests/Feature/EnvironmentVariableSharedSpacingTest.php b/tests/Feature/EnvironmentVariable/EnvironmentVariableSharedSpacingTest.php
similarity index 100%
rename from tests/Feature/EnvironmentVariableSharedSpacingTest.php
rename to tests/Feature/EnvironmentVariable/EnvironmentVariableSharedSpacingTest.php
diff --git a/tests/Feature/MultilineEnvironmentVariableTest.php b/tests/Feature/EnvironmentVariable/MultilineEnvironmentVariableTest.php
similarity index 100%
rename from tests/Feature/MultilineEnvironmentVariableTest.php
rename to tests/Feature/EnvironmentVariable/MultilineEnvironmentVariableTest.php
diff --git a/tests/Feature/ExecuteContainerCommandTest.php b/tests/Feature/ExecuteContainerCommandTest.php
deleted file mode 100644
index 6d485fe65..000000000
--- a/tests/Feature/ExecuteContainerCommandTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace Tests\Feature;
-
-use App\Models\Application;
-use App\Models\Server;
-use App\Models\User;
-use PHPUnit\Framework\Attributes\Test;
-use Tests\TestCase;
-use Tests\Traits\HandlesTestDatabase;
-
-class ExecuteContainerCommandTest extends TestCase
-{
-    use HandlesTestDatabase;
-
-    private $user;
-
-    private $team;
-
-    private $server;
-
-    private $application;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        // Only set up database for tests that need it
-        if ($this->shouldSetUpDatabase()) {
-            $this->setUpTestDatabase();
-        }
-        // Create test data
-        $this->user = User::factory()->create();
-        $this->team = $this->user->teams()->first();
-        $this->server = Server::factory()->create(['team_id' => $this->team->id]);
-        $this->application = Application::factory()->create();
-
-        // Login the user
-        $this->actingAs($this->user);
-    }
-
-    protected function tearDown(): void
-    {
-        if ($this->shouldSetUpDatabase()) {
-            $this->tearDownTestDatabase();
-        }
-        parent::tearDown();
-    }
-
-    private function shouldSetUpDatabase(): bool
-    {
-        return in_array($this->name(), [
-            'it_allows_valid_container_access',
-            'it_prevents_cross_server_container_access',
-        ]);
-    }
-}
diff --git a/tests/Feature/CloudInitScriptTest.php b/tests/Feature/Helpers/CloudInitScriptTest.php
similarity index 100%
rename from tests/Feature/CloudInitScriptTest.php
rename to tests/Feature/Helpers/CloudInitScriptTest.php
diff --git a/tests/Feature/ConvertArraysTest.php b/tests/Feature/Helpers/ConvertArraysTest.php
similarity index 100%
rename from tests/Feature/ConvertArraysTest.php
rename to tests/Feature/Helpers/ConvertArraysTest.php
diff --git a/tests/Feature/ConvertingGitUrlsTest.php b/tests/Feature/Helpers/ConvertingGitUrlsTest.php
similarity index 100%
rename from tests/Feature/ConvertingGitUrlsTest.php
rename to tests/Feature/Helpers/ConvertingGitUrlsTest.php
diff --git a/tests/Feature/DockerCustomCommandsTest.php b/tests/Feature/Helpers/DockerCustomCommandsTest.php
similarity index 100%
rename from tests/Feature/DockerCustomCommandsTest.php
rename to tests/Feature/Helpers/DockerCustomCommandsTest.php
diff --git a/tests/Feature/Utf8HandlingTest.php b/tests/Feature/Helpers/Utf8HandlingTest.php
similarity index 97%
rename from tests/Feature/Utf8HandlingTest.php
rename to tests/Feature/Helpers/Utf8HandlingTest.php
index 50a52c5b2..6b100b067 100644
--- a/tests/Feature/Utf8HandlingTest.php
+++ b/tests/Feature/Helpers/Utf8HandlingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Helpers;
 
 use Tests\TestCase;
 
diff --git a/tests/Feature/CheckTraefikVersionJobTest.php b/tests/Feature/Jobs/CheckTraefikVersionJobTest.php
similarity index 100%
rename from tests/Feature/CheckTraefikVersionJobTest.php
rename to tests/Feature/Jobs/CheckTraefikVersionJobTest.php
diff --git a/tests/Feature/CleanupRedisTest.php b/tests/Feature/Jobs/CleanupRedisTest.php
similarity index 100%
rename from tests/Feature/CleanupRedisTest.php
rename to tests/Feature/Jobs/CleanupRedisTest.php
diff --git a/tests/Feature/Jobs/CoolifyTaskRetryTest.php b/tests/Feature/Jobs/CoolifyTaskRetryTest.php
new file mode 100644
index 000000000..46e652051
--- /dev/null
+++ b/tests/Feature/Jobs/CoolifyTaskRetryTest.php
@@ -0,0 +1,65 @@
+<?php
+
+use App\Enums\ProcessStatus;
+use App\Jobs\CoolifyTask;
+use App\Models\Server;
+use App\Models\Team;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    $team = Team::factory()->create();
+    Server::factory()->create(['team_id' => $team->id]);
+
+    $this->activity = activity()
+        ->withProperties([
+            'server_uuid' => Server::first()->uuid,
+            'command' => 'echo "test"',
+            'type' => 'inline',
+            'status' => ProcessStatus::QUEUED->value,
+        ])
+        ->event('inline')
+        ->log('[]');
+
+    $this->job = new CoolifyTask(
+        activity: $this->activity,
+        ignore_errors: false,
+        call_event_on_finish: null,
+        call_event_data: null,
+    );
+});
+
+test('has correct retry configuration', function () {
+    expect($this->job->tries)->toBe(3)
+        ->and($this->job->maxExceptions)->toBe(1)
+        ->and($this->job->timeout)->toBe(600)
+        ->and($this->job->backoff())->toBe([30, 90, 180]);
+});
+
+test('is queued on the high priority queue', function () {
+    expect($this->job->queue)->toBe('high');
+});
+
+test('marks activity as error on permanent failure', function () {
+    $exception = new \RuntimeException('SSH connection failed');
+
+    $this->job->failed($exception);
+
+    $this->activity->refresh();
+    $properties = $this->activity->properties;
+
+    expect($properties['status'])->toBe(ProcessStatus::ERROR->value)
+        ->and($properties['error'])->toBe('SSH connection failed')
+        ->and($properties)->toHaveKey('failed_at');
+});
+
+test('marks activity as error with default message when exception is null', function () {
+    $this->job->failed(null);
+
+    $this->activity->refresh();
+    $properties = $this->activity->properties;
+
+    expect($properties['status'])->toBe(ProcessStatus::ERROR->value)
+        ->and($properties['error'])->toBe('Job permanently failed');
+});
diff --git a/tests/Feature/DatabaseBackupJobTest.php b/tests/Feature/Jobs/DatabaseBackupJobTest.php
similarity index 100%
rename from tests/Feature/DatabaseBackupJobTest.php
rename to tests/Feature/Jobs/DatabaseBackupJobTest.php
diff --git a/tests/Feature/PushServerUpdateJobTest.php b/tests/Feature/Jobs/PushServerUpdateJobTest.php
similarity index 100%
rename from tests/Feature/PushServerUpdateJobTest.php
rename to tests/Feature/Jobs/PushServerUpdateJobTest.php
diff --git a/tests/Feature/ScheduledJobManagerStaleLockTest.php b/tests/Feature/Jobs/ScheduledJobManagerStaleLockTest.php
similarity index 100%
rename from tests/Feature/ScheduledJobManagerStaleLockTest.php
rename to tests/Feature/Jobs/ScheduledJobManagerStaleLockTest.php
diff --git a/tests/Feature/StartupExecutionCleanupTest.php b/tests/Feature/Jobs/StartupExecutionCleanupTest.php
similarity index 100%
rename from tests/Feature/StartupExecutionCleanupTest.php
rename to tests/Feature/Jobs/StartupExecutionCleanupTest.php
diff --git a/tests/Feature/LoginRateLimitIPTest.php b/tests/Feature/LoginRateLimitIPTest.php
deleted file mode 100644
index 6200870a1..000000000
--- a/tests/Feature/LoginRateLimitIPTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-it('tests login rate limiting with different IPs like the Python script', function () {
-    // Create a test route that mimics login behavior
-    // We'll directly test the rate limiter behavior
-
-    $baseUrl = '/login';
-    $email = 'grumpinout+admin@wearehackerone.com';
-
-    // First, get a CSRF token by visiting the login page
-    $loginPageResponse = $this->get($baseUrl);
-    $loginPageResponse->assertSuccessful();
-
-    // Extract CSRF token using regex similar to Python script
-    preg_match('/name="_token"\s+value="([^"]+)"/', $loginPageResponse->getContent(), $matches);
-    $token = $matches[1] ?? null;
-
-    expect($token)->not->toBeNull('CSRF token should be found');
-
-    // Test 14 login attempts with different IPs (like the Python script does 1-14)
-    $results = [];
-    for ($i = 1; $i <= 14; $i++) {
-        $spoofedIp = "198.51.100.{$i}";
-
-        $response = $this->withHeader('X-Forwarded-For', $spoofedIp)
-            ->post($baseUrl, [
-                '_token' => $token,
-                'email' => $email,
-                'password' => "WrongPass{$i}!",
-            ]);
-
-        $statusCode = $response->getStatusCode();
-        $rateLimitLimit = $response->headers->get('X-RateLimit-Limit');
-        $rateLimitRemaining = $response->headers->get('X-RateLimit-Remaining');
-
-        $results[$i] = [
-            'ip' => $spoofedIp,
-            'status' => $statusCode,
-            'rate_limit' => $rateLimitLimit,
-            'rate_limit_remaining' => $rateLimitRemaining,
-        ];
-
-        // Print output similar to Python script
-        echo 'Attempt '.str_pad($i, 2, '0', STR_PAD_LEFT).": status=$statusCode, RL=$rateLimitLimit/$rateLimitRemaining\n";
-
-        // Add a small delay like the Python script (0.2 seconds)
-        usleep(200000);
-    }
-
-    // Verify results
-    expect($results)->toHaveCount(14);
-
-    // Check that we got responses for all attempts
-    foreach ($results as $i => $result) {
-        expect($result['status'])->toBeGreaterThanOrEqual(200);
-        expect($result['ip'])->toBe("198.51.100.{$i}");
-    }
-});
diff --git a/tests/Feature/Proxy/RestartProxyTest.php b/tests/Feature/Proxy/RestartProxyTest.php
index 5771a58f7..2c30c9835 100644
--- a/tests/Feature/Proxy/RestartProxyTest.php
+++ b/tests/Feature/Proxy/RestartProxyTest.php
@@ -1,139 +1,90 @@
 <?php
 
-namespace Tests\Feature\Proxy;
-
-use App\Jobs\RestartProxyJob;
+use App\Models\InstanceSettings;
 use App\Models\Server;
 use App\Models\Team;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Support\Facades\Queue;
 use Livewire\Livewire;
-use Tests\TestCase;
 
-class RestartProxyTest extends TestCase
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::create(['id' => 0]);
+});
+
+function setupProxyUser(string $role): array
 {
-    use RefreshDatabase;
+    $team = Team::factory()->create();
+    $user = User::factory()->create();
+    $user->teams()->attach($team, ['role' => $role]);
 
-    protected User $user;
+    $server = Server::factory()->create([
+        'team_id' => $team->id,
+        'name' => 'Test Server',
+        'ip' => '192.168.1.100',
+    ]);
 
-    protected Team $team;
-
-    protected Server $server;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        // Create test user and team
-        $this->user = User::factory()->create();
-        $this->team = Team::factory()->create(['name' => 'Test Team']);
-        $this->user->teams()->attach($this->team);
-
-        // Create test server
-        $this->server = Server::factory()->create([
-            'team_id' => $this->team->id,
-            'name' => 'Test Server',
-            'ip' => '192.168.1.100',
-        ]);
-
-        // Authenticate user
-        $this->actingAs($this->user);
-    }
-
-    public function test_restart_dispatches_job_for_all_servers()
-    {
-        Queue::fake();
-
-        Livewire::test('server.navbar', ['server' => $this->server])
-            ->call('restart');
-
-        // Assert job was dispatched
-        Queue::assertPushed(RestartProxyJob::class, function ($job) {
-            return $job->server->id === $this->server->id;
-        });
-    }
-
-    public function test_restart_dispatches_job_for_localhost_server()
-    {
-        Queue::fake();
-
-        // Create localhost server (id = 0)
-        $localhostServer = Server::factory()->create([
-            'id' => 0,
-            'team_id' => $this->team->id,
-            'name' => 'Localhost',
-            'ip' => 'host.docker.internal',
-        ]);
-
-        Livewire::test('server.navbar', ['server' => $localhostServer])
-            ->call('restart');
-
-        // Assert job was dispatched
-        Queue::assertPushed(RestartProxyJob::class, function ($job) use ($localhostServer) {
-            return $job->server->id === $localhostServer->id;
-        });
-    }
-
-    public function test_restart_shows_info_message()
-    {
-        Queue::fake();
-
-        Livewire::test('server.navbar', ['server' => $this->server])
-            ->call('restart')
-            ->assertDispatched('info', 'Proxy restart initiated. Monitor progress in activity logs.');
-    }
-
-    public function test_unauthorized_user_cannot_restart_proxy()
-    {
-        Queue::fake();
-
-        // Create another user without access
-        $unauthorizedUser = User::factory()->create();
-        $this->actingAs($unauthorizedUser);
-
-        Livewire::test('server.navbar', ['server' => $this->server])
-            ->call('restart')
-            ->assertForbidden();
-
-        // Assert job was NOT dispatched
-        Queue::assertNotPushed(RestartProxyJob::class);
-    }
-
-    public function test_restart_prevents_concurrent_jobs_via_without_overlapping()
-    {
-        Queue::fake();
-
-        // Dispatch job twice
-        Livewire::test('server.navbar', ['server' => $this->server])
-            ->call('restart');
-
-        Livewire::test('server.navbar', ['server' => $this->server])
-            ->call('restart');
-
-        // Assert job was pushed twice (WithoutOverlapping middleware will handle deduplication)
-        Queue::assertPushed(RestartProxyJob::class, 2);
-
-        // Get the jobs
-        $jobs = Queue::pushed(RestartProxyJob::class);
-
-        // Verify both jobs have WithoutOverlapping middleware
-        foreach ($jobs as $job) {
-            $middleware = $job['job']->middleware();
-            $this->assertCount(1, $middleware);
-            $this->assertInstanceOf(\Illuminate\Queue\Middleware\WithoutOverlapping::class, $middleware[0]);
-        }
-    }
-
-    public function test_restart_uses_server_team_id()
-    {
-        Queue::fake();
-
-        Livewire::test('server.navbar', ['server' => $this->server])
-            ->call('restart');
-
-        Queue::assertPushed(RestartProxyJob::class, function ($job) {
-            return $job->server->team_id === $this->team->id;
-        });
-    }
+    return [$user, $team, $server];
 }
+
+function makeServerProxyRunning(Server $server): void
+{
+    $server->settings()->update([
+        'is_reachable' => true,
+        'is_usable' => true,
+    ]);
+    $server->proxy->status = 'running';
+    $server->proxy->type = \App\Enums\ProxyTypes::TRAEFIK->value;
+    $server->save();
+    $server->refresh();
+}
+
+test('member cannot see proxy restart and stop buttons', function () {
+    [$user, $team, $server] = setupProxyUser('member');
+    makeServerProxyRunning($server);
+
+    // Mock proxySet to bypass SQLite boolean casting issue with force_disabled
+    $mock = Mockery::mock($server)->makePartial();
+    $mock->shouldReceive('proxySet')->andReturn(true);
+
+    $this->actingAs($user);
+    session(['currentTeam' => $team]);
+
+    Livewire::test('server.navbar', ['server' => $mock])
+        ->assertDontSee('Restart Proxy')
+        ->assertDontSee('Stop Proxy');
+});
+
+test('admin can see proxy restart and stop buttons', function () {
+    [$user, $team, $server] = setupProxyUser('admin');
+    makeServerProxyRunning($server);
+
+    $mock = Mockery::mock($server)->makePartial();
+    $mock->shouldReceive('proxySet')->andReturn(true);
+
+    $this->actingAs($user);
+    session(['currentTeam' => $team]);
+
+    Livewire::test('server.navbar', ['server' => $mock])
+        ->assertSee('Restart Proxy')
+        ->assertSee('Stop Proxy');
+});
+
+test('member cannot see start proxy button', function () {
+    [$user, $team, $server] = setupProxyUser('member');
+
+    $server->proxy->status = 'exited';
+    $server->proxy->type = \App\Enums\ProxyTypes::TRAEFIK->value;
+    $server->save();
+    $server->refresh();
+
+    $mock = Mockery::mock($server)->makePartial();
+    $mock->shouldReceive('proxySet')->andReturn(true);
+
+    $this->actingAs($user);
+    session(['currentTeam' => $team]);
+
+    Livewire::test('server.navbar', ['server' => $mock])
+        ->assertDontSee('Start Proxy');
+});
diff --git a/tests/Feature/Security/ApiTokenCreationSecurityTest.php b/tests/Feature/Security/ApiTokenCreationSecurityTest.php
new file mode 100644
index 000000000..0e5d363de
--- /dev/null
+++ b/tests/Feature/Security/ApiTokenCreationSecurityTest.php
@@ -0,0 +1,166 @@
+<?php
+
+use App\Livewire\Security\ApiTokens;
+use App\Models\InstanceSettings;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0], ['is_api_enabled' => true]);
+
+    $this->team = Team::factory()->create();
+
+    $this->owner = User::factory()->create();
+    $this->owner->teams()->attach($this->team, ['role' => 'owner']);
+
+    $this->member = User::factory()->create();
+    $this->member->teams()->attach($this->team, ['role' => 'member']);
+});
+
+describe('Livewire ApiTokens — member cannot create elevated tokens', function () {
+    test('member cannot create token with root permissions', function () {
+        $this->actingAs($this->member);
+        session(['currentTeam' => $this->team]);
+
+        Livewire::test(ApiTokens::class)
+            ->set('description', 'my-root-token')
+            ->set('permissions', ['root'])
+            ->call('addNewToken')
+            ->assertDispatched('error');
+
+        expect($this->member->tokens()->count())->toBe(0);
+    });
+
+    test('member cannot create token with write permissions', function () {
+        $this->actingAs($this->member);
+        session(['currentTeam' => $this->team]);
+
+        Livewire::test(ApiTokens::class)
+            ->set('description', 'my-write-token')
+            ->set('permissions', ['write'])
+            ->call('addNewToken')
+            ->assertDispatched('error');
+
+        expect($this->member->tokens()->count())->toBe(0);
+    });
+
+    test('member cannot create token with deploy permissions', function () {
+        $this->actingAs($this->member);
+        session(['currentTeam' => $this->team]);
+
+        Livewire::test(ApiTokens::class)
+            ->set('description', 'my-deploy-token')
+            ->set('permissions', ['deploy'])
+            ->call('addNewToken')
+            ->assertDispatched('error');
+
+        expect($this->member->tokens()->count())->toBe(0);
+    });
+
+    test('member cannot create token with read:sensitive permissions', function () {
+        $this->actingAs($this->member);
+        session(['currentTeam' => $this->team]);
+
+        Livewire::test(ApiTokens::class)
+            ->set('description', 'my-sensitive-token')
+            ->set('permissions', ['read', 'read:sensitive'])
+            ->call('addNewToken')
+            ->assertDispatched('error');
+
+        expect($this->member->tokens()->count())->toBe(0);
+    });
+
+    test('member cannot bypass by setting canUseRootPermissions property', function () {
+        $this->actingAs($this->member);
+        session(['currentTeam' => $this->team]);
+
+        // Simulate snapshot replay: force the boolean to true
+        Livewire::test(ApiTokens::class)
+            ->set('canUseRootPermissions', true)
+            ->set('description', 'sneaky-root-token')
+            ->set('permissions', ['root'])
+            ->call('addNewToken')
+            ->assertDispatched('error');
+
+        expect($this->member->tokens()->count())->toBe(0);
+    });
+
+    test('member can create token with read permissions', function () {
+        $this->actingAs($this->member);
+        session(['currentTeam' => $this->team]);
+
+        Livewire::test(ApiTokens::class)
+            ->set('description', 'my-read-token')
+            ->set('permissions', ['read'])
+            ->call('addNewToken')
+            ->assertNotDispatched('error');
+
+        expect($this->member->tokens()->count())->toBe(1);
+        expect($this->member->tokens()->first()->abilities)->toBe(['read']);
+    });
+
+    test('owner can create token with root permissions', function () {
+        $this->actingAs($this->owner);
+        session(['currentTeam' => $this->team]);
+
+        Livewire::test(ApiTokens::class)
+            ->set('description', 'my-root-token')
+            ->set('permissions', ['root'])
+            ->call('addNewToken')
+            ->assertNotDispatched('error');
+
+        expect($this->owner->tokens()->count())->toBe(1);
+        expect($this->owner->tokens()->first()->abilities)->toBe(['root']);
+    });
+});
+
+describe('ApiAbility middleware — member with elevated token blocked', function () {
+    test('member root token is blocked on team_id=0 (root team)', function () {
+        // Create root team with id=0
+        $rootTeam = Team::factory()->create(['id' => 0]);
+        $member = User::factory()->create();
+        $rootTeam->members()->attach($member->id, ['role' => 'member']);
+
+        session(['currentTeam' => $rootTeam]);
+        $token = $member->createToken('root-token', ['root']);
+
+        $this->withToken($token->plainTextToken)
+            ->getJson('/api/v1/projects')
+            ->assertStatus(403);
+    });
+
+    test('admin root token passes on team_id=0 (root team)', function () {
+        $rootTeam = Team::factory()->create(['id' => 0]);
+        $admin = User::factory()->create();
+        $rootTeam->members()->attach($admin->id, ['role' => 'admin']);
+
+        session(['currentTeam' => $rootTeam]);
+        $token = $admin->createToken('root-token', ['root']);
+
+        $this->withToken($token->plainTextToken)
+            ->getJson('/api/v1/projects')
+            ->assertSuccessful();
+    });
+
+    test('member root token is blocked on non-zero team', function () {
+        session(['currentTeam' => $this->team]);
+        $token = $this->member->createToken('root-token', ['root']);
+
+        $this->withToken($token->plainTextToken)
+            ->getJson('/api/v1/projects')
+            ->assertStatus(403);
+    });
+
+    test('member read token passes on non-zero team', function () {
+        session(['currentTeam' => $this->team]);
+        $token = $this->member->createToken('read-token', ['read']);
+
+        $this->withToken($token->plainTextToken)
+            ->getJson('/api/v1/projects')
+            ->assertSuccessful();
+    });
+});
diff --git a/tests/Feature/CaCertificateCommandInjectionTest.php b/tests/Feature/Security/CaCertificateCommandInjectionTest.php
similarity index 100%
rename from tests/Feature/CaCertificateCommandInjectionTest.php
rename to tests/Feature/Security/CaCertificateCommandInjectionTest.php
diff --git a/tests/Feature/CmdHealthCheckValidationTest.php b/tests/Feature/Security/CmdHealthCheckValidationTest.php
similarity index 100%
rename from tests/Feature/CmdHealthCheckValidationTest.php
rename to tests/Feature/Security/CmdHealthCheckValidationTest.php
diff --git a/tests/Feature/CommandInjectionSecurityTest.php b/tests/Feature/Security/CommandInjectionSecurityTest.php
similarity index 100%
rename from tests/Feature/CommandInjectionSecurityTest.php
rename to tests/Feature/Security/CommandInjectionSecurityTest.php
diff --git a/tests/Feature/IpAllowlistTest.php b/tests/Feature/Security/IpAllowlistTest.php
similarity index 100%
rename from tests/Feature/IpAllowlistTest.php
rename to tests/Feature/Security/IpAllowlistTest.php
diff --git a/tests/Feature/TrustHostsMiddlewareTest.php b/tests/Feature/Security/TrustHostsMiddlewareTest.php
similarity index 100%
rename from tests/Feature/TrustHostsMiddlewareTest.php
rename to tests/Feature/Security/TrustHostsMiddlewareTest.php
diff --git a/tests/Feature/HetznerServerCreationTest.php b/tests/Feature/Server/HetznerServerCreationTest.php
similarity index 100%
rename from tests/Feature/HetznerServerCreationTest.php
rename to tests/Feature/Server/HetznerServerCreationTest.php
diff --git a/tests/Feature/SentinelUpdateCheckIndependenceTest.php b/tests/Feature/Server/SentinelUpdateCheckIndependenceTest.php
similarity index 100%
rename from tests/Feature/SentinelUpdateCheckIndependenceTest.php
rename to tests/Feature/Server/SentinelUpdateCheckIndependenceTest.php
diff --git a/tests/Feature/ServerIpUniquenessTest.php b/tests/Feature/Server/ServerIpUniquenessTest.php
similarity index 100%
rename from tests/Feature/ServerIpUniquenessTest.php
rename to tests/Feature/Server/ServerIpUniquenessTest.php
diff --git a/tests/Feature/ServerPatchCheckNotificationTest.php b/tests/Feature/Server/ServerPatchCheckNotificationTest.php
similarity index 100%
rename from tests/Feature/ServerPatchCheckNotificationTest.php
rename to tests/Feature/Server/ServerPatchCheckNotificationTest.php
diff --git a/tests/Feature/ServerSettingSentinelRestartTest.php b/tests/Feature/Server/ServerSettingSentinelRestartTest.php
similarity index 100%
rename from tests/Feature/ServerSettingSentinelRestartTest.php
rename to tests/Feature/Server/ServerSettingSentinelRestartTest.php
diff --git a/tests/Feature/ServerSettingWasChangedTest.php b/tests/Feature/Server/ServerSettingWasChangedTest.php
similarity index 100%
rename from tests/Feature/ServerSettingWasChangedTest.php
rename to tests/Feature/Server/ServerSettingWasChangedTest.php
diff --git a/tests/Feature/ServerStorageCheckIndependenceTest.php b/tests/Feature/Server/ServerStorageCheckIndependenceTest.php
similarity index 100%
rename from tests/Feature/ServerStorageCheckIndependenceTest.php
rename to tests/Feature/Server/ServerStorageCheckIndependenceTest.php
diff --git a/tests/Feature/ServiceDatabaseTeamTest.php b/tests/Feature/Service/ServiceDatabaseTeamTest.php
similarity index 100%
rename from tests/Feature/ServiceDatabaseTeamTest.php
rename to tests/Feature/Service/ServiceDatabaseTeamTest.php
diff --git a/tests/Feature/ServiceFqdnUpdatePathTest.php b/tests/Feature/Service/ServiceFqdnUpdatePathTest.php
similarity index 100%
rename from tests/Feature/ServiceFqdnUpdatePathTest.php
rename to tests/Feature/Service/ServiceFqdnUpdatePathTest.php
diff --git a/tests/Feature/StartDatabaseProxyTest.php b/tests/Feature/Service/StartDatabaseProxyTest.php
similarity index 100%
rename from tests/Feature/StartDatabaseProxyTest.php
rename to tests/Feature/Service/StartDatabaseProxyTest.php
diff --git a/tests/Feature/ScheduledJobMonitoringTest.php b/tests/Feature/Team/ScheduledJobMonitoringTest.php
similarity index 100%
rename from tests/Feature/ScheduledJobMonitoringTest.php
rename to tests/Feature/Team/ScheduledJobMonitoringTest.php
diff --git a/tests/Feature/Team/TeamDeletionTest.php b/tests/Feature/Team/TeamDeletionTest.php
new file mode 100644
index 000000000..65d6c54f1
--- /dev/null
+++ b/tests/Feature/Team/TeamDeletionTest.php
@@ -0,0 +1,54 @@
+<?php
+
+use App\Livewire\Team\Index;
+use App\Models\InstanceSettings;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Livewire\Livewire;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::updateOrCreate(['id' => 0]);
+
+    $this->owner = User::factory()->create();
+
+    // The owner's personal team (created by factory)
+    $this->personalTeam = $this->owner->teams()->first();
+    $this->owner->teams()->updateExistingPivot($this->personalTeam->id, ['role' => 'owner']);
+
+    // A second team to delete
+    $this->teamToDelete = Team::create(['name' => 'Deletable Team', 'personal_team' => false]);
+    $this->teamToDelete->members()->attach($this->owner->id, ['role' => 'owner']);
+});
+
+test('deleting a team switches session to another team without error', function () {
+    $this->actingAs($this->owner);
+    session(['currentTeam' => $this->teamToDelete]);
+
+    Livewire::test(Index::class)
+        ->call('delete')
+        ->assertRedirect(route('team.index'));
+
+    // Team should be deleted from the database
+    expect(Team::find($this->teamToDelete->id))->toBeNull();
+
+    // Session should now have the personal team
+    $sessionTeam = session('currentTeam');
+    expect($sessionTeam)->not->toBeNull()
+        ->and($sessionTeam->id)->toBe($this->personalTeam->id);
+});
+
+test('refreshSession clears session when no team exists', function () {
+    $user = User::factory()->create();
+    // Detach all teams so user has none
+    $user->teams()->detach();
+    $this->actingAs($user);
+    session(['currentTeam' => null]);
+
+    // Should not throw when no team can be resolved
+    refreshSession(null);
+
+    expect(session('currentTeam'))->toBeNull();
+});
diff --git a/tests/Feature/TeamInvitationEmailNormalizationTest.php b/tests/Feature/Team/TeamInvitationEmailNormalizationTest.php
similarity index 100%
rename from tests/Feature/TeamInvitationEmailNormalizationTest.php
rename to tests/Feature/Team/TeamInvitationEmailNormalizationTest.php
diff --git a/tests/Feature/TeamInvitationPrivilegeEscalationTest.php b/tests/Feature/Team/TeamInvitationPrivilegeEscalationTest.php
similarity index 100%
rename from tests/Feature/TeamInvitationPrivilegeEscalationTest.php
rename to tests/Feature/Team/TeamInvitationPrivilegeEscalationTest.php
diff --git a/tests/Feature/TeamNotificationCheckTest.php b/tests/Feature/Team/TeamNotificationCheckTest.php
similarity index 100%
rename from tests/Feature/TeamNotificationCheckTest.php
rename to tests/Feature/Team/TeamNotificationCheckTest.php
diff --git a/tests/Feature/TeamPolicyTest.php b/tests/Feature/TeamPolicyTest.php
deleted file mode 100644
index d6a65e231..000000000
--- a/tests/Feature/TeamPolicyTest.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-
-use App\Models\Team;
-use App\Models\User;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-
-uses(RefreshDatabase::class);
-
-beforeEach(function () {
-    // Create a team with owner, admin, and member
-    $this->team = Team::factory()->create();
-
-    $this->owner = User::factory()->create();
-    $this->admin = User::factory()->create();
-    $this->member = User::factory()->create();
-
-    $this->team->members()->attach($this->owner->id, ['role' => 'owner']);
-    $this->team->members()->attach($this->admin->id, ['role' => 'admin']);
-    $this->team->members()->attach($this->member->id, ['role' => 'member']);
-});
-
-describe('update permission', function () {
-    test('owner can update team', function () {
-        $this->actingAs($this->owner);
-        session(['currentTeam' => $this->team]);
-        expect($this->owner->can('update', $this->team))->toBeTrue();
-    });
-
-    test('admin can update team', function () {
-        $this->actingAs($this->admin);
-        session(['currentTeam' => $this->team]);
-        expect($this->admin->can('update', $this->team))->toBeTrue();
-    });
-
-    test('member cannot update team', function () {
-        $this->actingAs($this->member);
-        session(['currentTeam' => $this->team]);
-        expect($this->member->can('update', $this->team))->toBeFalse();
-    });
-
-    test('non-team member cannot update team', function () {
-        $outsider = User::factory()->create();
-        $this->actingAs($outsider);
-        session(['currentTeam' => $this->team]);
-        expect($outsider->can('update', $this->team))->toBeFalse();
-    });
-});
-
-describe('delete permission', function () {
-    test('owner can delete team', function () {
-        $this->actingAs($this->owner);
-        session(['currentTeam' => $this->team]);
-        expect($this->owner->can('delete', $this->team))->toBeTrue();
-    });
-
-    test('admin can delete team', function () {
-        $this->actingAs($this->admin);
-        session(['currentTeam' => $this->team]);
-        expect($this->admin->can('delete', $this->team))->toBeTrue();
-    });
-
-    test('member cannot delete team', function () {
-        $this->actingAs($this->member);
-        session(['currentTeam' => $this->team]);
-        expect($this->member->can('delete', $this->team))->toBeFalse();
-    });
-
-    test('non-team member cannot delete team', function () {
-        $outsider = User::factory()->create();
-        $this->actingAs($outsider);
-        session(['currentTeam' => $this->team]);
-        expect($outsider->can('delete', $this->team))->toBeFalse();
-    });
-});
-
-describe('manageMembers permission', function () {
-    test('owner can manage members', function () {
-        $this->actingAs($this->owner);
-        session(['currentTeam' => $this->team]);
-        expect($this->owner->can('manageMembers', $this->team))->toBeTrue();
-    });
-
-    test('admin can manage members', function () {
-        $this->actingAs($this->admin);
-        session(['currentTeam' => $this->team]);
-        expect($this->admin->can('manageMembers', $this->team))->toBeTrue();
-    });
-
-    test('member cannot manage members', function () {
-        $this->actingAs($this->member);
-        session(['currentTeam' => $this->team]);
-        expect($this->member->can('manageMembers', $this->team))->toBeFalse();
-    });
-
-    test('non-team member cannot manage members', function () {
-        $outsider = User::factory()->create();
-        $this->actingAs($outsider);
-        session(['currentTeam' => $this->team]);
-        expect($outsider->can('manageMembers', $this->team))->toBeFalse();
-    });
-});
-
-describe('viewAdmin permission', function () {
-    test('owner can view admin panel', function () {
-        $this->actingAs($this->owner);
-        session(['currentTeam' => $this->team]);
-        expect($this->owner->can('viewAdmin', $this->team))->toBeTrue();
-    });
-
-    test('admin can view admin panel', function () {
-        $this->actingAs($this->admin);
-        session(['currentTeam' => $this->team]);
-        expect($this->admin->can('viewAdmin', $this->team))->toBeTrue();
-    });
-
-    test('member cannot view admin panel', function () {
-        $this->actingAs($this->member);
-        session(['currentTeam' => $this->team]);
-        expect($this->member->can('viewAdmin', $this->team))->toBeFalse();
-    });
-
-    test('non-team member cannot view admin panel', function () {
-        $outsider = User::factory()->create();
-        $this->actingAs($outsider);
-        session(['currentTeam' => $this->team]);
-        expect($outsider->can('viewAdmin', $this->team))->toBeFalse();
-    });
-});
-
-describe('manageInvitations permission (privilege escalation fix)', function () {
-    test('owner can manage invitations', function () {
-        $this->actingAs($this->owner);
-        session(['currentTeam' => $this->team]);
-        expect($this->owner->can('manageInvitations', $this->team))->toBeTrue();
-    });
-
-    test('admin can manage invitations', function () {
-        $this->actingAs($this->admin);
-        session(['currentTeam' => $this->team]);
-        expect($this->admin->can('manageInvitations', $this->team))->toBeTrue();
-    });
-
-    test('member cannot manage invitations (SECURITY FIX)', function () {
-        // This test verifies the privilege escalation vulnerability is fixed
-        // Previously, members could see and manage admin invitations
-        $this->actingAs($this->member);
-        session(['currentTeam' => $this->team]);
-        expect($this->member->can('manageInvitations', $this->team))->toBeFalse();
-    });
-
-    test('non-team member cannot manage invitations', function () {
-        $outsider = User::factory()->create();
-        $this->actingAs($outsider);
-        session(['currentTeam' => $this->team]);
-        expect($outsider->can('manageInvitations', $this->team))->toBeFalse();
-    });
-});
-
-describe('view permission', function () {
-    test('owner can view team', function () {
-        $this->actingAs($this->owner);
-        session(['currentTeam' => $this->team]);
-        expect($this->owner->can('view', $this->team))->toBeTrue();
-    });
-
-    test('admin can view team', function () {
-        $this->actingAs($this->admin);
-        session(['currentTeam' => $this->team]);
-        expect($this->admin->can('view', $this->team))->toBeTrue();
-    });
-
-    test('member can view team', function () {
-        $this->actingAs($this->member);
-        session(['currentTeam' => $this->team]);
-        expect($this->member->can('view', $this->team))->toBeTrue();
-    });
-
-    test('non-team member cannot view team', function () {
-        $outsider = User::factory()->create();
-        $this->actingAs($outsider);
-        session(['currentTeam' => $this->team]);
-        expect($outsider->can('view', $this->team))->toBeFalse();
-    });
-});
diff --git a/tests/Pest.php b/tests/Pest.php
index cec77b86f..67bcbda81 100644
--- a/tests/Pest.php
+++ b/tests/Pest.php
@@ -31,6 +31,15 @@ beforeEach(function () {
     Server::flushIdentityMap();
 });
 
+function loginAndSkipBoarding(string $email = 'test@example.com', string $password = 'password'): mixed
+{
+    return visit('/login')
+        ->fill('email', $email)
+        ->fill('password', $password)
+        ->click('Login')
+        ->click('Skip Setup');
+}
+
 /*
 |--------------------------------------------------------------------------
 | Expectations
diff --git a/tests/Unit/Policies/ApiTokenPolicyTest.php b/tests/Unit/Policies/ApiTokenPolicyTest.php
new file mode 100644
index 000000000..98c60aae8
--- /dev/null
+++ b/tests/Unit/Policies/ApiTokenPolicyTest.php
@@ -0,0 +1,193 @@
+<?php
+
+use App\Models\User;
+use App\Policies\ApiTokenPolicy;
+use Laravel\Sanctum\PersonalAccessToken;
+
+it('allows any user to view any api tokens', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->viewAny($user))->toBeTrue();
+});
+
+it('allows any user to create api tokens', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->create($user))->toBeTrue();
+});
+
+it('allows any user to manage api tokens', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->manage($user))->toBeTrue();
+});
+
+it('allows owner to view their own api token', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->id = 1;
+
+    $token = Mockery::mock(PersonalAccessToken::class)->makePartial();
+    $token->tokenable_id = 1;
+    $token->tokenable_type = User::class;
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->view($user, $token))->toBeTrue();
+});
+
+it('denies non-owner from viewing api token', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->id = 2;
+
+    $token = Mockery::mock(PersonalAccessToken::class)->makePartial();
+    $token->tokenable_id = 1;
+    $token->tokenable_type = User::class;
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->view($user, $token))->toBeFalse();
+});
+
+it('allows owner to update their own api token', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->id = 1;
+
+    $token = Mockery::mock(PersonalAccessToken::class)->makePartial();
+    $token->tokenable_id = 1;
+    $token->tokenable_type = User::class;
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->update($user, $token))->toBeTrue();
+});
+
+it('denies non-owner from updating api token', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->id = 2;
+
+    $token = Mockery::mock(PersonalAccessToken::class)->makePartial();
+    $token->tokenable_id = 1;
+    $token->tokenable_type = User::class;
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->update($user, $token))->toBeFalse();
+});
+
+it('allows owner to delete their own api token', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->id = 1;
+
+    $token = Mockery::mock(PersonalAccessToken::class)->makePartial();
+    $token->tokenable_id = 1;
+    $token->tokenable_type = User::class;
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->delete($user, $token))->toBeTrue();
+});
+
+it('denies non-owner from deleting api token', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->id = 2;
+
+    $token = Mockery::mock(PersonalAccessToken::class)->makePartial();
+    $token->tokenable_id = 1;
+    $token->tokenable_type = User::class;
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->delete($user, $token))->toBeFalse();
+});
+
+it('allows admin to use root permissions', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->useRootPermissions($user))->toBeTrue();
+});
+
+it('allows owner to use root permissions', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+    $user->shouldReceive('isOwner')->andReturn(true);
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->useRootPermissions($user))->toBeTrue();
+});
+
+it('denies member from using root permissions', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+    $user->shouldReceive('isOwner')->andReturn(false);
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->useRootPermissions($user))->toBeFalse();
+});
+
+it('allows admin to use write permissions', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->useWritePermissions($user))->toBeTrue();
+});
+
+it('denies member from using write permissions', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+    $user->shouldReceive('isOwner')->andReturn(false);
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->useWritePermissions($user))->toBeFalse();
+});
+
+it('allows admin to use deploy permissions', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->useDeployPermissions($user))->toBeTrue();
+});
+
+it('allows owner to use deploy permissions', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+    $user->shouldReceive('isOwner')->andReturn(true);
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->useDeployPermissions($user))->toBeTrue();
+});
+
+it('denies member from using deploy permissions', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+    $user->shouldReceive('isOwner')->andReturn(false);
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->useDeployPermissions($user))->toBeFalse();
+});
+
+it('allows admin to use sensitive permissions', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->useSensitivePermissions($user))->toBeTrue();
+});
+
+it('allows owner to use sensitive permissions', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+    $user->shouldReceive('isOwner')->andReturn(true);
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->useSensitivePermissions($user))->toBeTrue();
+});
+
+it('denies member from using sensitive permissions', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+    $user->shouldReceive('isOwner')->andReturn(false);
+
+    $policy = new ApiTokenPolicy;
+    expect($policy->useSensitivePermissions($user))->toBeFalse();
+});
diff --git a/tests/Unit/Policies/ApplicationPolicyTest.php b/tests/Unit/Policies/ApplicationPolicyTest.php
new file mode 100644
index 000000000..e3c80a4e5
--- /dev/null
+++ b/tests/Unit/Policies/ApplicationPolicyTest.php
@@ -0,0 +1,237 @@
+<?php
+
+use App\Models\Application;
+use App\Models\User;
+use App\Policies\ApplicationPolicy;
+
+it('allows any user to view any applications', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $policy = new ApplicationPolicy;
+    expect($policy->viewAny($user))->toBeTrue();
+});
+
+it('allows team member to view their own team application', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->view($user, $application))->toBeTrue();
+});
+
+it('denies non-member to view another team application', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn((object) ['id' => 2]);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->view($user, $application))->toBeFalse();
+});
+
+it('denies view when application has no team', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn(null);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->view($user, $application))->toBeFalse();
+});
+
+it('allows admin to create an application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->create($user))->toBeTrue();
+});
+
+it('denies member to create an application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->create($user))->toBeFalse();
+});
+
+it('allows team admin to update their own team application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->update($user, $application)->allowed())->toBeTrue();
+});
+
+it('denies team member to update their own team application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->update($user, $application)->allowed())->toBeFalse();
+});
+
+it('denies update when application has no team', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn(null);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->update($user, $application)->allowed())->toBeFalse();
+});
+
+it('allows team admin to delete their own team application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->delete($user, $application))->toBeTrue();
+});
+
+it('denies team member to delete their own team application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->delete($user, $application))->toBeFalse();
+});
+
+it('denies delete when application has no team', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn(null);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->delete($user, $application))->toBeFalse();
+});
+
+it('allows team admin to deploy their own team application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->deploy($user, $application))->toBeTrue();
+});
+
+it('denies team member to deploy their own team application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->deploy($user, $application))->toBeFalse();
+});
+
+it('allows team admin to manage deployments', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->manageDeployments($user, $application))->toBeTrue();
+});
+
+it('denies team member to manage deployments', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->manageDeployments($user, $application))->toBeFalse();
+});
+
+it('allows team admin to manage environment variables', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->manageEnvironment($user, $application))->toBeTrue();
+});
+
+it('denies team member to manage environment variables', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->manageEnvironment($user, $application))->toBeFalse();
+});
+
+it('allows admin to cleanup deployment queue', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->cleanupDeploymentQueue($user))->toBeTrue();
+});
+
+it('denies member to cleanup deployment queue', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new ApplicationPolicy;
+    expect($policy->cleanupDeploymentQueue($user))->toBeFalse();
+});
+
+it('denies restore for any user', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $application = Mockery::mock(Application::class)->makePartial();
+
+    $policy = new ApplicationPolicy;
+    expect($policy->restore($user, $application))->toBeFalse();
+});
+
+it('denies force delete for any user', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $application = Mockery::mock(Application::class)->makePartial();
+
+    $policy = new ApplicationPolicy;
+    expect($policy->forceDelete($user, $application))->toBeFalse();
+});
diff --git a/tests/Unit/Policies/ApplicationPreviewPolicyTest.php b/tests/Unit/Policies/ApplicationPreviewPolicyTest.php
new file mode 100644
index 000000000..38e4eef29
--- /dev/null
+++ b/tests/Unit/Policies/ApplicationPreviewPolicyTest.php
@@ -0,0 +1,239 @@
+<?php
+
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use App\Models\User;
+use App\Policies\ApplicationPreviewPolicy;
+
+it('allows any user to view any application previews', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->viewAny($user))->toBeTrue();
+});
+
+it('allows team member to view application preview', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'member']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $preview = Mockery::mock(ApplicationPreview::class)->makePartial();
+    $preview->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->view($user, $preview))->toBeTrue();
+});
+
+it('denies non-team member from viewing application preview', function () {
+    $teams = collect([
+        (object) ['id' => 2, 'pivot' => (object) ['role' => 'member']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $preview = Mockery::mock(ApplicationPreview::class)->makePartial();
+    $preview->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->view($user, $preview))->toBeFalse();
+});
+
+it('denies viewing application preview with null application', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'admin']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $preview = Mockery::mock(ApplicationPreview::class)->makePartial();
+    $preview->shouldReceive('getAttribute')->with('application')->andReturn(null);
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->view($user, $preview))->toBeFalse();
+});
+
+it('allows admin user to create application preview', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->create($user))->toBeTrue();
+});
+
+it('denies non-admin user from creating application preview', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->create($user))->toBeFalse();
+});
+
+it('allows team admin to update application preview', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $preview = Mockery::mock(ApplicationPreview::class)->makePartial();
+    $preview->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->update($user, $preview)->allowed())->toBeTrue();
+});
+
+it('denies team member from updating application preview', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $preview = Mockery::mock(ApplicationPreview::class)->makePartial();
+    $preview->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->update($user, $preview)->allowed())->toBeFalse();
+});
+
+it('denies updating application preview with null application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $preview = Mockery::mock(ApplicationPreview::class)->makePartial();
+    $preview->shouldReceive('getAttribute')->with('application')->andReturn(null);
+
+    $policy = new ApplicationPreviewPolicy;
+    $response = $policy->update($user, $preview);
+    expect($response->allowed())->toBeFalse();
+});
+
+it('allows team admin to delete application preview', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $preview = Mockery::mock(ApplicationPreview::class)->makePartial();
+    $preview->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->delete($user, $preview))->toBeTrue();
+});
+
+it('denies team member from deleting application preview', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $preview = Mockery::mock(ApplicationPreview::class)->makePartial();
+    $preview->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->delete($user, $preview))->toBeFalse();
+});
+
+it('denies deleting application preview with null application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $preview = Mockery::mock(ApplicationPreview::class)->makePartial();
+    $preview->shouldReceive('getAttribute')->with('application')->andReturn(null);
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->delete($user, $preview))->toBeFalse();
+});
+
+it('allows team admin to deploy application preview', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $preview = Mockery::mock(ApplicationPreview::class)->makePartial();
+    $preview->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->deploy($user, $preview))->toBeTrue();
+});
+
+it('denies team member from deploying application preview', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $preview = Mockery::mock(ApplicationPreview::class)->makePartial();
+    $preview->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->deploy($user, $preview))->toBeFalse();
+});
+
+it('allows team admin to manage preview deployments', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $preview = Mockery::mock(ApplicationPreview::class)->makePartial();
+    $preview->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->manageDeployments($user, $preview))->toBeTrue();
+});
+
+it('denies team member from managing preview deployments', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $preview = Mockery::mock(ApplicationPreview::class)->makePartial();
+    $preview->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->manageDeployments($user, $preview))->toBeFalse();
+});
+
+it('denies restoring application preview', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $preview = Mockery::mock(ApplicationPreview::class)->makePartial();
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->restore($user, $preview))->toBeFalse();
+});
+
+it('denies force deleting application preview', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $preview = Mockery::mock(ApplicationPreview::class)->makePartial();
+
+    $policy = new ApplicationPreviewPolicy;
+    expect($policy->forceDelete($user, $preview))->toBeFalse();
+});
diff --git a/tests/Unit/Policies/ApplicationSettingPolicyTest.php b/tests/Unit/Policies/ApplicationSettingPolicyTest.php
new file mode 100644
index 000000000..c595a3e96
--- /dev/null
+++ b/tests/Unit/Policies/ApplicationSettingPolicyTest.php
@@ -0,0 +1,178 @@
+<?php
+
+use App\Models\Application;
+use App\Models\ApplicationSetting;
+use App\Models\User;
+use App\Policies\ApplicationSettingPolicy;
+
+it('allows any user to view any application settings', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $policy = new ApplicationSettingPolicy;
+    expect($policy->viewAny($user))->toBeTrue();
+});
+
+it('allows team member to view application setting', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'member']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $setting = Mockery::mock(ApplicationSetting::class)->makePartial();
+    $setting->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationSettingPolicy;
+    expect($policy->view($user, $setting))->toBeTrue();
+});
+
+it('denies non-team member from viewing application setting', function () {
+    $teams = collect([
+        (object) ['id' => 2, 'pivot' => (object) ['role' => 'member']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $setting = Mockery::mock(ApplicationSetting::class)->makePartial();
+    $setting->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationSettingPolicy;
+    expect($policy->view($user, $setting))->toBeFalse();
+});
+
+it('denies viewing application setting with null application', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'admin']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $setting = Mockery::mock(ApplicationSetting::class)->makePartial();
+    $setting->shouldReceive('getAttribute')->with('application')->andReturn(null);
+
+    $policy = new ApplicationSettingPolicy;
+    expect($policy->view($user, $setting))->toBeFalse();
+});
+
+it('allows admin user to create application setting', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ApplicationSettingPolicy;
+    expect($policy->create($user))->toBeTrue();
+});
+
+it('denies non-admin user from creating application setting', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new ApplicationSettingPolicy;
+    expect($policy->create($user))->toBeFalse();
+});
+
+it('allows team admin to update application setting', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $setting = Mockery::mock(ApplicationSetting::class)->makePartial();
+    $setting->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationSettingPolicy;
+    expect($policy->update($user, $setting))->toBeTrue();
+});
+
+it('denies team member from updating application setting', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $setting = Mockery::mock(ApplicationSetting::class)->makePartial();
+    $setting->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationSettingPolicy;
+    expect($policy->update($user, $setting))->toBeFalse();
+});
+
+it('denies updating application setting with null application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $setting = Mockery::mock(ApplicationSetting::class)->makePartial();
+    $setting->shouldReceive('getAttribute')->with('application')->andReturn(null);
+
+    $policy = new ApplicationSettingPolicy;
+    expect($policy->update($user, $setting))->toBeFalse();
+});
+
+it('allows team admin to delete application setting', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $setting = Mockery::mock(ApplicationSetting::class)->makePartial();
+    $setting->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationSettingPolicy;
+    expect($policy->delete($user, $setting))->toBeTrue();
+});
+
+it('denies team member from deleting application setting', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $team = (object) ['id' => 1];
+    $application = Mockery::mock(Application::class)->makePartial();
+    $application->shouldReceive('team')->andReturn($team);
+
+    $setting = Mockery::mock(ApplicationSetting::class)->makePartial();
+    $setting->shouldReceive('getAttribute')->with('application')->andReturn($application);
+
+    $policy = new ApplicationSettingPolicy;
+    expect($policy->delete($user, $setting))->toBeFalse();
+});
+
+it('denies deleting application setting with null application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $setting = Mockery::mock(ApplicationSetting::class)->makePartial();
+    $setting->shouldReceive('getAttribute')->with('application')->andReturn(null);
+
+    $policy = new ApplicationSettingPolicy;
+    expect($policy->delete($user, $setting))->toBeFalse();
+});
+
+it('denies restoring application setting', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $setting = Mockery::mock(ApplicationSetting::class)->makePartial();
+
+    $policy = new ApplicationSettingPolicy;
+    expect($policy->restore($user, $setting))->toBeFalse();
+});
+
+it('denies force deleting application setting', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $setting = Mockery::mock(ApplicationSetting::class)->makePartial();
+
+    $policy = new ApplicationSettingPolicy;
+    expect($policy->forceDelete($user, $setting))->toBeFalse();
+});
diff --git a/tests/Unit/Policies/DatabasePolicyTest.php b/tests/Unit/Policies/DatabasePolicyTest.php
new file mode 100644
index 000000000..9924a43cb
--- /dev/null
+++ b/tests/Unit/Policies/DatabasePolicyTest.php
@@ -0,0 +1,221 @@
+<?php
+
+use App\Models\StandalonePostgresql;
+use App\Models\User;
+use App\Policies\DatabasePolicy;
+
+it('allows any user to view any databases', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $policy = new DatabasePolicy;
+    expect($policy->viewAny($user))->toBeTrue();
+});
+
+it('allows team member to view their own team database', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+    $database->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new DatabasePolicy;
+    expect($policy->view($user, $database))->toBeTrue();
+});
+
+it('denies non-member to view another team database', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+    $database->shouldReceive('team')->andReturn((object) ['id' => 2]);
+
+    $policy = new DatabasePolicy;
+    expect($policy->view($user, $database))->toBeFalse();
+});
+
+it('denies view when database has no team', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+    $database->shouldReceive('team')->andReturn(null);
+
+    $policy = new DatabasePolicy;
+    expect($policy->view($user, $database))->toBeFalse();
+});
+
+it('allows admin to create a database', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new DatabasePolicy;
+    expect($policy->create($user))->toBeTrue();
+});
+
+it('denies member to create a database', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new DatabasePolicy;
+    expect($policy->create($user))->toBeFalse();
+});
+
+it('allows team admin to update their own team database', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+    $database->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new DatabasePolicy;
+    expect($policy->update($user, $database)->allowed())->toBeTrue();
+});
+
+it('denies team member to update their own team database', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+    $database->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new DatabasePolicy;
+    expect($policy->update($user, $database)->allowed())->toBeFalse();
+});
+
+it('denies update when database has no team', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+    $database->shouldReceive('team')->andReturn(null);
+
+    $policy = new DatabasePolicy;
+    expect($policy->update($user, $database)->allowed())->toBeFalse();
+});
+
+it('allows team admin to delete their own team database', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+    $database->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new DatabasePolicy;
+    expect($policy->delete($user, $database))->toBeTrue();
+});
+
+it('denies team member to delete their own team database', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+    $database->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new DatabasePolicy;
+    expect($policy->delete($user, $database))->toBeFalse();
+});
+
+it('denies delete when database has no team', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+    $database->shouldReceive('team')->andReturn(null);
+
+    $policy = new DatabasePolicy;
+    expect($policy->delete($user, $database))->toBeFalse();
+});
+
+it('allows team admin to manage their own team database', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+    $database->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new DatabasePolicy;
+    expect($policy->manage($user, $database))->toBeTrue();
+});
+
+it('denies team member to manage their own team database', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+    $database->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new DatabasePolicy;
+    expect($policy->manage($user, $database))->toBeFalse();
+});
+
+it('allows team admin to manage backups', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+    $database->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new DatabasePolicy;
+    expect($policy->manageBackups($user, $database))->toBeTrue();
+});
+
+it('denies team member to manage backups', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+    $database->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new DatabasePolicy;
+    expect($policy->manageBackups($user, $database))->toBeFalse();
+});
+
+it('allows team admin to manage database environment variables', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+    $database->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new DatabasePolicy;
+    expect($policy->manageEnvironment($user, $database))->toBeTrue();
+});
+
+it('denies team member to manage database environment variables', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+    $database->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new DatabasePolicy;
+    expect($policy->manageEnvironment($user, $database))->toBeFalse();
+});
+
+it('denies restore for any user', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+
+    $policy = new DatabasePolicy;
+    expect($policy->restore($user, $database))->toBeFalse();
+});
+
+it('denies force delete for any user', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $database = Mockery::mock(StandalonePostgresql::class)->makePartial();
+
+    $policy = new DatabasePolicy;
+    expect($policy->forceDelete($user, $database))->toBeFalse();
+});
diff --git a/tests/Unit/Policies/EnvironmentPolicyTest.php b/tests/Unit/Policies/EnvironmentPolicyTest.php
new file mode 100644
index 000000000..3fe8f1703
--- /dev/null
+++ b/tests/Unit/Policies/EnvironmentPolicyTest.php
@@ -0,0 +1,155 @@
+<?php
+
+use App\Models\Environment;
+use App\Models\User;
+use App\Policies\EnvironmentPolicy;
+
+it('allows any user to view any environments', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $policy = new EnvironmentPolicy;
+    expect($policy->viewAny($user))->toBeTrue();
+});
+
+it('allows team member to view their own team environment', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $environment = Mockery::mock(Environment::class)->makePartial();
+    $environment->shouldReceive('getAttribute')->with('project')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new EnvironmentPolicy;
+    expect($policy->view($user, $environment))->toBeTrue();
+});
+
+it('denies non-member to view another team environment', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $environment = Mockery::mock(Environment::class)->makePartial();
+    $environment->shouldReceive('getAttribute')->with('project')->andReturn((object) ['team_id' => 2]);
+
+    $policy = new EnvironmentPolicy;
+    expect($policy->view($user, $environment))->toBeFalse();
+});
+
+it('denies view when environment has no project', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $environment = Mockery::mock(Environment::class)->makePartial();
+    $environment->shouldReceive('getAttribute')->with('project')->andReturn(null);
+
+    $policy = new EnvironmentPolicy;
+    expect($policy->view($user, $environment))->toBeFalse();
+});
+
+it('allows admin to create an environment', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new EnvironmentPolicy;
+    expect($policy->create($user))->toBeTrue();
+});
+
+it('denies member to create an environment', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new EnvironmentPolicy;
+    expect($policy->create($user))->toBeFalse();
+});
+
+it('allows team admin to update their own team environment', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $environment = Mockery::mock(Environment::class)->makePartial();
+    $environment->shouldReceive('getAttribute')->with('project')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new EnvironmentPolicy;
+    expect($policy->update($user, $environment))->toBeTrue();
+});
+
+it('denies team member to update their own team environment', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $environment = Mockery::mock(Environment::class)->makePartial();
+    $environment->shouldReceive('getAttribute')->with('project')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new EnvironmentPolicy;
+    expect($policy->update($user, $environment))->toBeFalse();
+});
+
+it('denies update when environment has no project', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $environment = Mockery::mock(Environment::class)->makePartial();
+    $environment->shouldReceive('getAttribute')->with('project')->andReturn(null);
+
+    $policy = new EnvironmentPolicy;
+    expect($policy->update($user, $environment))->toBeFalse();
+});
+
+it('allows team admin to delete their own team environment', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $environment = Mockery::mock(Environment::class)->makePartial();
+    $environment->shouldReceive('getAttribute')->with('project')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new EnvironmentPolicy;
+    expect($policy->delete($user, $environment))->toBeTrue();
+});
+
+it('denies team member to delete their own team environment', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $environment = Mockery::mock(Environment::class)->makePartial();
+    $environment->shouldReceive('getAttribute')->with('project')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new EnvironmentPolicy;
+    expect($policy->delete($user, $environment))->toBeFalse();
+});
+
+it('denies delete when environment has no project', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $environment = Mockery::mock(Environment::class)->makePartial();
+    $environment->shouldReceive('getAttribute')->with('project')->andReturn(null);
+
+    $policy = new EnvironmentPolicy;
+    expect($policy->delete($user, $environment))->toBeFalse();
+});
+
+it('denies restore for any user', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $environment = Mockery::mock(Environment::class)->makePartial();
+
+    $policy = new EnvironmentPolicy;
+    expect($policy->restore($user, $environment))->toBeFalse();
+});
+
+it('denies force delete for any user', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $environment = Mockery::mock(Environment::class)->makePartial();
+
+    $policy = new EnvironmentPolicy;
+    expect($policy->forceDelete($user, $environment))->toBeFalse();
+});
diff --git a/tests/Unit/Policies/EnvironmentVariablePolicyTest.php b/tests/Unit/Policies/EnvironmentVariablePolicyTest.php
new file mode 100644
index 000000000..d5d3ec410
--- /dev/null
+++ b/tests/Unit/Policies/EnvironmentVariablePolicyTest.php
@@ -0,0 +1,199 @@
+<?php
+
+use App\Models\Application;
+use App\Models\EnvironmentVariable;
+use App\Models\User;
+use App\Policies\EnvironmentVariablePolicy;
+use Illuminate\Support\Collection;
+
+it('allows any user to view any environment variables', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->viewAny($user))->toBeTrue();
+});
+
+it('allows team member to view environment variable', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->teams = new Collection([(object) ['id' => 1]]);
+
+    $resource = Mockery::mock(Application::class)->makePartial();
+    $resource->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $envVar = Mockery::mock(EnvironmentVariable::class)->makePartial();
+    $envVar->shouldReceive('getAttribute')->with('resourceable')->andReturn($resource);
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->view($user, $envVar))->toBeTrue();
+});
+
+it('denies non-team member from viewing environment variable', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->teams = new Collection([(object) ['id' => 2]]);
+
+    $resource = Mockery::mock(Application::class)->makePartial();
+    $resource->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $envVar = Mockery::mock(EnvironmentVariable::class)->makePartial();
+    $envVar->shouldReceive('getAttribute')->with('resourceable')->andReturn($resource);
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->view($user, $envVar))->toBeFalse();
+});
+
+it('denies view when resourceable is null', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->teams = new Collection([(object) ['id' => 1]]);
+
+    $envVar = Mockery::mock(EnvironmentVariable::class)->makePartial();
+    $envVar->shouldReceive('getAttribute')->with('resourceable')->andReturn(null);
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->view($user, $envVar))->toBeFalse();
+});
+
+it('allows admin to create environment variable', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->create($user))->toBeTrue();
+});
+
+it('denies member from creating environment variable', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->create($user))->toBeFalse();
+});
+
+it('allows team admin to update environment variable', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $resource = Mockery::mock(Application::class)->makePartial();
+    $resource->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $envVar = Mockery::mock(EnvironmentVariable::class)->makePartial();
+    $envVar->shouldReceive('getAttribute')->with('resourceable')->andReturn($resource);
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->update($user, $envVar))->toBeTrue();
+});
+
+it('denies non-admin from updating environment variable', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $resource = Mockery::mock(Application::class)->makePartial();
+    $resource->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $envVar = Mockery::mock(EnvironmentVariable::class)->makePartial();
+    $envVar->shouldReceive('getAttribute')->with('resourceable')->andReturn($resource);
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->update($user, $envVar))->toBeFalse();
+});
+
+it('denies update when resourceable is null', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $envVar = Mockery::mock(EnvironmentVariable::class)->makePartial();
+    $envVar->shouldReceive('getAttribute')->with('resourceable')->andReturn(null);
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->update($user, $envVar))->toBeFalse();
+});
+
+it('allows team admin to delete environment variable', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $resource = Mockery::mock(Application::class)->makePartial();
+    $resource->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $envVar = Mockery::mock(EnvironmentVariable::class)->makePartial();
+    $envVar->shouldReceive('getAttribute')->with('resourceable')->andReturn($resource);
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->delete($user, $envVar))->toBeTrue();
+});
+
+it('denies non-admin from deleting environment variable', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $resource = Mockery::mock(Application::class)->makePartial();
+    $resource->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $envVar = Mockery::mock(EnvironmentVariable::class)->makePartial();
+    $envVar->shouldReceive('getAttribute')->with('resourceable')->andReturn($resource);
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->delete($user, $envVar))->toBeFalse();
+});
+
+it('denies delete when resourceable is null', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $envVar = Mockery::mock(EnvironmentVariable::class)->makePartial();
+    $envVar->shouldReceive('getAttribute')->with('resourceable')->andReturn(null);
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->delete($user, $envVar))->toBeFalse();
+});
+
+it('denies restore for environment variable', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $envVar = Mockery::mock(EnvironmentVariable::class)->makePartial();
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->restore($user, $envVar))->toBeFalse();
+});
+
+it('denies force delete for environment variable', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $envVar = Mockery::mock(EnvironmentVariable::class)->makePartial();
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->forceDelete($user, $envVar))->toBeFalse();
+});
+
+it('allows team admin to manage environment', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $resource = Mockery::mock(Application::class)->makePartial();
+    $resource->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $envVar = Mockery::mock(EnvironmentVariable::class)->makePartial();
+    $envVar->shouldReceive('getAttribute')->with('resourceable')->andReturn($resource);
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->manageEnvironment($user, $envVar))->toBeTrue();
+});
+
+it('denies non-admin from managing environment', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $resource = Mockery::mock(Application::class)->makePartial();
+    $resource->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $envVar = Mockery::mock(EnvironmentVariable::class)->makePartial();
+    $envVar->shouldReceive('getAttribute')->with('resourceable')->andReturn($resource);
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->manageEnvironment($user, $envVar))->toBeFalse();
+});
+
+it('denies manage environment when resourceable is null', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $envVar = Mockery::mock(EnvironmentVariable::class)->makePartial();
+    $envVar->shouldReceive('getAttribute')->with('resourceable')->andReturn(null);
+
+    $policy = new EnvironmentVariablePolicy;
+    expect($policy->manageEnvironment($user, $envVar))->toBeFalse();
+});
diff --git a/tests/Unit/Policies/GithubAppPolicyTest.php b/tests/Unit/Policies/GithubAppPolicyTest.php
index 55ba7f3d3..5aedbf7b8 100644
--- a/tests/Unit/Policies/GithubAppPolicyTest.php
+++ b/tests/Unit/Policies/GithubAppPolicyTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Models\GithubApp;
 use App\Models\User;
 use App\Policies\GithubAppPolicy;
 
@@ -13,12 +14,7 @@ it('allows any user to view any github apps', function () {
 it('allows any user to view system-wide github app', function () {
     $user = Mockery::mock(User::class)->makePartial();
 
-    $model = new class
-    {
-        public $team_id = 1;
-
-        public $is_system_wide = true;
-    };
+    $model = mockGithubApp(teamId: 1, isSystemWide: true);
 
     $policy = new GithubAppPolicy;
     expect($policy->view($user, $model))->toBeTrue();
@@ -32,12 +28,7 @@ it('allows team member to view non-system-wide github app', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $model = new class
-    {
-        public $team_id = 1;
-
-        public $is_system_wide = false;
-    };
+    $model = mockGithubApp(teamId: 1, isSystemWide: false);
 
     $policy = new GithubAppPolicy;
     expect($policy->view($user, $model))->toBeTrue();
@@ -51,12 +42,7 @@ it('denies non-team member to view non-system-wide github app', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $model = new class
-    {
-        public $team_id = 1;
-
-        public $is_system_wide = false;
-    };
+    $model = mockGithubApp(teamId: 1, isSystemWide: false);
 
     $policy = new GithubAppPolicy;
     expect($policy->view($user, $model))->toBeFalse();
@@ -82,12 +68,7 @@ it('allows user with system access to update system-wide github app', function (
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('canAccessSystemResources')->andReturn(true);
 
-    $model = new class
-    {
-        public $team_id = 1;
-
-        public $is_system_wide = true;
-    };
+    $model = mockGithubApp(teamId: 1, isSystemWide: true);
 
     $policy = new GithubAppPolicy;
     expect($policy->update($user, $model))->toBeTrue();
@@ -97,12 +78,7 @@ it('denies user without system access to update system-wide github app', functio
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('canAccessSystemResources')->andReturn(false);
 
-    $model = new class
-    {
-        public $team_id = 1;
-
-        public $is_system_wide = true;
-    };
+    $model = mockGithubApp(teamId: 1, isSystemWide: true);
 
     $policy = new GithubAppPolicy;
     expect($policy->update($user, $model))->toBeFalse();
@@ -112,12 +88,7 @@ it('allows team admin to update non-system-wide github app', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
 
-    $model = new class
-    {
-        public $team_id = 1;
-
-        public $is_system_wide = false;
-    };
+    $model = mockGithubApp(teamId: 1, isSystemWide: false);
 
     $policy = new GithubAppPolicy;
     expect($policy->update($user, $model))->toBeTrue();
@@ -127,12 +98,7 @@ it('denies team member to update non-system-wide github app', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
 
-    $model = new class
-    {
-        public $team_id = 1;
-
-        public $is_system_wide = false;
-    };
+    $model = mockGithubApp(teamId: 1, isSystemWide: false);
 
     $policy = new GithubAppPolicy;
     expect($policy->update($user, $model))->toBeFalse();
@@ -142,12 +108,7 @@ it('allows user with system access to delete system-wide github app', function (
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('canAccessSystemResources')->andReturn(true);
 
-    $model = new class
-    {
-        public $team_id = 1;
-
-        public $is_system_wide = true;
-    };
+    $model = mockGithubApp(teamId: 1, isSystemWide: true);
 
     $policy = new GithubAppPolicy;
     expect($policy->delete($user, $model))->toBeTrue();
@@ -157,12 +118,7 @@ it('denies user without system access to delete system-wide github app', functio
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('canAccessSystemResources')->andReturn(false);
 
-    $model = new class
-    {
-        public $team_id = 1;
-
-        public $is_system_wide = true;
-    };
+    $model = mockGithubApp(teamId: 1, isSystemWide: true);
 
     $policy = new GithubAppPolicy;
     expect($policy->delete($user, $model))->toBeFalse();
@@ -172,12 +128,7 @@ it('allows team admin to delete non-system-wide github app', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
 
-    $model = new class
-    {
-        public $team_id = 1;
-
-        public $is_system_wide = false;
-    };
+    $model = mockGithubApp(teamId: 1, isSystemWide: false);
 
     $policy = new GithubAppPolicy;
     expect($policy->delete($user, $model))->toBeTrue();
@@ -187,12 +138,7 @@ it('denies team member to delete non-system-wide github app', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
 
-    $model = new class
-    {
-        public $team_id = 1;
-
-        public $is_system_wide = false;
-    };
+    $model = mockGithubApp(teamId: 1, isSystemWide: false);
 
     $policy = new GithubAppPolicy;
     expect($policy->delete($user, $model))->toBeFalse();
@@ -201,12 +147,7 @@ it('denies team member to delete non-system-wide github app', function () {
 it('denies restore of github app', function () {
     $user = Mockery::mock(User::class)->makePartial();
 
-    $model = new class
-    {
-        public $team_id = 1;
-
-        public $is_system_wide = false;
-    };
+    $model = mockGithubApp(teamId: 1, isSystemWide: false);
 
     $policy = new GithubAppPolicy;
     expect($policy->restore($user, $model))->toBeFalse();
@@ -215,13 +156,17 @@ it('denies restore of github app', function () {
 it('denies force delete of github app', function () {
     $user = Mockery::mock(User::class)->makePartial();
 
-    $model = new class
-    {
-        public $team_id = 1;
-
-        public $is_system_wide = false;
-    };
+    $model = mockGithubApp(teamId: 1, isSystemWide: false);
 
     $policy = new GithubAppPolicy;
     expect($policy->forceDelete($user, $model))->toBeFalse();
 });
+
+function mockGithubApp(int $teamId, bool $isSystemWide): GithubApp
+{
+    $githubApp = Mockery::mock(GithubApp::class)->makePartial();
+    $githubApp->team_id = $teamId;
+    $githubApp->is_system_wide = $isSystemWide;
+
+    return $githubApp;
+}
diff --git a/tests/Unit/Policies/NotificationPolicyTest.php b/tests/Unit/Policies/NotificationPolicyTest.php
new file mode 100644
index 000000000..0843a71c3
--- /dev/null
+++ b/tests/Unit/Policies/NotificationPolicyTest.php
@@ -0,0 +1,175 @@
+<?php
+
+use App\Models\User;
+use App\Policies\NotificationPolicy;
+use Illuminate\Database\Eloquent\Model;
+
+it('allows team member to view notification settings', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'member']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $notification = Mockery::mock(Model::class)->makePartial();
+    $notification->shouldReceive('getAttribute')->with('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new NotificationPolicy;
+    expect($policy->view($user, $notification))->toBeTrue();
+});
+
+it('denies non-team member from viewing notification settings', function () {
+    $teams = collect([
+        (object) ['id' => 2, 'pivot' => (object) ['role' => 'member']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $notification = Mockery::mock(Model::class)->makePartial();
+    $notification->shouldReceive('getAttribute')->with('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new NotificationPolicy;
+    expect($policy->view($user, $notification))->toBeFalse();
+});
+
+it('denies viewing notification settings with no team', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $notification = Mockery::mock(Model::class)->makePartial();
+    $notification->shouldReceive('getAttribute')->with('team')->andReturn(null);
+
+    $policy = new NotificationPolicy;
+    expect($policy->view($user, $notification))->toBeFalse();
+});
+
+it('allows team admin to update notification settings', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $notification = Mockery::mock(Model::class)->makePartial();
+    $notification->shouldReceive('getAttribute')->with('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new NotificationPolicy;
+    expect($policy->update($user, $notification))->toBeTrue();
+});
+
+it('denies team member from updating notification settings', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $notification = Mockery::mock(Model::class)->makePartial();
+    $notification->shouldReceive('getAttribute')->with('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new NotificationPolicy;
+    expect($policy->update($user, $notification))->toBeFalse();
+});
+
+it('denies updating notification settings with no team', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $notification = Mockery::mock(Model::class)->makePartial();
+    $notification->shouldReceive('getAttribute')->with('team')->andReturn(null);
+
+    $policy = new NotificationPolicy;
+    expect($policy->update($user, $notification))->toBeFalse();
+});
+
+it('allows team admin to manage notification settings', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $notification = Mockery::mock(Model::class)->makePartial();
+    $notification->shouldReceive('getAttribute')->with('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new NotificationPolicy;
+    expect($policy->manage($user, $notification))->toBeTrue();
+});
+
+it('denies team member from managing notification settings', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $notification = Mockery::mock(Model::class)->makePartial();
+    $notification->shouldReceive('getAttribute')->with('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new NotificationPolicy;
+    expect($policy->manage($user, $notification))->toBeFalse();
+});
+
+it('denies managing notification settings with no team', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $notification = Mockery::mock(Model::class)->makePartial();
+    $notification->shouldReceive('getAttribute')->with('team')->andReturn(null);
+
+    $policy = new NotificationPolicy;
+    expect($policy->manage($user, $notification))->toBeFalse();
+});
+
+it('allows team admin to send test notification', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $notification = Mockery::mock(Model::class)->makePartial();
+    $notification->shouldReceive('getAttribute')->with('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new NotificationPolicy;
+    expect($policy->sendTest($user, $notification))->toBeTrue();
+});
+
+it('denies team member from sending test notification', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $notification = Mockery::mock(Model::class)->makePartial();
+    $notification->shouldReceive('getAttribute')->with('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new NotificationPolicy;
+    expect($policy->sendTest($user, $notification))->toBeFalse();
+});
+
+it('denies sending test notification with no team', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $notification = Mockery::mock(Model::class)->makePartial();
+    $notification->shouldReceive('getAttribute')->with('team')->andReturn(null);
+
+    $policy = new NotificationPolicy;
+    expect($policy->sendTest($user, $notification))->toBeFalse();
+});
+
+it('allows team member to view but not update notification settings', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'member']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $notification = Mockery::mock(Model::class)->makePartial();
+    $notification->shouldReceive('getAttribute')->with('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new NotificationPolicy;
+    expect($policy->view($user, $notification))->toBeTrue();
+    expect($policy->update($user, $notification))->toBeFalse();
+});
+
+it('allows team admin to view and update notification settings', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'admin']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $notification = Mockery::mock(Model::class)->makePartial();
+    $notification->shouldReceive('getAttribute')->with('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new NotificationPolicy;
+    expect($policy->view($user, $notification))->toBeTrue();
+    expect($policy->update($user, $notification))->toBeTrue();
+});
diff --git a/tests/Unit/Policies/PrivateKeyPolicyTest.php b/tests/Unit/Policies/PrivateKeyPolicyTest.php
index 6844d92f7..281fdd5f8 100644
--- a/tests/Unit/Policies/PrivateKeyPolicyTest.php
+++ b/tests/Unit/Policies/PrivateKeyPolicyTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Models\PrivateKey;
 use App\Models\User;
 use App\Policies\PrivateKeyPolicy;
 
@@ -11,10 +12,8 @@ it('allows root team admin to view system private key', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $privateKey = new class
-    {
-        public $team_id = 0;
-    };
+    $privateKey = Mockery::mock(PrivateKey::class)->makePartial();
+    $privateKey->team_id = 0;
 
     $policy = new PrivateKeyPolicy;
     expect($policy->view($user, $privateKey))->toBeTrue();
@@ -28,10 +27,8 @@ it('allows root team owner to view system private key', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $privateKey = new class
-    {
-        public $team_id = 0;
-    };
+    $privateKey = Mockery::mock(PrivateKey::class)->makePartial();
+    $privateKey->team_id = 0;
 
     $policy = new PrivateKeyPolicy;
     expect($policy->view($user, $privateKey))->toBeTrue();
@@ -45,10 +42,8 @@ it('denies regular member of root team to view system private key', function ()
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $privateKey = new class
-    {
-        public $team_id = 0;
-    };
+    $privateKey = Mockery::mock(PrivateKey::class)->makePartial();
+    $privateKey->team_id = 0;
 
     $policy = new PrivateKeyPolicy;
     expect($policy->view($user, $privateKey))->toBeFalse();
@@ -62,10 +57,8 @@ it('denies non-root team member to view system private key', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $privateKey = new class
-    {
-        public $team_id = 0;
-    };
+    $privateKey = Mockery::mock(PrivateKey::class)->makePartial();
+    $privateKey->team_id = 0;
 
     $policy = new PrivateKeyPolicy;
     expect($policy->view($user, $privateKey))->toBeFalse();
@@ -79,10 +72,8 @@ it('allows team member to view their own team private key', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $privateKey = new class
-    {
-        public $team_id = 1;
-    };
+    $privateKey = Mockery::mock(PrivateKey::class)->makePartial();
+    $privateKey->team_id = 1;
 
     $policy = new PrivateKeyPolicy;
     expect($policy->view($user, $privateKey))->toBeTrue();
@@ -96,10 +87,8 @@ it('denies team member to view another team private key', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $privateKey = new class
-    {
-        public $team_id = 2;
-    };
+    $privateKey = Mockery::mock(PrivateKey::class)->makePartial();
+    $privateKey->team_id = 2;
 
     $policy = new PrivateKeyPolicy;
     expect($policy->view($user, $privateKey))->toBeFalse();
@@ -113,10 +102,8 @@ it('allows root team admin to update system private key', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $privateKey = new class
-    {
-        public $team_id = 0;
-    };
+    $privateKey = Mockery::mock(PrivateKey::class)->makePartial();
+    $privateKey->team_id = 0;
 
     $policy = new PrivateKeyPolicy;
     expect($policy->update($user, $privateKey))->toBeTrue();
@@ -130,10 +117,8 @@ it('denies root team member to update system private key', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $privateKey = new class
-    {
-        public $team_id = 0;
-    };
+    $privateKey = Mockery::mock(PrivateKey::class)->makePartial();
+    $privateKey->team_id = 0;
 
     $policy = new PrivateKeyPolicy;
     expect($policy->update($user, $privateKey))->toBeFalse();
@@ -147,10 +132,8 @@ it('allows team admin to update their own team private key', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $privateKey = new class
-    {
-        public $team_id = 1;
-    };
+    $privateKey = Mockery::mock(PrivateKey::class)->makePartial();
+    $privateKey->team_id = 1;
 
     $policy = new PrivateKeyPolicy;
     expect($policy->update($user, $privateKey))->toBeTrue();
@@ -164,10 +147,8 @@ it('denies team member to update their own team private key', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $privateKey = new class
-    {
-        public $team_id = 1;
-    };
+    $privateKey = Mockery::mock(PrivateKey::class)->makePartial();
+    $privateKey->team_id = 1;
 
     $policy = new PrivateKeyPolicy;
     expect($policy->update($user, $privateKey))->toBeFalse();
@@ -181,10 +162,8 @@ it('allows root team admin to delete system private key', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $privateKey = new class
-    {
-        public $team_id = 0;
-    };
+    $privateKey = Mockery::mock(PrivateKey::class)->makePartial();
+    $privateKey->team_id = 0;
 
     $policy = new PrivateKeyPolicy;
     expect($policy->delete($user, $privateKey))->toBeTrue();
@@ -198,10 +177,8 @@ it('denies root team member to delete system private key', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $privateKey = new class
-    {
-        public $team_id = 0;
-    };
+    $privateKey = Mockery::mock(PrivateKey::class)->makePartial();
+    $privateKey->team_id = 0;
 
     $policy = new PrivateKeyPolicy;
     expect($policy->delete($user, $privateKey))->toBeFalse();
diff --git a/tests/Unit/Policies/ProjectPolicyTest.php b/tests/Unit/Policies/ProjectPolicyTest.php
new file mode 100644
index 000000000..8b4a824f6
--- /dev/null
+++ b/tests/Unit/Policies/ProjectPolicyTest.php
@@ -0,0 +1,122 @@
+<?php
+
+use App\Models\Project;
+use App\Models\User;
+use App\Policies\ProjectPolicy;
+
+it('allows any user to view any projects', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $policy = new ProjectPolicy;
+    expect($policy->viewAny($user))->toBeTrue();
+});
+
+it('allows team member to view their own team project', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $project = Mockery::mock(Project::class)->makePartial();
+    $project->team_id = 1;
+
+    $policy = new ProjectPolicy;
+    expect($policy->view($user, $project))->toBeTrue();
+});
+
+it('denies non-member to view another team project', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $project = Mockery::mock(Project::class)->makePartial();
+    $project->team_id = 2;
+
+    $policy = new ProjectPolicy;
+    expect($policy->view($user, $project))->toBeFalse();
+});
+
+it('allows admin to create a project', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ProjectPolicy;
+    expect($policy->create($user))->toBeTrue();
+});
+
+it('denies member to create a project', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new ProjectPolicy;
+    expect($policy->create($user))->toBeFalse();
+});
+
+it('allows team admin to update their own team project', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $project = Mockery::mock(Project::class)->makePartial();
+    $project->team_id = 1;
+
+    $policy = new ProjectPolicy;
+    expect($policy->update($user, $project))->toBeTrue();
+});
+
+it('denies team member to update their own team project', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $project = Mockery::mock(Project::class)->makePartial();
+    $project->team_id = 1;
+
+    $policy = new ProjectPolicy;
+    expect($policy->update($user, $project))->toBeFalse();
+});
+
+it('allows team admin to delete their own team project', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $project = Mockery::mock(Project::class)->makePartial();
+    $project->team_id = 1;
+
+    $policy = new ProjectPolicy;
+    expect($policy->delete($user, $project))->toBeTrue();
+});
+
+it('denies team member to delete their own team project', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $project = Mockery::mock(Project::class)->makePartial();
+    $project->team_id = 1;
+
+    $policy = new ProjectPolicy;
+    expect($policy->delete($user, $project))->toBeFalse();
+});
+
+it('denies restore for any user', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $project = Mockery::mock(Project::class)->makePartial();
+    $project->team_id = 1;
+
+    $policy = new ProjectPolicy;
+    expect($policy->restore($user, $project))->toBeFalse();
+});
+
+it('denies force delete for any user', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $project = Mockery::mock(Project::class)->makePartial();
+    $project->team_id = 1;
+
+    $policy = new ProjectPolicy;
+    expect($policy->forceDelete($user, $project))->toBeFalse();
+});
diff --git a/tests/Unit/Policies/ResourceCreatePolicyTest.php b/tests/Unit/Policies/ResourceCreatePolicyTest.php
new file mode 100644
index 000000000..606535467
--- /dev/null
+++ b/tests/Unit/Policies/ResourceCreatePolicyTest.php
@@ -0,0 +1,61 @@
+<?php
+
+use App\Models\Application;
+use App\Models\User;
+use App\Policies\ResourceCreatePolicy;
+
+it('allows admin to create any resource', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ResourceCreatePolicy;
+    expect($policy->createAny($user))->toBeTrue();
+});
+
+it('denies member from creating any resource', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new ResourceCreatePolicy;
+    expect($policy->createAny($user))->toBeFalse();
+});
+
+it('allows admin to create a valid resource class', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ResourceCreatePolicy;
+    expect($policy->create($user, Application::class))->toBeTrue();
+});
+
+it('denies member from creating a valid resource class', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new ResourceCreatePolicy;
+    expect($policy->create($user, Application::class))->toBeFalse();
+});
+
+it('denies admin from creating an invalid resource class', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ResourceCreatePolicy;
+    expect($policy->create($user, 'App\Models\NonExistent'))->toBeFalse();
+});
+
+it('allows admin to authorize all resource creation', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ResourceCreatePolicy;
+    expect($policy->authorizeAllResourceCreation($user))->toBeTrue();
+});
+
+it('denies member from authorizing all resource creation', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new ResourceCreatePolicy;
+    expect($policy->authorizeAllResourceCreation($user))->toBeFalse();
+});
diff --git a/tests/Unit/Policies/S3StoragePolicyTest.php b/tests/Unit/Policies/S3StoragePolicyTest.php
index 4ea580d0f..70ffdf718 100644
--- a/tests/Unit/Policies/S3StoragePolicyTest.php
+++ b/tests/Unit/Policies/S3StoragePolicyTest.php
@@ -52,7 +52,23 @@ it('allows team admin to update S3 storage from their team', function () {
     expect($policy->update($user, $storage))->toBeTrue();
 });
 
-it('denies team member to update S3 storage from another team', function () {
+it('denies team member to update S3 storage from their team', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'member']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $storage = Mockery::mock(S3Storage::class)->makePartial();
+    $storage->shouldReceive('getAttribute')->with('team_id')->andReturn(1);
+    $storage->team_id = 1;
+
+    $policy = new S3StoragePolicy;
+    expect($policy->update($user, $storage))->toBeFalse();
+});
+
+it('denies team admin to update S3 storage from another team', function () {
     $teams = collect([
         (object) ['id' => 1, 'pivot' => (object) ['role' => 'admin']],
     ]);
@@ -68,9 +84,9 @@ it('denies team member to update S3 storage from another team', function () {
     expect($policy->update($user, $storage))->toBeFalse();
 });
 
-it('allows team member to delete S3 storage from their team', function () {
+it('allows team admin to delete S3 storage from their team', function () {
     $teams = collect([
-        (object) ['id' => 1, 'pivot' => (object) ['role' => 'member']],
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'admin']],
     ]);
 
     $user = Mockery::mock(User::class)->makePartial();
@@ -84,7 +100,23 @@ it('allows team member to delete S3 storage from their team', function () {
     expect($policy->delete($user, $storage))->toBeTrue();
 });
 
-it('denies team member to delete S3 storage from another team', function () {
+it('denies team member to delete S3 storage from their team', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'member']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $storage = Mockery::mock(S3Storage::class)->makePartial();
+    $storage->shouldReceive('getAttribute')->with('team_id')->andReturn(1);
+    $storage->team_id = 1;
+
+    $policy = new S3StoragePolicy;
+    expect($policy->delete($user, $storage))->toBeFalse();
+});
+
+it('denies team admin to delete S3 storage from another team', function () {
     $teams = collect([
         (object) ['id' => 1, 'pivot' => (object) ['role' => 'owner']],
     ]);
@@ -116,9 +148,9 @@ it('denies non-admin to create S3 storage', function () {
     expect($policy->create($user))->toBeFalse();
 });
 
-it('allows team member to validate connection of S3 storage from their team', function () {
+it('allows team admin to validate connection of S3 storage from their team', function () {
     $teams = collect([
-        (object) ['id' => 1, 'pivot' => (object) ['role' => 'member']],
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'admin']],
     ]);
 
     $user = Mockery::mock(User::class)->makePartial();
@@ -132,7 +164,23 @@ it('allows team member to validate connection of S3 storage from their team', fu
     expect($policy->validateConnection($user, $storage))->toBeTrue();
 });
 
-it('denies team member to validate connection of S3 storage from another team', function () {
+it('denies team member to validate connection of S3 storage from their team', function () {
+    $teams = collect([
+        (object) ['id' => 1, 'pivot' => (object) ['role' => 'member']],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $storage = Mockery::mock(S3Storage::class)->makePartial();
+    $storage->shouldReceive('getAttribute')->with('team_id')->andReturn(1);
+    $storage->team_id = 1;
+
+    $policy = new S3StoragePolicy;
+    expect($policy->validateConnection($user, $storage))->toBeFalse();
+});
+
+it('denies team admin to validate connection of S3 storage from another team', function () {
     $teams = collect([
         (object) ['id' => 1, 'pivot' => (object) ['role' => 'admin']],
     ]);
diff --git a/tests/Unit/Policies/ServerPolicyTest.php b/tests/Unit/Policies/ServerPolicyTest.php
new file mode 100644
index 000000000..afa64d090
--- /dev/null
+++ b/tests/Unit/Policies/ServerPolicyTest.php
@@ -0,0 +1,157 @@
+<?php
+
+use App\Models\Server;
+use App\Models\User;
+use App\Policies\ServerPolicy;
+
+it('allows any user to view any servers', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $policy = new ServerPolicy;
+    expect($policy->viewAny($user))->toBeTrue();
+});
+
+it('allows team member to view their own team server', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->team_id = 1;
+
+    $policy = new ServerPolicy;
+    expect($policy->view($user, $server))->toBeTrue();
+});
+
+it('denies non-member to view another team server', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->team_id = 2;
+
+    $policy = new ServerPolicy;
+    expect($policy->view($user, $server))->toBeFalse();
+});
+
+it('allows admin to create a server', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ServerPolicy;
+    expect($policy->create($user))->toBeTrue();
+});
+
+it('denies member to create a server', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new ServerPolicy;
+    expect($policy->create($user))->toBeFalse();
+});
+
+it('allows team admin to update their own team server', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->team_id = 1;
+
+    $policy = new ServerPolicy;
+    expect($policy->update($user, $server))->toBeTrue();
+});
+
+it('denies team member to update their own team server', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->team_id = 1;
+
+    $policy = new ServerPolicy;
+    expect($policy->update($user, $server))->toBeFalse();
+});
+
+it('allows team admin to delete their own team server', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->team_id = 1;
+
+    $policy = new ServerPolicy;
+    expect($policy->delete($user, $server))->toBeTrue();
+});
+
+it('denies team member to delete their own team server', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->team_id = 1;
+
+    $policy = new ServerPolicy;
+    expect($policy->delete($user, $server))->toBeFalse();
+});
+
+it('denies restore for any user', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->team_id = 1;
+
+    $policy = new ServerPolicy;
+    expect($policy->restore($user, $server))->toBeFalse();
+});
+
+it('denies force delete for any user', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->team_id = 1;
+
+    $policy = new ServerPolicy;
+    expect($policy->forceDelete($user, $server))->toBeFalse();
+});
+
+it('allows team admin to manage proxy', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->team_id = 1;
+
+    $policy = new ServerPolicy;
+    expect($policy->manageProxy($user, $server))->toBeTrue();
+});
+
+it('denies team member to manage proxy', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->team_id = 1;
+
+    $policy = new ServerPolicy;
+    expect($policy->manageProxy($user, $server))->toBeFalse();
+});
+
+it('allows team admin to manage sentinel, ca certificate, and view security', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $server = Mockery::mock(Server::class)->makePartial();
+    $server->team_id = 1;
+
+    $policy = new ServerPolicy;
+    expect($policy->manageSentinel($user, $server))->toBeTrue();
+    expect($policy->manageCaCertificate($user, $server))->toBeTrue();
+    expect($policy->viewSecurity($user, $server))->toBeTrue();
+});
diff --git a/tests/Unit/Policies/ServiceApplicationPolicyTest.php b/tests/Unit/Policies/ServiceApplicationPolicyTest.php
new file mode 100644
index 000000000..37d68c73e
--- /dev/null
+++ b/tests/Unit/Policies/ServiceApplicationPolicyTest.php
@@ -0,0 +1,37 @@
+<?php
+
+use App\Models\ServiceApplication;
+use App\Models\User;
+use App\Policies\ServiceApplicationPolicy;
+
+it('allows admin to create service application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ServiceApplicationPolicy;
+    expect($policy->create($user))->toBeTrue();
+});
+
+it('denies member from creating service application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new ServiceApplicationPolicy;
+    expect($policy->create($user))->toBeFalse();
+});
+
+it('denies restore for service application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $serviceApp = Mockery::mock(ServiceApplication::class)->makePartial();
+
+    $policy = new ServiceApplicationPolicy;
+    expect($policy->restore($user, $serviceApp))->toBeFalse();
+});
+
+it('denies force delete for service application', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $serviceApp = Mockery::mock(ServiceApplication::class)->makePartial();
+
+    $policy = new ServiceApplicationPolicy;
+    expect($policy->forceDelete($user, $serviceApp))->toBeFalse();
+});
diff --git a/tests/Unit/Policies/ServiceDatabasePolicyTest.php b/tests/Unit/Policies/ServiceDatabasePolicyTest.php
new file mode 100644
index 000000000..44ddd3942
--- /dev/null
+++ b/tests/Unit/Policies/ServiceDatabasePolicyTest.php
@@ -0,0 +1,37 @@
+<?php
+
+use App\Models\ServiceDatabase;
+use App\Models\User;
+use App\Policies\ServiceDatabasePolicy;
+
+it('allows admin to create service database', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ServiceDatabasePolicy;
+    expect($policy->create($user))->toBeTrue();
+});
+
+it('denies member from creating service database', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new ServiceDatabasePolicy;
+    expect($policy->create($user))->toBeFalse();
+});
+
+it('denies restore for service database', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $serviceDb = Mockery::mock(ServiceDatabase::class)->makePartial();
+
+    $policy = new ServiceDatabasePolicy;
+    expect($policy->restore($user, $serviceDb))->toBeFalse();
+});
+
+it('denies force delete for service database', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $serviceDb = Mockery::mock(ServiceDatabase::class)->makePartial();
+
+    $policy = new ServiceDatabasePolicy;
+    expect($policy->forceDelete($user, $serviceDb))->toBeFalse();
+});
diff --git a/tests/Unit/Policies/ServicePolicyTest.php b/tests/Unit/Policies/ServicePolicyTest.php
new file mode 100644
index 000000000..166fbc617
--- /dev/null
+++ b/tests/Unit/Policies/ServicePolicyTest.php
@@ -0,0 +1,233 @@
+<?php
+
+use App\Models\Service;
+use App\Models\User;
+use App\Policies\ServicePolicy;
+
+it('allows any user to view any services', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $policy = new ServicePolicy;
+    expect($policy->viewAny($user))->toBeTrue();
+});
+
+it('allows team member to view their own team service', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ServicePolicy;
+    expect($policy->view($user, $service))->toBeTrue();
+});
+
+it('denies non-member to view another team service', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn((object) ['id' => 2]);
+
+    $policy = new ServicePolicy;
+    expect($policy->view($user, $service))->toBeFalse();
+});
+
+it('denies view when service has no team', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn(null);
+
+    $policy = new ServicePolicy;
+    expect($policy->view($user, $service))->toBeFalse();
+});
+
+it('allows admin to create a service', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new ServicePolicy;
+    expect($policy->create($user))->toBeTrue();
+});
+
+it('denies member to create a service', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new ServicePolicy;
+    expect($policy->create($user))->toBeFalse();
+});
+
+it('allows team admin to update their own team service', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ServicePolicy;
+    expect($policy->update($user, $service))->toBeTrue();
+});
+
+it('denies team member to update their own team service', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ServicePolicy;
+    expect($policy->update($user, $service))->toBeFalse();
+});
+
+it('allows team admin to delete their own team service', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ServicePolicy;
+    expect($policy->delete($user, $service))->toBeTrue();
+});
+
+it('denies team member to delete their own team service', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ServicePolicy;
+    expect($policy->delete($user, $service))->toBeFalse();
+});
+
+it('denies delete when service has no team', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn(null);
+
+    $policy = new ServicePolicy;
+    expect($policy->delete($user, $service))->toBeFalse();
+});
+
+it('allows team admin to deploy their own team service', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ServicePolicy;
+    expect($policy->deploy($user, $service))->toBeTrue();
+});
+
+it('denies team member to deploy their own team service', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ServicePolicy;
+    expect($policy->deploy($user, $service))->toBeFalse();
+});
+
+it('allows team admin to stop their own team service', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ServicePolicy;
+    expect($policy->stop($user, $service))->toBeTrue();
+});
+
+it('denies team member to stop their own team service', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ServicePolicy;
+    expect($policy->stop($user, $service))->toBeFalse();
+});
+
+it('allows team admin to manage service environment variables', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ServicePolicy;
+    expect($policy->manageEnvironment($user, $service))->toBeTrue();
+});
+
+it('denies team member to manage service environment variables', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ServicePolicy;
+    expect($policy->manageEnvironment($user, $service))->toBeFalse();
+});
+
+it('allows team admin to access terminal', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ServicePolicy;
+    expect($policy->accessTerminal($user, $service))->toBeTrue();
+});
+
+it('denies team member to access terminal', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $service = Mockery::mock(Service::class)->makePartial();
+    $service->shouldReceive('team')->andReturn((object) ['id' => 1]);
+
+    $policy = new ServicePolicy;
+    expect($policy->accessTerminal($user, $service))->toBeFalse();
+});
+
+it('denies restore for any user', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $service = Mockery::mock(Service::class)->makePartial();
+
+    $policy = new ServicePolicy;
+    expect($policy->restore($user, $service))->toBeFalse();
+});
+
+it('denies force delete for any user', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $service = Mockery::mock(Service::class)->makePartial();
+
+    $policy = new ServicePolicy;
+    expect($policy->forceDelete($user, $service))->toBeFalse();
+});
diff --git a/tests/Unit/Policies/SharedEnvironmentVariablePolicyTest.php b/tests/Unit/Policies/SharedEnvironmentVariablePolicyTest.php
index f993978f9..d2a287a51 100644
--- a/tests/Unit/Policies/SharedEnvironmentVariablePolicyTest.php
+++ b/tests/Unit/Policies/SharedEnvironmentVariablePolicyTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Models\SharedEnvironmentVariable;
 use App\Models\User;
 use App\Policies\SharedEnvironmentVariablePolicy;
 
@@ -18,10 +19,7 @@ it('allows team member to view their team shared environment variable', function
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $model = new class
-    {
-        public $team_id = 1;
-    };
+    $model = mockSharedEnvironmentVariable(teamId: 1);
 
     $policy = new SharedEnvironmentVariablePolicy;
     expect($policy->view($user, $model))->toBeTrue();
@@ -35,10 +33,7 @@ it('denies non-team member to view shared environment variable', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
 
-    $model = new class
-    {
-        public $team_id = 2;
-    };
+    $model = mockSharedEnvironmentVariable(teamId: 2);
 
     $policy = new SharedEnvironmentVariablePolicy;
     expect($policy->view($user, $model))->toBeFalse();
@@ -64,10 +59,7 @@ it('allows team admin to update shared environment variable', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
 
-    $model = new class
-    {
-        public $team_id = 1;
-    };
+    $model = mockSharedEnvironmentVariable(teamId: 1);
 
     $policy = new SharedEnvironmentVariablePolicy;
     expect($policy->update($user, $model))->toBeTrue();
@@ -77,10 +69,7 @@ it('denies team member to update shared environment variable', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
 
-    $model = new class
-    {
-        public $team_id = 1;
-    };
+    $model = mockSharedEnvironmentVariable(teamId: 1);
 
     $policy = new SharedEnvironmentVariablePolicy;
     expect($policy->update($user, $model))->toBeFalse();
@@ -90,10 +79,7 @@ it('allows team admin to delete shared environment variable', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
 
-    $model = new class
-    {
-        public $team_id = 1;
-    };
+    $model = mockSharedEnvironmentVariable(teamId: 1);
 
     $policy = new SharedEnvironmentVariablePolicy;
     expect($policy->delete($user, $model))->toBeTrue();
@@ -103,10 +89,7 @@ it('denies team member to delete shared environment variable', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
 
-    $model = new class
-    {
-        public $team_id = 1;
-    };
+    $model = mockSharedEnvironmentVariable(teamId: 1);
 
     $policy = new SharedEnvironmentVariablePolicy;
     expect($policy->delete($user, $model))->toBeFalse();
@@ -115,10 +98,7 @@ it('denies team member to delete shared environment variable', function () {
 it('denies restore of shared environment variable', function () {
     $user = Mockery::mock(User::class)->makePartial();
 
-    $model = new class
-    {
-        public $team_id = 1;
-    };
+    $model = mockSharedEnvironmentVariable(teamId: 1);
 
     $policy = new SharedEnvironmentVariablePolicy;
     expect($policy->restore($user, $model))->toBeFalse();
@@ -127,10 +107,7 @@ it('denies restore of shared environment variable', function () {
 it('denies force delete of shared environment variable', function () {
     $user = Mockery::mock(User::class)->makePartial();
 
-    $model = new class
-    {
-        public $team_id = 1;
-    };
+    $model = mockSharedEnvironmentVariable(teamId: 1);
 
     $policy = new SharedEnvironmentVariablePolicy;
     expect($policy->forceDelete($user, $model))->toBeFalse();
@@ -140,10 +117,7 @@ it('allows team admin to manage environment', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
 
-    $model = new class
-    {
-        public $team_id = 1;
-    };
+    $model = mockSharedEnvironmentVariable(teamId: 1);
 
     $policy = new SharedEnvironmentVariablePolicy;
     expect($policy->manageEnvironment($user, $model))->toBeTrue();
@@ -153,11 +127,16 @@ it('denies team member to manage environment', function () {
     $user = Mockery::mock(User::class)->makePartial();
     $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
 
-    $model = new class
-    {
-        public $team_id = 1;
-    };
+    $model = mockSharedEnvironmentVariable(teamId: 1);
 
     $policy = new SharedEnvironmentVariablePolicy;
     expect($policy->manageEnvironment($user, $model))->toBeFalse();
 });
+
+function mockSharedEnvironmentVariable(int $teamId): SharedEnvironmentVariable
+{
+    $sharedEnvironmentVariable = Mockery::mock(SharedEnvironmentVariable::class)->makePartial();
+    $sharedEnvironmentVariable->team_id = $teamId;
+
+    return $sharedEnvironmentVariable;
+}
diff --git a/tests/Unit/Policies/StandaloneDockerPolicyTest.php b/tests/Unit/Policies/StandaloneDockerPolicyTest.php
new file mode 100644
index 000000000..750aff6c2
--- /dev/null
+++ b/tests/Unit/Policies/StandaloneDockerPolicyTest.php
@@ -0,0 +1,122 @@
+<?php
+
+use App\Models\StandaloneDocker;
+use App\Models\User;
+use App\Policies\StandaloneDockerPolicy;
+
+it('allows any user to view any standalone docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $policy = new StandaloneDockerPolicy;
+    expect($policy->viewAny($user))->toBeTrue();
+});
+
+it('allows team member to view their team standalone docker', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $standaloneDocker = Mockery::mock(StandaloneDocker::class)->makePartial();
+    $standaloneDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new StandaloneDockerPolicy;
+    expect($policy->view($user, $standaloneDocker))->toBeTrue();
+});
+
+it('denies user from viewing another team standalone docker', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $standaloneDocker = Mockery::mock(StandaloneDocker::class)->makePartial();
+    $standaloneDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 2]);
+
+    $policy = new StandaloneDockerPolicy;
+    expect($policy->view($user, $standaloneDocker))->toBeFalse();
+});
+
+it('allows admin to create standalone docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new StandaloneDockerPolicy;
+    expect($policy->create($user))->toBeTrue();
+});
+
+it('denies non-admin from creating standalone docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new StandaloneDockerPolicy;
+    expect($policy->create($user))->toBeFalse();
+});
+
+it('allows team admin to update standalone docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $standaloneDocker = Mockery::mock(StandaloneDocker::class)->makePartial();
+    $standaloneDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new StandaloneDockerPolicy;
+    expect($policy->update($user, $standaloneDocker))->toBeTrue();
+});
+
+it('denies non-admin from updating standalone docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $standaloneDocker = Mockery::mock(StandaloneDocker::class)->makePartial();
+    $standaloneDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new StandaloneDockerPolicy;
+    expect($policy->update($user, $standaloneDocker))->toBeFalse();
+});
+
+it('allows team admin to delete standalone docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $standaloneDocker = Mockery::mock(StandaloneDocker::class)->makePartial();
+    $standaloneDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new StandaloneDockerPolicy;
+    expect($policy->delete($user, $standaloneDocker))->toBeTrue();
+});
+
+it('denies non-admin from deleting standalone docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $standaloneDocker = Mockery::mock(StandaloneDocker::class)->makePartial();
+    $standaloneDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new StandaloneDockerPolicy;
+    expect($policy->delete($user, $standaloneDocker))->toBeFalse();
+});
+
+it('denies restore for standalone docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $standaloneDocker = Mockery::mock(StandaloneDocker::class)->makePartial();
+    $standaloneDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new StandaloneDockerPolicy;
+    expect($policy->restore($user, $standaloneDocker))->toBeFalse();
+});
+
+it('denies force delete for standalone docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $standaloneDocker = Mockery::mock(StandaloneDocker::class)->makePartial();
+    $standaloneDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new StandaloneDockerPolicy;
+    expect($policy->forceDelete($user, $standaloneDocker))->toBeFalse();
+});
diff --git a/tests/Unit/Policies/SwarmDockerPolicyTest.php b/tests/Unit/Policies/SwarmDockerPolicyTest.php
new file mode 100644
index 000000000..f1b060086
--- /dev/null
+++ b/tests/Unit/Policies/SwarmDockerPolicyTest.php
@@ -0,0 +1,122 @@
+<?php
+
+use App\Models\SwarmDocker;
+use App\Models\User;
+use App\Policies\SwarmDockerPolicy;
+
+it('allows any user to view any swarm docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $policy = new SwarmDockerPolicy;
+    expect($policy->viewAny($user))->toBeTrue();
+});
+
+it('allows team member to view their team swarm docker', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $swarmDocker = Mockery::mock(SwarmDocker::class)->makePartial();
+    $swarmDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new SwarmDockerPolicy;
+    expect($policy->view($user, $swarmDocker))->toBeTrue();
+});
+
+it('denies user from viewing another team swarm docker', function () {
+    $teams = collect([
+        (object) ['id' => 1],
+    ]);
+
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('getAttribute')->with('teams')->andReturn($teams);
+
+    $swarmDocker = Mockery::mock(SwarmDocker::class)->makePartial();
+    $swarmDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 2]);
+
+    $policy = new SwarmDockerPolicy;
+    expect($policy->view($user, $swarmDocker))->toBeFalse();
+});
+
+it('allows admin to create swarm docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(true);
+
+    $policy = new SwarmDockerPolicy;
+    expect($policy->create($user))->toBeTrue();
+});
+
+it('denies non-admin from creating swarm docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdmin')->andReturn(false);
+
+    $policy = new SwarmDockerPolicy;
+    expect($policy->create($user))->toBeFalse();
+});
+
+it('allows team admin to update swarm docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $swarmDocker = Mockery::mock(SwarmDocker::class)->makePartial();
+    $swarmDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new SwarmDockerPolicy;
+    expect($policy->update($user, $swarmDocker))->toBeTrue();
+});
+
+it('denies non-admin from updating swarm docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $swarmDocker = Mockery::mock(SwarmDocker::class)->makePartial();
+    $swarmDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new SwarmDockerPolicy;
+    expect($policy->update($user, $swarmDocker))->toBeFalse();
+});
+
+it('allows team admin to delete swarm docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(true);
+
+    $swarmDocker = Mockery::mock(SwarmDocker::class)->makePartial();
+    $swarmDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new SwarmDockerPolicy;
+    expect($policy->delete($user, $swarmDocker))->toBeTrue();
+});
+
+it('denies non-admin from deleting swarm docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+    $user->shouldReceive('isAdminOfTeam')->with(1)->andReturn(false);
+
+    $swarmDocker = Mockery::mock(SwarmDocker::class)->makePartial();
+    $swarmDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new SwarmDockerPolicy;
+    expect($policy->delete($user, $swarmDocker))->toBeFalse();
+});
+
+it('denies restore for swarm docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $swarmDocker = Mockery::mock(SwarmDocker::class)->makePartial();
+    $swarmDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new SwarmDockerPolicy;
+    expect($policy->restore($user, $swarmDocker))->toBeFalse();
+});
+
+it('denies force delete for swarm docker', function () {
+    $user = Mockery::mock(User::class)->makePartial();
+
+    $swarmDocker = Mockery::mock(SwarmDocker::class)->makePartial();
+    $swarmDocker->shouldReceive('getAttribute')->with('server')->andReturn((object) ['team_id' => 1]);
+
+    $policy = new SwarmDockerPolicy;
+    expect($policy->forceDelete($user, $swarmDocker))->toBeFalse();
+});
diff --git a/tests/v4/Browser/AuthorizationTest.php b/tests/v4/Browser/AuthorizationTest.php
new file mode 100644
index 000000000..cb26b73a9
--- /dev/null
+++ b/tests/v4/Browser/AuthorizationTest.php
@@ -0,0 +1,447 @@
+<?php
+
+use App\Enums\ProxyStatus;
+use App\Enums\ProxyTypes;
+use App\Models\InstanceSettings;
+use App\Models\PrivateKey;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Hash;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::create(['id' => 0, 'is_sponsorship_popup_enabled' => false]);
+
+    // Create root/owner user
+    $this->user = User::factory()->create([
+        'id' => 0,
+        'name' => 'Root User',
+        'email' => 'test@example.com',
+        'password' => Hash::make('password'),
+    ]);
+
+    // Create SSH key for the root user's team
+    PrivateKey::create([
+        'id' => 1,
+        'uuid' => 'ssh-test',
+        'team_id' => 0,
+        'name' => 'Test Key',
+        'description' => 'Test SSH key',
+        'private_key' => '-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACBbhpqHhqv6aI67Mj9abM3DVbmcfYhZAhC7ca4d9UCevAAAAJi/QySHv0Mk
+hwAAAAtzc2gtZWQyNTUxOQAAACBbhpqHhqv6aI67Mj9abM3DVbmcfYhZAhC7ca4d9UCevA
+AAAECBQw4jg1WRT2IGHMncCiZhURCts2s24HoDS0thHnnRKVuGmoeGq/pojrsyP1pszcNV
+uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
+-----END OPENSSH PRIVATE KEY-----',
+    ]);
+
+    // Create servers for testing
+    Server::create([
+        'id' => 0,
+        'uuid' => 'localhost',
+        'name' => 'localhost',
+        'description' => 'Test docker container in development',
+        'ip' => 'coolify-testing-host',
+        'team_id' => 0,
+        'private_key_id' => 1,
+        'proxy' => [
+            'type' => ProxyTypes::TRAEFIK->value,
+            'status' => ProxyStatus::EXITED->value,
+        ],
+    ]);
+
+    Server::create([
+        'uuid' => 'production-1',
+        'name' => 'production-web',
+        'description' => 'Production web server',
+        'ip' => '10.0.0.1',
+        'team_id' => 0,
+        'private_key_id' => 1,
+        'proxy' => [
+            'type' => ProxyTypes::TRAEFIK->value,
+            'status' => ProxyStatus::EXITED->value,
+        ],
+    ]);
+
+    // Create projects for testing
+    Project::create([
+        'uuid' => 'project-1',
+        'name' => 'My first project',
+        'description' => 'This is a test project',
+        'team_id' => 0,
+    ]);
+
+    Project::create([
+        'uuid' => 'project-2',
+        'name' => 'Production API',
+        'description' => 'Backend services',
+        'team_id' => 0,
+    ]);
+
+    // Create a member user attached to root team only
+    $this->member = User::factory()->create([
+        'name' => 'Member User',
+        'email' => 'member@example.com',
+        'password' => Hash::make('password'),
+    ]);
+    // Remove auto-created personal team so member only belongs to root team
+    $personalTeam = $this->member->teams()->first();
+    $this->member->teams()->detach($personalTeam->id);
+    $personalTeam->delete();
+    // Attach member to root team (id=0) with 'member' role
+    $this->member->teams()->attach(0, ['role' => 'member']);
+});
+
+function loginAsMember(): mixed
+{
+    return visit('/login')
+        ->fill('email', 'member@example.com')
+        ->fill('password', 'password')
+        ->click('Login');
+}
+
+it('redirects unauthenticated users to login', function () {
+    $page = visit('/dashboard');
+
+    $page->assertPathIs('/login')
+        ->screenshot();
+});
+
+it('shows dashboard after successful login and onboarding skip', function () {
+    $page = loginAndSkipBoarding();
+
+    $page->assertSee('Dashboard')
+        ->assertSee('Your self-hosted infrastructure')
+        ->screenshot();
+});
+
+it('displays all projects on dashboard', function () {
+    $page = loginAndSkipBoarding();
+
+    $page->assertSee('Projects')
+        ->assertSee('My first project')
+        ->assertSee('This is a test project')
+        ->assertSee('Production API')
+        ->assertSee('Backend services')
+        ->screenshot();
+});
+
+it('displays all servers on dashboard', function () {
+    $page = loginAndSkipBoarding();
+
+    $page->assertSee('Servers')
+        ->assertSee('localhost')
+        ->assertSee('Test docker container in development')
+        ->assertSee('production-web')
+        ->assertSee('Production web server')
+        ->screenshot();
+});
+
+it('allows authenticated users to access team settings', function () {
+    loginAndSkipBoarding();
+
+    $page = visit('/team');
+
+    $page->assertSee('General')
+        ->assertSee('Manage the general settings of this team')
+        ->screenshot();
+});
+
+it('shows danger zone to team owner', function () {
+    loginAndSkipBoarding();
+
+    $page = visit('/team');
+
+    $page->assertSee('Danger Zone')
+        ->assertSee('Delete Team')
+        ->screenshot();
+});
+
+it('prevents unauthenticated access to team settings', function () {
+    $page = visit('/team');
+
+    $page->assertPathIs('/login')
+        ->screenshot();
+});
+
+it('prevents unauthenticated access to server show page', function () {
+    $server = Server::first();
+    $page = visit("/server/{$server->uuid}");
+
+    $page->assertPathIs('/login')
+        ->screenshot();
+});
+
+it('prevents unauthenticated access to project show page', function () {
+    $project = Project::first();
+    $page = visit("/project/{$project->uuid}");
+
+    $page->assertPathIs('/login')
+        ->screenshot();
+});
+
+it('authenticated user can navigate to server details', function () {
+    loginAndSkipBoarding();
+
+    // Navigate to server show page using UUID
+    $server = Server::first();
+    $page = visit("/server/{$server->uuid}");
+
+    // Server page should load without redirect
+    $page->assertSee('localhost')
+        ->screenshot();
+});
+
+it('authenticated user can navigate to project details', function () {
+    loginAndSkipBoarding();
+
+    // Navigate to project show page using UUID
+    $project = Project::first();
+    $page = visit("/project/{$project->uuid}");
+
+    // Project page should load without redirect
+    $page->assertSee('My first project')
+        ->screenshot();
+});
+
+it('prevents unauthenticated access to team members page', function () {
+    $page = visit('/team/members');
+
+    $page->assertPathIs('/login')
+        ->screenshot();
+});
+
+it('authenticated user can access team members page', function () {
+    loginAndSkipBoarding();
+
+    $page = visit('/team/members');
+
+    $page->assertSee('Members')
+        ->screenshot();
+});
+
+// --- Negative authorization tests (member role) ---
+
+it('member does not see add project button on dashboard', function () {
+    $page = loginAsMember();
+
+    $page->assertSee('Projects')
+        ->assertDontSee('New Project')
+        ->screenshot();
+});
+
+it('member does not see add server button on dashboard', function () {
+    $page = loginAsMember();
+
+    $page->assertSee('Servers')
+        ->assertDontSee('New Server')
+        ->screenshot();
+});
+
+it('member does not see danger zone on team settings', function () {
+    loginAsMember();
+
+    $page = visit('/team');
+
+    $page->assertSee('General')
+        ->assertDontSee('Danger Zone')
+        ->assertDontSee('Delete Team')
+        ->screenshot();
+});
+
+// --- Server page authorization tests ---
+
+it('member does not see terminal link on server page', function () {
+    loginAsMember();
+
+    $server = Server::first();
+    $page = visit("/server/{$server->uuid}");
+
+    $page->assertSee('Configuration')
+        ->assertDontSee('Terminal')
+        ->screenshot();
+});
+
+it('member does not see security link on server page', function () {
+    loginAsMember();
+
+    $server = Server::first();
+    $page = visit("/server/{$server->uuid}");
+
+    $page->assertSee('Configuration')
+        ->assertDontSee('Security')
+        ->screenshot();
+});
+
+it('member does not see proxy controls on server page', function () {
+    loginAsMember();
+
+    $server = Server::first();
+    $page = visit("/server/{$server->uuid}");
+
+    $page->assertSee('Configuration')
+        ->assertDontSee('Start Proxy')
+        ->assertDontSee('Restart Proxy')
+        ->assertDontSee('Stop Proxy')
+        ->screenshot();
+});
+
+it('owner sees terminal and security links on server page', function () {
+    loginAndSkipBoarding();
+
+    $server = Server::first();
+    $page = visit("/server/{$server->uuid}");
+
+    $page->assertSee('Configuration')
+        ->assertSee('Terminal')
+        ->assertSee('Security')
+        ->screenshot();
+});
+
+// Note: Proxy controls (Start/Stop/Restart Proxy) require server.isFunctional()=true
+// which needs is_reachable=true and is_usable=true in server settings.
+// Testing proxy button visibility is covered by the member test above (proxy controls
+// are behind @can('manageProxy', $server) which is admin-only).
+
+// --- Project page authorization tests ---
+
+it('member does not see add environment button on project page', function () {
+    loginAsMember();
+
+    $project = Project::where('uuid', 'project-1')->first();
+    $page = visit("/project/{$project->uuid}");
+
+    $page->assertSee('Environments')
+        ->assertDontSee('+ Add')
+        ->screenshot();
+});
+
+it('member does not see environment settings link on project page', function () {
+    loginAsMember();
+
+    $project = Project::where('uuid', 'project-1')->first();
+    $page = visit("/project/{$project->uuid}");
+
+    $page->assertSee('Environments')
+        ->assertDontSee('Settings')
+        ->screenshot();
+});
+
+it('owner sees add environment and settings on project page', function () {
+    loginAndSkipBoarding();
+
+    $project = Project::where('uuid', 'project-1')->first();
+    $page = visit("/project/{$project->uuid}");
+
+    $page->assertSee('Environments')
+        ->assertSee('+ Add')
+        ->assertSee('Settings')
+        ->screenshot();
+});
+
+// --- Dashboard: resource links authorization ---
+
+it('member does not see add resource link on dashboard project cards', function () {
+    $page = loginAsMember();
+
+    $page->assertSee('Projects')
+        ->assertSee('My first project')
+        ->assertDontSee('+ Add Resource')
+        ->screenshot();
+});
+
+it('owner sees add resource link on dashboard project cards', function () {
+    loginAndSkipBoarding();
+
+    $page = visit('/dashboard');
+
+    $page->assertSee('Projects')
+        ->assertSee('My first project')
+        ->assertSee('+ Add Resource')
+        ->screenshot();
+});
+
+it('member does not see project settings link on dashboard', function () {
+    $page = loginAsMember();
+
+    // The "Settings" link is inside the project card on the dashboard
+    // Member should not see it due to @can('update', $project)
+    $page->assertSee('My first project')
+        ->assertDontSee('Settings')
+        ->screenshot();
+});
+
+// --- Team members page authorization ---
+
+it('member does not see invite form on team members page', function () {
+    loginAsMember();
+
+    $page = visit('/team/members');
+
+    $page->assertSee('Members')
+        ->assertDontSee('Invite New Member')
+        ->screenshot();
+});
+
+it('owner sees invite form on team members page', function () {
+    loginAndSkipBoarding();
+
+    $page = visit('/team/members');
+
+    $page->assertSee('Members')
+        ->assertSee('Invite New Member')
+        ->screenshot();
+});
+
+it('member does not see role change buttons on team members page', function () {
+    loginAsMember();
+
+    $page = visit('/team/members');
+
+    $page->assertSee('Members')
+        ->assertDontSee('To Admin')
+        ->assertDontSee('To Owner')
+        ->assertDontSee('Remove')
+        ->screenshot();
+});
+
+// --- Server show page authorization ---
+
+it('member does not see save button on server show page', function () {
+    loginAsMember();
+
+    $server = Server::first();
+    $page = visit("/server/{$server->uuid}");
+
+    $page->assertSee('General')
+        ->assertDontSee('Revalidate server')
+        ->screenshot();
+});
+
+it('owner sees save button on server show page', function () {
+    loginAndSkipBoarding();
+
+    $server = Server::first();
+    $page = visit("/server/{$server->uuid}");
+
+    $page->assertSee('General')
+        ->assertSee('Save')
+        ->screenshot();
+});
+
+// --- Project show page authorization ---
+
+it('member does not see delete project button on project page', function () {
+    loginAsMember();
+
+    $project = Project::where('uuid', 'project-1')->first();
+    $page = visit("/project/{$project->uuid}");
+
+    $page->assertSee('Environments')
+        ->assertDontSee('Delete Project')
+        ->screenshot();
+});
diff --git a/tests/v4/Browser/DashboardTest.php b/tests/v4/Browser/DashboardTest.php
index b4a97f268..d50fceb0b 100644
--- a/tests/v4/Browser/DashboardTest.php
+++ b/tests/v4/Browser/DashboardTest.php
@@ -13,7 +13,7 @@ use Illuminate\Support\Facades\Hash;
 uses(RefreshDatabase::class);
 
 beforeEach(function () {
-    InstanceSettings::create(['id' => 0]);
+    InstanceSettings::create(['id' => 0, 'is_sponsorship_popup_enabled' => false]);
 
     $this->user = User::factory()->create([
         'id' => 0,
@@ -99,15 +99,6 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     ]);
 });
 
-function loginAndSkipOnboarding(): mixed
-{
-    return visit('/login')
-        ->fill('email', 'test@example.com')
-        ->fill('password', 'password')
-        ->click('Login')
-        ->click('Skip Setup');
-}
-
 it('redirects to login when not authenticated', function () {
     $page = visit('/');
 
@@ -128,7 +119,7 @@ it('shows onboarding after first login', function () {
 });
 
 it('shows dashboard after skipping onboarding', function () {
-    $page = loginAndSkipOnboarding();
+    $page = loginAndSkipBoarding();
 
     $page->assertSee('Dashboard')
         ->assertSee('Your self-hosted infrastructure.')
@@ -136,7 +127,7 @@ it('shows dashboard after skipping onboarding', function () {
 });
 
 it('shows all projects on dashboard', function () {
-    $page = loginAndSkipOnboarding();
+    $page = loginAndSkipBoarding();
 
     $page->assertSee('Projects')
         ->assertSee('My first project')
@@ -149,7 +140,7 @@ it('shows all projects on dashboard', function () {
 });
 
 it('shows servers on dashboard', function () {
-    $page = loginAndSkipOnboarding();
+    $page = loginAndSkipBoarding();
 
     $page->assertSee('Servers')
         ->assertSee('localhost')
diff --git a/tests/v4/Browser/LoginTest.php b/tests/v4/Browser/LoginTest.php
index 7666e07e2..716acd20a 100644
--- a/tests/v4/Browser/LoginTest.php
+++ b/tests/v4/Browser/LoginTest.php
@@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Hash;
 uses(RefreshDatabase::class);
 
 beforeEach(function () {
-    InstanceSettings::create(['id' => 0]);
+    InstanceSettings::create(['id' => 0, 'is_sponsorship_popup_enabled' => false]);
 });
 
 it('shows registration page when no users exist', function () {
diff --git a/tests/v4/Browser/RegistrationTest.php b/tests/v4/Browser/RegistrationTest.php
index e2a232357..42a871257 100644
--- a/tests/v4/Browser/RegistrationTest.php
+++ b/tests/v4/Browser/RegistrationTest.php
@@ -7,7 +7,7 @@ use Illuminate\Foundation\Testing\RefreshDatabase;
 uses(RefreshDatabase::class);
 
 beforeEach(function () {
-    InstanceSettings::create(['id' => 0]);
+    InstanceSettings::create(['id' => 0, 'is_sponsorship_popup_enabled' => false]);
 });
 
 it('shows registration page when no users exist', function () {
diff --git a/tests/v4/Browser/ResourceSettingsPersistenceTest.php b/tests/v4/Browser/ResourceSettingsPersistenceTest.php
new file mode 100644
index 000000000..c9d698efc
--- /dev/null
+++ b/tests/v4/Browser/ResourceSettingsPersistenceTest.php
@@ -0,0 +1,180 @@
+<?php
+
+use App\Enums\ProxyStatus;
+use App\Enums\ProxyTypes;
+use App\Models\Application;
+use App\Models\DiscordNotificationSettings;
+use App\Models\InstanceSettings;
+use App\Models\PrivateKey;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\StandaloneDocker;
+use App\Models\StandalonePostgresql;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Hash;
+use Visus\Cuid2\Cuid2;
+
+uses(RefreshDatabase::class);
+
+beforeEach(function () {
+    InstanceSettings::create(['id' => 0, 'is_sponsorship_popup_enabled' => false]);
+
+    $this->user = User::factory()->create([
+        'id' => 0,
+        'name' => 'Root User',
+        'email' => 'test@example.com',
+        'password' => Hash::make('password'),
+    ]);
+
+    DiscordNotificationSettings::where('team_id', 0)->update([
+        'discord_enabled' => true,
+        'discord_webhook_url' => 'https://discord.com/test',
+    ]);
+
+    PrivateKey::create([
+        'id' => 1,
+        'uuid' => 'ssh-test',
+        'team_id' => 0,
+        'name' => 'Test Key',
+        'description' => 'Test SSH key',
+        'private_key' => '-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACBbhpqHhqv6aI67Mj9abM3DVbmcfYhZAhC7ca4d9UCevAAAAJi/QySHv0Mk
+hwAAAAtzc2gtZWQyNTUxOQAAACBbhpqHhqv6aI67Mj9abM3DVbmcfYhZAhC7ca4d9UCevA
+AAAECBQw4jg1WRT2IGHMncCiZhURCts2s24HoDS0thHnnRKVuGmoeGq/pojrsyP1pszcNV
+uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
+-----END OPENSSH PRIVATE KEY-----',
+    ]);
+
+    $this->server = Server::create([
+        'id' => 0,
+        'uuid' => 'localhost',
+        'name' => 'localhost',
+        'description' => 'Test docker container in development',
+        'ip' => 'coolify-testing-host',
+        'team_id' => 0,
+        'private_key_id' => 1,
+        'proxy' => [
+            'type' => ProxyTypes::TRAEFIK->value,
+            'status' => ProxyStatus::EXITED->value,
+        ],
+    ]);
+
+    $this->project = Project::create([
+        'uuid' => 'project-resource-persistence',
+        'name' => 'Resource Persistence',
+        'description' => 'Browser persistence tests',
+        'team_id' => 0,
+    ]);
+
+    $this->environment = $this->project->environments()->first();
+
+    StandaloneDocker::withoutEvents(function () {
+        $this->destination = StandaloneDocker::firstOrCreate(
+            ['server_id' => $this->server->id, 'network' => 'coolify'],
+            ['uuid' => 'docker-destination-1', 'name' => 'docker-destination-1']
+        );
+    });
+
+    $this->application = Application::factory()->create([
+        'uuid' => 'app-resource-persistence',
+        'name' => 'App Before Browser Save',
+        'git_repository' => 'https://github.com/coollabsio/coolify.git',
+        'git_branch' => 'main',
+        'build_pack' => 'nixpacks',
+        'ports_exposes' => '3000',
+        'environment_id' => $this->environment->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+    ]);
+
+    $this->database = StandalonePostgresql::create([
+        'uuid' => 'db-resource-persistence',
+        'name' => 'Database Before Browser Save',
+        'description' => 'Initial database description',
+        'postgres_user' => 'postgres',
+        'postgres_password' => 'postgres-password',
+        'postgres_db' => 'postgres',
+        'image' => 'postgres:15-alpine',
+        'status' => 'exited',
+        'environment_id' => $this->environment->id,
+        'destination_id' => $this->destination->id,
+        'destination_type' => $this->destination->getMorphClass(),
+    ]);
+});
+
+it('saves application name and enables static site with nginx config', function () {
+    loginAndSkipBoarding();
+
+    $updatedName = 'App Saved '.(string) new Cuid2;
+    $applicationRoute = "/project/{$this->project->uuid}/environment/{$this->environment->uuid}/application/{$this->application->uuid}";
+
+    $page = visit($applicationRoute);
+    $page->screenshot();
+
+    $page->assertSee('General')
+        ->assertDontSee('Custom Nginx Configuration')
+        ->fill('name', $updatedName)
+        ->fill('customDockerRunOptions', '--read-only');
+
+    submitLivewireForm($page);
+    $page->click('[id^="isStatic"]')
+        ->wait(2)
+        ->screenshot();
+
+    $page->assertSourceHas('Custom Nginx Configuration')
+        ->assertSee('Is it a SPA (Single Page Application)?')
+        ->assertValue('name', $updatedName);
+
+    $this->application->refresh();
+    expect($this->application->name)->toBe($updatedName)
+        ->and($this->application->custom_docker_run_options)->toBe('--read-only')
+        ->and($this->application->settings->is_static)->toBeTrue();
+
+    $reloadedPage = visit($applicationRoute);
+    $reloadedPage->screenshot();
+
+    $reloadedPage->assertValue('name', $updatedName)
+        ->assertSourceHas('Custom Nginx Configuration')
+        ->assertSourceHas('Is it a SPA (Single Page Application)?');
+});
+
+it('saves database name and enables ssl with mode selector', function () {
+    loginAndSkipBoarding();
+
+    $updatedDatabaseName = 'Database Saved '.(string) new Cuid2;
+    $databaseRoute = "/project/{$this->project->uuid}/environment/{$this->environment->uuid}/database/{$this->database->uuid}";
+
+    $page = visit($databaseRoute);
+    $page->screenshot();
+
+    $page->assertSee('General')
+        ->assertDontSee('SSL Mode')
+        ->fill('name', $updatedDatabaseName)
+        ->fill('description', 'Updated by browser test');
+
+    submitLivewireForm($page);
+    $page->click('[id^="enableSsl"]');
+
+    $page->assertSee('SSL Mode')
+        ->assertValue('name', $updatedDatabaseName);
+    $page->screenshot();
+
+    $this->database->refresh();
+    expect($this->database->name)->toBe($updatedDatabaseName)
+        ->and($this->database->description)->toBe('Updated by browser test')
+        ->and($this->database->enable_ssl)->toBeTruthy();
+
+    $reloadedPage = visit($databaseRoute);
+    $reloadedPage->screenshot();
+
+    $reloadedPage->assertValue('name', $updatedDatabaseName)
+        ->assertSee('SSL Mode');
+});
+
+function submitLivewireForm($page): void
+{
+    $page->script("document.querySelector('form[wire\\\\:submit=\"submit\"]')?.requestSubmit()");
+    $page->wait(1);
+}