diff --git a/app/Actions/Service/DeleteService.php b/app/Actions/Service/DeleteService.php
index f7464a697..1a411cf59 100644
--- a/app/Actions/Service/DeleteService.php
+++ b/app/Actions/Service/DeleteService.php
@@ -45,6 +45,7 @@ class DeleteService
             foreach ($service->databases()->get() as $database) {
                 $database->forceDelete();
             }
+            $service->tags()->detach();
         }
     }
 }
diff --git a/app/Http/Controllers/Api/Deploy.php b/app/Http/Controllers/Api/Deploy.php
new file mode 100644
index 000000000..322d73e67
--- /dev/null
+++ b/app/Http/Controllers/Api/Deploy.php
@@ -0,0 +1,154 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Actions\Database\StartMariadb;
+use App\Actions\Database\StartMongodb;
+use App\Actions\Database\StartMysql;
+use App\Actions\Database\StartPostgresql;
+use App\Actions\Database\StartRedis;
+use App\Actions\Service\StartService;
+use App\Http\Controllers\Controller;
+use App\Models\Tag;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use Visus\Cuid2\Cuid2;
+
+class Deploy extends Controller
+{
+    public function deploy(Request $request)
+    {
+        $token = auth()->user()->currentAccessToken();
+        $teamId = data_get($token, 'team_id');
+        $uuids = $request->query->get('uuid');
+        $tags = $request->query->get('tag');
+        $force = $request->query->get('force') ?? false;
+
+        if ($uuids && $tags) {
+            return response()->json(['error' => 'You can only use uuid or tag, not both.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+        }
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        if ($tags) {
+            return $this->by_tags($tags, $teamId, $force);
+        } else if ($uuids) {
+            return $this->by_uuids($uuids, $teamId, $force);
+        }
+        return response()->json(['error' => 'You must provide uuid or tag.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+    }
+    private function by_uuids(string $uuid, int $teamId, bool $force = false)
+    {
+        $uuids = explode(',', $uuid);
+        $uuids = collect(array_filter($uuids));
+
+        if (count($uuids) === 0) {
+            return response()->json(['error' => 'No UUIDs provided.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+        }
+        $message = collect([]);
+        foreach ($uuids as $uuid) {
+            $resource = getResourceByUuid($uuid, $teamId);
+            if ($resource) {
+                $return_message = $this->deploy_resource($resource, $force);
+                $message = $message->merge($return_message);
+            }
+        }
+        if ($message->count() > 0) {
+            return response()->json(['message' => $message->toArray()], 200);
+        }
+        return response()->json(['error' => "No resources found.", 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 404);
+    }
+    public function by_tags(string $tags, int $team_id, bool $force = false)
+    {
+        $tags = explode(',', $tags);
+        $tags = collect(array_filter($tags));
+
+        if (count($tags) === 0) {
+            return response()->json(['error' => 'No TAGs provided.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+        }
+        $message = collect([]);
+        foreach ($tags as $tag) {
+            $found_tag = Tag::where(['name' => $tag, 'team_id' => $team_id])->first();
+            if (!$found_tag) {
+                $message->push("Tag {$tag} not found.");
+                continue;
+            }
+            $resources = $found_tag->resources()->get();
+            if ($resources->count() === 0) {
+                $message->push("No resources found for tag {$tag}.");
+                continue;
+            }
+            foreach ($resources as $resource) {
+                $return_message = $this->deploy_resource($resource, $force);
+                $message = $message->merge($return_message);
+            }
+        }
+        if ($message->count() > 0) {
+            return response()->json(['message' => $message->toArray()], 200);
+        }
+
+        return response()->json(['error' => "No resources found.", 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 404);
+    }
+    public function deploy_resource($resource, bool $force = false): Collection
+    {
+        $message = collect([]);
+        $type = $resource->getMorphClass();
+        if ($type === 'App\Models\Application') {
+            queue_application_deployment(
+                application: $resource,
+                deployment_uuid: new Cuid2(7),
+                force_rebuild: $force,
+            );
+            $message->push("Application {$resource->name} deployment queued.");
+        } else if ($type === 'App\Models\StandalonePostgresql') {
+            if (str($resource->status)->startsWith('running')) {
+                $message->push("Database {$resource->name} already running.");
+            }
+            StartPostgresql::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message->push("Database {$resource->name} started.");
+        } else if ($type === 'App\Models\StandaloneRedis') {
+            if (str($resource->status)->startsWith('running')) {
+                $message->push("Database {$resource->name} already running.");
+            }
+            StartRedis::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message->push("Database {$resource->name} started.");
+        } else if ($type === 'App\Models\StandaloneMongodb') {
+            if (str($resource->status)->startsWith('running')) {
+                $message->push("Database {$resource->name} already running.");
+            }
+            StartMongodb::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message->push("Database {$resource->name} started.");
+        } else if ($type === 'App\Models\StandaloneMysql') {
+            if (str($resource->status)->startsWith('running')) {
+                $message->push("Database {$resource->name} already running.");
+            }
+            StartMysql::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message->push("Database {$resource->name} started.");
+        } else if ($type === 'App\Models\StandaloneMariadb') {
+            if (str($resource->status)->startsWith('running')) {
+                $message->push("Database {$resource->name} already running.");
+            }
+            StartMariadb::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message->push("Database {$resource->name} started.");
+        } else if ($type === 'App\Models\Service') {
+            StartService::run($resource);
+            $message->push("Service {$resource->name} started. It could take a while, be patient.");
+        }
+        return $message;
+    }
+}
diff --git a/app/Livewire/Project/Resource/Index.php b/app/Livewire/Project/Resource/Index.php
index 718b5003c..5f1753c9e 100644
--- a/app/Livewire/Project/Resource/Index.php
+++ b/app/Livewire/Project/Resource/Index.php
@@ -29,7 +29,7 @@ class Index extends Component
         }
         $this->project = $project;
         $this->environment = $environment;
-        $this->applications = $environment->applications->sortBy('name');
+        $this->applications = $environment->applications->load(['tags']);
         $this->applications = $this->applications->map(function ($application) {
             if (data_get($application, 'environment.project.uuid')) {
                 $application->hrefLink = route('project.application.configuration', [
@@ -40,8 +40,9 @@ class Index extends Component
             }
             return $application;
         });
-        $this->postgresqls = $environment->postgresqls->sortBy('name');
-        $this->postgresqls =  $this->postgresqls->map(function ($postgresql) {
+        ray($this->applications);
+        $this->postgresqls = $environment->postgresqls->load(['tags'])->sortBy('name');
+        $this->postgresqls = $this->postgresqls->map(function ($postgresql) {
             if (data_get($postgresql, 'environment.project.uuid')) {
                 $postgresql->hrefLink = route('project.database.configuration', [
                     'project_uuid' => data_get($postgresql, 'environment.project.uuid'),
@@ -51,7 +52,7 @@ class Index extends Component
             }
             return $postgresql;
         });
-        $this->redis = $environment->redis->sortBy('name');
+        $this->redis = $environment->redis->load(['tags'])->sortBy('name');
         $this->redis = $this->redis->map(function ($redis) {
             if (data_get($redis, 'environment.project.uuid')) {
                 $redis->hrefLink = route('project.database.configuration', [
@@ -62,7 +63,7 @@ class Index extends Component
             }
             return $redis;
         });
-        $this->mongodbs = $environment->mongodbs->sortBy('name');
+        $this->mongodbs = $environment->mongodbs->load(['tags'])->sortBy('name');
         $this->mongodbs = $this->mongodbs->map(function ($mongodb) {
             if (data_get($mongodb, 'environment.project.uuid')) {
                 $mongodb->hrefLink = route('project.database.configuration', [
@@ -73,7 +74,7 @@ class Index extends Component
             }
             return $mongodb;
         });
-        $this->mysqls = $environment->mysqls->sortBy('name');
+        $this->mysqls = $environment->mysqls->load(['tags'])->sortBy('name');
         $this->mysqls = $this->mysqls->map(function ($mysql) {
             if (data_get($mysql, 'environment.project.uuid')) {
                 $mysql->hrefLink = route('project.database.configuration', [
@@ -84,7 +85,7 @@ class Index extends Component
             }
             return $mysql;
         });
-        $this->mariadbs = $environment->mariadbs->sortBy('name');
+        $this->mariadbs = $environment->mariadbs->load(['tags'])->sortBy('name');
         $this->mariadbs = $this->mariadbs->map(function ($mariadb) {
             if (data_get($mariadb, 'environment.project.uuid')) {
                 $mariadb->hrefLink = route('project.database.configuration', [
@@ -95,7 +96,7 @@ class Index extends Component
             }
             return $mariadb;
         });
-        $this->services = $environment->services->sortBy('name');
+        $this->services = $environment->services->load(['tags'])->sortBy('name');
         $this->services = $this->services->map(function ($service) {
             if (data_get($service, 'environment.project.uuid')) {
                 $service->hrefLink = route('project.service.configuration', [
diff --git a/app/Livewire/Project/Shared/Tags.php b/app/Livewire/Project/Shared/Tags.php
new file mode 100644
index 000000000..db330b15c
--- /dev/null
+++ b/app/Livewire/Project/Shared/Tags.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Livewire\Project\Shared;
+
+use App\Models\Tag;
+use Livewire\Component;
+
+class Tags extends Component
+{
+    public $resource = null;
+    public ?string $new_tag = null;
+    public $tags = [];
+    protected $listeners = [
+        'refresh' => '$refresh',
+    ];
+    protected $rules = [
+        'resource.tags.*.name' => 'required|string|min:2',
+        'new_tag' => 'required|string|min:2'
+    ];
+    protected $validationAttributes = [
+        'new_tag' => 'tag'
+    ];
+    public function mount()
+    {
+        $this->tags = Tag::ownedByCurrentTeam()->get();
+    }
+    public function addTag(string $id, string $name)
+    {
+        try {
+            if ($this->resource->tags()->where('id', $id)->exists()) {
+                $this->dispatch('error', 'Duplicate tags.', "Tag <span class='text-warning'>$name</span> already added.");
+                return;
+            }
+            $this->resource->tags()->syncWithoutDetaching($id);
+            $this->refresh();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function deleteTag($id, $name)
+    {
+        try {
+            $found_more_tags = Tag::where(['name' => $name, 'team_id' => currentTeam()->id])->first();
+            $this->resource->tags()->detach($id);
+            if ($found_more_tags->resources()->get()->count() == 0) {
+                $found_more_tags->delete();
+            }
+            $this->refresh();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function refresh()
+    {
+        $this->resource->load(['tags']);
+        $this->new_tag = null;
+    }
+    public function submit()
+    {
+        try {
+            $this->validate([
+                'new_tag' => 'required|string|min:2'
+            ]);
+            $tags = str($this->new_tag)->trim()->explode(' ');
+            foreach ($tags as $tag) {
+                if ($this->resource->tags()->where('name', $tag)->exists()) {
+                    $this->dispatch('error', 'Duplicate tags.', "Tag <span class='text-warning'>$tag</span> already added.");
+                    continue;
+                }
+                $found = Tag::where(['name' => $tag, 'team_id' => currentTeam()->id])->first();
+                if (!$found) {
+                    $found = Tag::create([
+                        'name' => $tag,
+                        'team_id' => currentTeam()->id
+                    ]);
+                }
+                $this->resource->tags()->syncWithoutDetaching($found->id);
+            }
+            $this->refresh();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.project.shared.tags');
+    }
+}
diff --git a/app/Livewire/Tags/Index.php b/app/Livewire/Tags/Index.php
new file mode 100644
index 000000000..eba25a750
--- /dev/null
+++ b/app/Livewire/Tags/Index.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Livewire\Tags;
+
+use App\Models\Tag;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public $tags = [];
+    public function mount() {
+        $this->tags = Tag::where('team_id', currentTeam()->id)->get()->unique('name')->sortBy('name');
+    }
+    public function render()
+    {
+        return view('livewire.tags.index');
+    }
+}
diff --git a/app/Livewire/Tags/Show.php b/app/Livewire/Tags/Show.php
new file mode 100644
index 000000000..6a61a0851
--- /dev/null
+++ b/app/Livewire/Tags/Show.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Livewire\Tags;
+
+use App\Http\Controllers\Api\Deploy;
+use App\Models\ApplicationDeploymentQueue;
+use App\Models\Tag;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public Tag $tag;
+    public $resources;
+    public $webhook = null;
+    public $deployments_per_tag_per_server = [];
+
+    public function get_deployments()
+    {
+        try {
+            $resource_ids = $this->resources->pluck('id');
+            $this->deployments_per_tag_per_server = ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->whereIn('application_id', $resource_ids)->get([
+                "id",
+                "application_id",
+                "application_name",
+                "deployment_url",
+                "pull_request_id",
+                "server_name",
+                "server_id",
+                "status"
+            ])->sortBy('id')->groupBy('server_name')->toArray();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function redeploy_all()
+    {
+        try {
+            $this->resources->each(function ($resource) {
+                $deploy = new Deploy();
+                $deploy->deploy_resource($resource);
+            });
+            $this->dispatch('success', 'Mass deployment started.');
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function mount()
+    {
+        $tag = Tag::ownedByCurrentTeam()->where('name', request()->tag_name)->first();
+        if (!$tag) {
+            return redirect()->route('tags.index');
+        }
+        $this->webhook = generatTagDeployWebhook($tag->name);
+        $this->resources = $tag->resources()->get();
+        $this->tag = $tag;
+        $this->get_deployments();
+    }
+    public function render()
+    {
+        return view('livewire.tags.show');
+    }
+}
diff --git a/app/Models/Application.php b/app/Models/Application.php
index 1f9614baa..b91acdcff 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -49,6 +49,7 @@ class Application extends BaseModel
             $application->persistentStorages()->delete();
             $application->environment_variables()->delete();
             $application->environment_variables_preview()->delete();
+            $application->tags()->detach();
         });
     }
 
@@ -211,6 +212,10 @@ class Application extends BaseModel
                 : explode(',', $this->ports_exposes)
         );
     }
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');
diff --git a/app/Models/Service.php b/app/Models/Service.php
index adbf6c500..b6d5e86d3 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -20,6 +20,10 @@ class Service extends BaseModel
     {
         return data_get($this, 'environment.project.team');
     }
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
     public function extraFields()
     {
         $fields = collect([]);
diff --git a/app/Models/StandaloneMariadb.php b/app/Models/StandaloneMariadb.php
index 8b3f3412d..4d56f11a3 100644
--- a/app/Models/StandaloneMariadb.php
+++ b/app/Models/StandaloneMariadb.php
@@ -40,8 +40,14 @@ class StandaloneMariadb extends BaseModel
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
+            $database->tags()->detach();
         });
     }
+
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');
diff --git a/app/Models/StandaloneMongodb.php b/app/Models/StandaloneMongodb.php
index de2e7f2eb..939af0974 100644
--- a/app/Models/StandaloneMongodb.php
+++ b/app/Models/StandaloneMongodb.php
@@ -43,8 +43,14 @@ class StandaloneMongodb extends BaseModel
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
+            $database->tags()->detach();
         });
     }
+
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');
diff --git a/app/Models/StandaloneMysql.php b/app/Models/StandaloneMysql.php
index c9608f1cc..8bcc0d9fe 100644
--- a/app/Models/StandaloneMysql.php
+++ b/app/Models/StandaloneMysql.php
@@ -40,8 +40,14 @@ class StandaloneMysql extends BaseModel
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
+            $database->tags()->detach();
         });
     }
+
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');
diff --git a/app/Models/StandalonePostgresql.php b/app/Models/StandalonePostgresql.php
index 577904260..fb6ad944d 100644
--- a/app/Models/StandalonePostgresql.php
+++ b/app/Models/StandalonePostgresql.php
@@ -40,8 +40,14 @@ class StandalonePostgresql extends BaseModel
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
+            $database->tags()->detach();
         });
     }
+
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
     public function link()
     {
         if (data_get($this, 'environment.project.uuid')) {
diff --git a/app/Models/StandaloneRedis.php b/app/Models/StandaloneRedis.php
index 5f4279183..73fa61a6c 100644
--- a/app/Models/StandaloneRedis.php
+++ b/app/Models/StandaloneRedis.php
@@ -35,8 +35,14 @@ class StandaloneRedis extends BaseModel
             }
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
+            $database->tags()->detach();
         });
     }
+
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
new file mode 100644
index 000000000..02b3a7ff5
--- /dev/null
+++ b/app/Models/Tag.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Casts\Attribute;
+
+class Tag extends BaseModel
+{
+    protected $guarded = [];
+
+
+    public function name(): Attribute
+    {
+        return Attribute::make(
+            get: fn ($value) => strtolower($value),
+            set: fn ($value) => strtolower($value)
+        );
+    }
+    static public function ownedByCurrentTeam()
+    {
+        return Tag::whereTeamId(currentTeam()->id)->orderBy('name');
+    }
+    public function applications()
+    {
+        return $this->morphedByMany(Application::class, 'taggable');
+    }
+
+    public function resources() {
+        return $this->applications();
+    }
+
+}
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 2a6ce9647..ad64b2550 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -110,9 +110,9 @@ function handleError(?Throwable $error = null, ?Livewire\Component $livewire = n
     }
     if ($error instanceof UniqueConstraintViolationException) {
         if (isset($livewire)) {
-            return $livewire->dispatch('error', "A resource with the same name already exists.");
+            return $livewire->dispatch('error', "Duplicate entry found.", "Please use a different name.");
         }
-        return "A resource with the same name already exists.";
+        return "Duplicate entry found. Please use a different name.";
     }
 
     if ($error instanceof Throwable) {
@@ -481,7 +481,14 @@ function queryResourcesByUuid(string $uuid)
     if ($mariadb) return $mariadb;
     return $resource;
 }
-
+function generatTagDeployWebhook($tag_name)
+{
+    $baseUrl = base_url();
+    $api = Url::fromString($baseUrl) . '/api/v1';
+    $endpoint = "/deploy?tag=$tag_name";
+    $url = $api . $endpoint;
+    return $url;
+}
 function generateDeployWebhook($resource)
 {
     $baseUrl = base_url();
diff --git a/config/sentry.php b/config/sentry.php
index cb35fa610..699995883 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.204',
+    'release' => '4.0.0-beta.205',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/toaster.php b/config/toaster.php
deleted file mode 100644
index 43565a9c6..000000000
--- a/config/toaster.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-
-    /**
-     * Add an additional second for every 100th word of the toast messages.
-     *
-     * Supported: true | false
-     */
-    'accessibility' => true,
-
-    /**
-     * The vertical alignment of the toast container.
-     *
-     * Supported: "bottom", "middle" or "top"
-     */
-    'alignment' => 'top',
-
-    /**
-     * Allow users to close toast messages prematurely.
-     *
-     * Supported: true | false
-     */
-    'closeable' => true,
-
-    /**
-     * The on-screen duration of each toast.
-     *
-     * Minimum: 3000 (in milliseconds)
-     */
-    'duration' => 5000,
-
-    /**
-     * The horizontal position of each toast.
-     *
-     * Supported: "center", "left" or "right"
-     */
-    'position' => 'center',
-
-    /**
-     * Whether messages passed as translation keys should be translated automatically.
-     *
-     * Supported: true | false
-     */
-    'translate' => true,
-];
diff --git a/config/version.php b/config/version.php
index 0cbf5f9b7..ff50755a2 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.204';
+return '4.0.0-beta.205';
diff --git a/database/migrations/2024_02_01_111228_create_tags_table.php b/database/migrations/2024_02_01_111228_create_tags_table.php
new file mode 100644
index 000000000..c922d8fa9
--- /dev/null
+++ b/database/migrations/2024_02_01_111228_create_tags_table.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('tags', function (Blueprint $table) {
+            $table->id();
+            $table->string('uuid')->unique();
+            $table->string('name')->unique();
+            $table->foreignId('team_id')->nullable()->constrained()->onDelete('cascade');
+            $table->timestamps();
+        });
+        Schema::create('taggables', function (Blueprint $table) {
+            $table->unsignedBigInteger('tag_id');
+            $table->unsignedBigInteger('taggable_id');
+            $table->string('taggable_type');
+            $table->foreign('tag_id')->references('id')->on('tags')->onDelete('cascade');
+            $table->unique(['tag_id', 'taggable_id', 'taggable_type'], 'taggable_unique'); // Composite unique index
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('taggables');
+        Schema::dropIfExists('tags');
+    }
+};
diff --git a/resources/css/app.css b/resources/css/app.css
index 38a452d85..dbde2a2ad 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -14,6 +14,10 @@ button[isError] {
     @apply bg-red-600 hover:bg-red-700;
 }
 
+button[isHighlighted] {
+    @apply bg-coollabs hover:bg-coollabs-100;
+}
+
 .scrollbar {
     @apply scrollbar-thumb-coollabs-100 scrollbar-track-coolgray-200 scrollbar-w-2;
 }
@@ -76,7 +80,7 @@ a {
 }
 
 .box-without-bg {
-    @apply flex p-2 transition-colors min-h-full hover:text-white hover:no-underline min-h-[4rem];
+    @apply flex p-2 transition-colors hover:text-white hover:no-underline min-h-[4rem];
 }
 
 .description {
diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index cad924e7b..9256dc502 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -4,7 +4,7 @@
                 class="transition rounded w-11 h-11" src="{{ asset('coolify-transparent.png') }}"></a>
         <ul class="flex flex-col h-full gap-4 menu flex-nowrap">
             <li title="Dashboard">
-                <a  class="hover:bg-transparent" href="/">
+                <a class="hover:bg-transparent" href="/">
                     <svg xmlns="http://www.w3.org/2000/svg" class="{{ request()->is('/') ? 'text-warning icon' : 'icon' }}"
                         fill="none" viewBox="0 0 24 24" stroke="currentColor">
                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
@@ -13,7 +13,7 @@
                 </a>
             </li>
             <li title="Servers">
-                <a  class="hover:bg-transparent" href="/servers">
+                <a class="hover:bg-transparent" href="/servers">
                     <svg xmlns="http://www.w3.org/2000/svg"
                         class="{{ request()->is('server/*') || request()->is('servers') ? 'text-warning icon' : 'icon' }}"
                         viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
@@ -28,7 +28,7 @@
                 </a>
             </li>
             <li title="Projects">
-                <a  class="hover:bg-transparent" href="/projects">
+                <a class="hover:bg-transparent" href="/projects">
                     <svg xmlns="http://www.w3.org/2000/svg"
                         class="{{ request()->is('project/*') || request()->is('projects') ? 'text-warning icon' : 'icon' }}"
                         viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
@@ -41,7 +41,7 @@
                 </a>
             </li>
             <li title="Command Center">
-                <a  class="hover:bg-transparent" href="/command-center">
+                <a class="hover:bg-transparent" href="/command-center">
                     <svg xmlns="http://www.w3.org/2000/svg"
                         class="{{ request()->is('command-center') ? 'text-warning icon' : 'icon' }}" viewBox="0 0 24 24"
                         stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
@@ -53,7 +53,7 @@
                 </a>
             </li>
             <li title="Source">
-                <a  class="hover:bg-transparent" href="{{ route('source.all') }}">
+                <a class="hover:bg-transparent" href="{{ route('source.all') }}">
                     <svg class="icon" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
                         <path fill="currentColor"
                             d="m6.793 1.207l.353.354l-.353-.354ZM1.207 6.793l-.353-.354l.353.354Zm0 1.414l.354-.353l-.354.353Zm5.586 5.586l-.354.353l.354-.353Zm1.414 0l-.353-.354l.353.354Zm5.586-5.586l.353.354l-.353-.354Zm0-1.414l-.354.353l.354-.353ZM8.207 1.207l.354-.353l-.354.353ZM6.44.854L.854 6.439l.707.707l5.585-5.585L6.44.854ZM.854 8.56l5.585 5.585l.707-.707l-5.585-5.585l-.707.707Zm7.707 5.585l5.585-5.585l-.707-.707l-5.585 5.585l.707.707Zm5.585-7.707L8.561.854l-.707.707l5.585 5.585l.707-.707Zm0 2.122a1.5 1.5 0 0 0 0-2.122l-.707.707a.5.5 0 0 1 0 .708l.707.707ZM6.44 14.146a1.5 1.5 0 0 0 2.122 0l-.707-.707a.5.5 0 0 1-.708 0l-.707.707ZM.854 6.44a1.5 1.5 0 0 0 0 2.122l.707-.707a.5.5 0 0 1 0-.708L.854 6.44Zm6.292-4.878a.5.5 0 0 1 .708 0L8.56.854a1.5 1.5 0 0 0-2.122 0l.707.707Zm-2 1.293l1 1l.708-.708l-1-1l-.708.708ZM7.5 5a.5.5 0 0 1-.5-.5H6A1.5 1.5 0 0 0 7.5 6V5Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 9 4.5H8ZM7.5 4a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 7.5 3v1Zm0-1A1.5 1.5 0 0 0 6 4.5h1a.5.5 0 0 1 .5-.5V3Zm.646 2.854l1.5 1.5l.707-.708l-1.5-1.5l-.707.708ZM10.5 8a.5.5 0 0 1-.5-.5H9A1.5 1.5 0 0 0 10.5 9V8Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 12 7.5h-1Zm-.5-.5a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 10.5 6v1Zm0-1A1.5 1.5 0 0 0 9 7.5h1a.5.5 0 0 1 .5-.5V6ZM7 5.5v4h1v-4H7Zm.5 5.5a.5.5 0 0 1-.5-.5H6A1.5 1.5 0 0 0 7.5 12v-1Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 9 10.5H8Zm-.5-.5a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 7.5 9v1Zm0-1A1.5 1.5 0 0 0 6 10.5h1a.5.5 0 0 1 .5-.5V9Z" />
@@ -61,7 +61,7 @@
                 </a>
             </li>
             <li title="Security">
-                <a  class="hover:bg-transparent" href="{{ route('security.private-key.index') }}">
+                <a class="hover:bg-transparent" href="{{ route('security.private-key.index') }}">
                     <svg class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                         <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
                             stroke-width="2"
@@ -70,7 +70,7 @@
                 </a>
             </li>
             <li title="Teams">
-                <a  class="hover:bg-transparent" href="{{ route('team.index') }}">
+                <a class="hover:bg-transparent" href="{{ route('team.index') }}">
                     <svg xmlns="http://www.w3.org/2000/svg" class="icon" 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" />
@@ -83,6 +83,18 @@
                     </svg>
                 </a>
             </li>
+            <li title="Tags">
+                <a class="hover:bg-transparent" href="{{ route('tags.index') }}">
+                    <svg class="icon" 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="M3 8v4.172a2 2 0 0 0 .586 1.414l5.71 5.71a2.41 2.41 0 0 0 3.408 0l3.592-3.592a2.41 2.41 0 0 0 0-3.408l-5.71-5.71A2 2 0 0 0 9.172 6H5a2 2 0 0 0-2 2" />
+                            <path d="m18 19l1.592-1.592a4.82 4.82 0 0 0 0-6.816L15 6m-8 4h-.01" />
+                        </g>
+                    </svg>
+                </a>
+            </li>
 
             <div class="flex-1"></div>
             @if (isInstanceAdmin() && !isCloud())
@@ -103,7 +115,7 @@
                 </a>
             </li>
             <li title="Profile">
-                <a  class="hover:bg-transparent" href="/profile">
+                <a class="hover:bg-transparent" href="/profile">
                     <svg xmlns="http://www.w3.org/2000/svg" class="icon" 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" />
@@ -116,7 +128,7 @@
 
             @if (isInstanceAdmin())
                 <li title="Settings" class="mt-auto">
-                    <a  class="hover:bg-transparent" href="/settings">
+                    <a class="hover:bg-transparent" href="/settings">
                         <svg xmlns="http://www.w3.org/2000/svg"
                             class="{{ request()->is('settings*') ? 'text-warning icon' : 'icon' }}" viewBox="0 0 24 24"
                             stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
diff --git a/resources/views/components/new-modal.blade.php b/resources/views/components/new-modal.blade.php
index 6c6dcc3e3..d04a40226 100644
--- a/resources/views/components/new-modal.blade.php
+++ b/resources/views/components/new-modal.blade.php
@@ -46,9 +46,16 @@
                         type="button">Cancel
                     </x-forms.button>
                     <div class="flex-1"></div>
-                    <x-forms.button @click="modalOpen=false" class="w-24" isError type="button"
-                        wire:click.prevent='{{ $action }}'>Continue
-                    </x-forms.button>
+                    @if ($isErrorButton)
+                        <x-forms.button @click="modalOpen=false" class="w-24" isError type="button"
+                            wire:click.prevent='{{ $action }}'>Continue
+                        </x-forms.button>
+                    @else
+                        <x-forms.button @click="modalOpen=false" class="w-24" isHighlighted type="button"
+                            wire:click.prevent='{{ $action }}'>Continue
+                        </x-forms.button>
+                    @endif
+
                 </div>
             </div>
         </div>
diff --git a/resources/views/components/toast.blade.php b/resources/views/components/toast.blade.php
index 4be15e201..64f07b8b4 100644
--- a/resources/views/components/toast.blade.php
+++ b/resources/views/components/toast.blade.php
@@ -22,20 +22,7 @@
     if (typeof options.html != 'undefined') html = options.html;
 
     window.dispatchEvent(new CustomEvent('toast-show', { detail: { type: type, message: message, description: description, position: position, html: html } }));
-}
-
-window.customToastHTML = `
-        <div class='relative flex items-start justify-center p-4'>
-            <div class='flex flex-col'>
-                <p class='text-sm font-medium text-gray-800'>New Friend Request</p>
-                <p class='mt-1 text-xs leading-none text-gray-800'>Friend request from John Doe.</p>
-                <div class='flex mt-3'>
-                    <button type='button' @click='burnToast(toast.id)' class='inline-flex items-center px-2 py-1 text-xs font-semibold text-white bg-indigo-600 rounded shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600'>Accept</button>
-                    <button type='button' @click='burnToast(toast.id)' class='inline-flex items-center px-2 py-1 ml-3 text-xs font-semibold text-gray-900 bg-white rounded shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50'>Decline</button>
-                </div>
-            </div>
-        </div>
-    `" class="relative space-y-5">
+}" class="relative space-y-5">
     <template x-teleport="body">
         <ul x-data="{
             toasts: [],
diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index 04d4918b4..143efc339 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -102,41 +102,40 @@
 </div>
 
 <div class="flex items-center gap-2">
-    <h3 class="py-4">Deployments </h3>
+    <h3 class="py-4">Deployments</h3>
     @if (count($deployments_per_server) > 0)
         <x-loading />
     @endif
 </div>
-{{-- <div wire:poll.4000ms="get_deployments" class="grid grid-cols-1 gap-2 lg:grid-cols-3"> --}}
-<div class="grid grid-cols-1">
+<div wire:poll.1000ms="get_deployments" class="grid grid-cols-1">
     @forelse ($deployments_per_server as $server_name => $deployments)
-    <h4 class="py-4">{{ $server_name }}</h4>
-    <div class="grid grid-cols-1 gap-2 lg:grid-cols-3">
-        @foreach ($deployments as $deployment)
-            <a href="{{ data_get($deployment, 'deployment_url') }}" @class([
-                'gap-2 cursor-pointer box group border-l-2 border-dotted',
-                'border-white' => data_get($deployment, 'status') === 'queued',
-                'border-yellow-500' => data_get($deployment, 'status') === 'in_progress',
-            ])>
-                <div class="flex flex-col mx-6">
-                    <div class="font-bold text-white">
-                        {{ data_get($deployment, 'application_name') }}
-                    </div>
-                    @if (data_get($deployment, 'pull_request_id') !== 0)
-                        <div class="description">
-                            PR #{{ data_get($deployment, 'pull_request_id') }}
+        <h4 class="py-4">{{ $server_name }}</h4>
+        <div class="grid grid-cols-1 gap-2 lg:grid-cols-3">
+            @foreach ($deployments as $deployment)
+                <a href="{{ data_get($deployment, 'deployment_url') }}" @class([
+                    'gap-2 cursor-pointer box group border-l-2 border-dotted',
+                    'border-coolgray-500' => data_get($deployment, 'status') === 'queued',
+                    'border-yellow-500' => data_get($deployment, 'status') === 'in_progress',
+                ])>
+                    <div class="flex flex-col mx-6">
+                        <div class="font-bold text-white">
+                            {{ data_get($deployment, 'application_name') }}
+                        </div>
+                        @if (data_get($deployment, 'pull_request_id') !== 0)
+                            <div class="description">
+                                PR #{{ data_get($deployment, 'pull_request_id') }}
+                            </div>
+                        @endif
+                        <div class="description">
+                            {{ str(data_get($deployment, 'status'))->headline() }}
                         </div>
-                    @endif
-                    <div class="description">
-                        {{ str(data_get($deployment, 'status'))->headline() }}
                     </div>
-                </div>
-                <div class="flex-1"></div>
-            </a>
-        @endforeach
+                    <div class="flex-1"></div>
+                </a>
+            @endforeach
         </div>
     @empty
-        <div>No queued / in progress deployments</div>
+        <div>No deployments running.</div>
     @endforelse
 </div>
 <script>
diff --git a/resources/views/livewire/project/application/configuration.blade.php b/resources/views/livewire/project/application/configuration.blade.php
index b6d6cad5c..5789ee5bc 100644
--- a/resources/views/livewire/project/application/configuration.blade.php
+++ b/resources/views/livewire/project/application/configuration.blade.php
@@ -63,6 +63,9 @@
                 @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
                 href="#">Resource Operations
             </a>
+            <a :class="activeTab === 'tags' && 'text-white'"
+                @click.prevent="activeTab = 'tags'; window.location.hash = 'tags'" href="#">Tags
+            </a>
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger'; window.location.hash = 'danger'" href="#">Danger Zone
             </a>
@@ -112,6 +115,9 @@
             <div x-cloak x-show="activeTab === 'resource-operations'">
                 <livewire:project.shared.resource-operations :resource="$application" />
             </div>
+            <div x-cloak x-show="activeTab === 'tags'">
+                <livewire:project.shared.tags :resource="$application" />
+            </div>
             <div x-cloak x-show="activeTab === 'danger'">
                 <livewire:project.shared.danger :resource="$application" />
             </div>
diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php
index 743c95651..3e5e4f137 100644
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@@ -112,9 +112,7 @@
                                 helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."
                                 label="Docker Image Tag" />
                         @endif
-
                     @endif
-
                 </div>
             @endif
 
diff --git a/resources/views/livewire/project/clone-me.blade.php b/resources/views/livewire/project/clone-me.blade.php
index 3e6203281..948be9a5f 100644
--- a/resources/views/livewire/project/clone-me.blade.php
+++ b/resources/views/livewire/project/clone-me.blade.php
@@ -5,13 +5,14 @@
     </div>
     <div class="flex items-end gap-2">
         <x-forms.input required id="newProjectName" label="New Project Name" />
-        <x-forms.button type="submit">Clone</x-forms.button>
+        <x-forms.button isHighlighted type="submit">Clone</x-forms.button>
     </div>
     <h3 class="pt-4 pb-2">Servers</h3>
+    <div>Choose the server and network to clone the resources to.</div>
     <div class="flex flex-col gap-4">
         @foreach ($servers->sortBy('id') as $server)
-            <div class="p-4 border border-coolgray-500">
-                <h3>{{ $server->name }}</h3>
+            <div class="p-4">
+                <h4>{{ $server->name }}</h4>
                 <h5>{{ $server->description }}</h5>
                 <div class="pt-4 pb-2">Docker Networks</div>
                 <div class="grid grid-cols-1 gap-2 pb-4 lg:grid-cols-4">
@@ -28,7 +29,8 @@
     </div>
 
     <h3 class="pt-4 pb-2">Resources</h3>
-    <div class="grid grid-cols-1 gap-2 p-4 border border-coolgray-500">
+    <div>These will be cloned to the new project</div>
+    <div class="grid grid-cols-1 gap-2 p-4 ">
         @foreach ($environment->applications->sortBy('name') as $application)
             <div>
                 <div class="flex flex-col">
diff --git a/resources/views/livewire/project/database/configuration.blade.php b/resources/views/livewire/project/database/configuration.blade.php
index fb63f3a26..c7491d09b 100644
--- a/resources/views/livewire/project/database/configuration.blade.php
+++ b/resources/views/livewire/project/database/configuration.blade.php
@@ -48,6 +48,9 @@
                 @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
                 href="#">Resource Operations
             </a>
+            <a :class="activeTab === 'tags' && 'text-white'"
+                @click.prevent="activeTab = 'tags'; window.location.hash = 'tags'" href="#">Tags
+            </a>
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger';
                 window.location.hash = 'danger'"
@@ -89,6 +92,9 @@
             <div x-cloak x-show="activeTab === 'resource-operations'">
                 <livewire:project.shared.resource-operations :resource="$database" />
             </div>
+            <div x-cloak x-show="activeTab === 'tags'">
+                <livewire:project.shared.tags :resource="$database" />
+            </div>
             <div x-cloak x-show="activeTab === 'danger'">
                 <livewire:project.shared.danger :resource="$database" />
             </div>
diff --git a/resources/views/livewire/project/resource/index.blade.php b/resources/views/livewire/project/resource/index.blade.php
index c91ede1e6..f87b7ea87 100644
--- a/resources/views/livewire/project/resource/index.blade.php
+++ b/resources/views/livewire/project/resource/index.blade.php
@@ -46,126 +46,197 @@
     @else
         <div x-data="searchComponent()">
             <x-forms.input placeholder="Search for name, fqdn..." class="w-full" x-model="search" />
-            <div class="grid gap-2 pt-4 lg:grid-cols-2">
+            <div class="grid gap-4 pt-4 lg:grid-cols-4">
                 <template x-for="item in filteredApplications" :key="item.id">
-                    <a class="relative box group" :href="item.hrefLink">
-                        <div class="flex flex-col mx-6">
-                            <div class="pb-2 font-bold text-white" x-text="item.name"></div>
-                            <div class="description" x-text="item.description"></div>
-                            <div class="description" x-text="item.fqdn"></div>
+                    <span class="relative">
+                        <a class="h-24 box group" :href="item.hrefLink">
+                            <div class="flex flex-col mx-6">
+                                <div class="pb-2 font-bold text-white" x-text="item.name"></div>
+                                <div class="description" x-text="item.description"></div>
+                                <div class="description" x-text="item.fqdn"></div>
+                            </div>
+                            <template x-if="item.status.startsWith('running')">
+                                <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('exited')">
+                                <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('restarting')">
+                                <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                        </a>
+                        <div class="flex gap-1 pt-1 group-hover:text-white group min-h-6">
+                            <template x-for="tag in item.tags">
+                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                            </template>
+                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:text-white hover:bg-coolgray-300"
+                                @click.prevent="goto(item)">Add tag</div>
                         </div>
-                        <template x-if="item.status.startsWith('running')">
-                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('exited')">
-                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('restarting')">
-                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                    </a>
+                    </span>
                 </template>
                 <template x-for="item in filteredPostgresqls" :key="item.id">
-                    <a class="relative box group" :href="item.hrefLink">
-                        <div class="flex flex-col mx-6">
-                            <div class="font-bold text-white" x-text="item.name"></div>
-                            <div class="description" x-text="item.description"></div>
+                    <span class="relative">
+                        <a class="h-24 box group" :href="item.hrefLink">
+                            <div class="flex flex-col mx-6">
+                                <div class="font-bold text-white" x-text="item.name"></div>
+                                <div class="description" x-text="item.description"></div>
+                            </div>
+                            <template x-if="item.status.startsWith('running')">
+                                <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('exited')">
+                                <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('restarting')">
+                                <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                        </a>
+                        <div class="flex gap-1 pt-1 group-hover:text-white group min-h-6">
+                            <template x-for="tag in item.tags">
+                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                            </template>
+                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:text-white hover:bg-coolgray-300"
+                                @click.prevent="goto(item)">Add tag</div>
                         </div>
-                        <template x-if="item.status.startsWith('running')">
-                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('exited')">
-                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('restarting')">
-                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                    </a>
+                    </span>
                 </template>
                 <template x-for="item in filteredRedis" :key="item.id">
-                    <a class="relative box group" :href="item.hrefLink">
-                        <div class="flex flex-col mx-6">
-                            <div class="font-bold text-white" x-text="item.name"></div>
-                            <div class="description" x-text="item.description"></div>
+                    <span class="relative">
+                        <a class="h-24 box group" :href="item.hrefLink">
+                            <div class="flex flex-col mx-6">
+                                <div class="font-bold text-white" x-text="item.name"></div>
+                                <div class="description" x-text="item.description"></div>
+                            </div>
+                            <template x-if="item.status.startsWith('running')">
+                                <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('exited')">
+                                <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('restarting')">
+                                <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+
+                        </a>
+                        <div class="flex gap-1 pt-1 group-hover:text-white group min-h-6">
+                            <template x-for="tag in item.tags">
+                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                            </template>
+                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:text-white hover:bg-coolgray-300"
+                                @click.prevent="goto(item)">Add tag</div>
                         </div>
-                        <template x-if="item.status.startsWith('running')">
-                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('exited')">
-                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('restarting')">
-                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                    </a>
+                    </span>
                 </template>
                 <template x-for="item in filteredMongodbs" :key="item.id">
-                    <a class="relative box group" :href="item.hrefLink">
-                        <div class="flex flex-col mx-6">
-                            <div class="font-bold text-white" x-text="item.name"></div>
-                            <div class="description" x-text="item.description"></div>
+                    <span class="relative">
+                        <a class="h-24 box group" :href="item.hrefLink">
+                            <div class="flex flex-col mx-6">
+                                <div class="font-bold text-white" x-text="item.name"></div>
+                                <div class="description" x-text="item.description"></div>
+                            </div>
+                            <template x-if="item.status.startsWith('running')">
+                                <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('exited')">
+                                <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('restarting')">
+                                <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                        </a>
+                        <div class="flex gap-1 pt-1 group-hover:text-white group min-h-6">
+                            <template x-for="tag in item.tags">
+                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                            </template>
+                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:text-white hover:bg-coolgray-300"
+                                @click.prevent="goto(item)">Add tag</div>
                         </div>
-                        <template x-if="item.status.startsWith('running')">
-                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('exited')">
-                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('restarting')">
-                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                    </a>
+                    </span>
                 </template>
                 <template x-for="item in filteredMysqls" :key="item.id">
-                    <a class="relative box group" :href="item.hrefLink">
-                        <div class="flex flex-col mx-6">
-                            <div class="font-bold text-white" x-text="item.name"></div>
-                            <div class="description" x-text="item.description"></div>
+                    <span class="relative">
+                        <a class="h-24 box group" :href="item.hrefLink">
+                            <div class="flex flex-col mx-6">
+                                <div class="font-bold text-white" x-text="item.name"></div>
+                                <div class="description" x-text="item.description"></div>
+                            </div>
+                            <template x-if="item.status.startsWith('running')">
+                                <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('exited')">
+                                <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('restarting')">
+                                <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                        </a>
+                        <div class="flex gap-1 pt-1 group-hover:text-white group min-h-6">
+                            <template x-for="tag in item.tags">
+                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                            </template>
+                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:text-white hover:bg-coolgray-300"
+                                @click.prevent="goto(item)">Add tag</div>
                         </div>
-                        <template x-if="item.status.startsWith('running')">
-                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('exited')">
-                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('restarting')">
-                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                    </a>
+                    </span>
                 </template>
                 <template x-for="item in filteredMariadbs" :key="item.id">
-                    <a class="relative box group" :href="item.hrefLink">
-                        <div class="flex flex-col mx-6">
-                            <div class="font-bold text-white" x-text="item.name"></div>
-                            <div class="description" x-text="item.description"></div>
+                    <span class="relative">
+                        <a class="h-24 box group" :href="item.hrefLink">
+                            <div class="flex flex-col mx-6">
+                                <div class="font-bold text-white" x-text="item.name"></div>
+                                <div class="description" x-text="item.description"></div>
+                            </div>
+                            <template x-if="item.status.startsWith('running')">
+                                <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('exited')">
+                                <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('restarting')">
+                                <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                        </a>
+                        <div class="flex gap-1 pt-1 group-hover:text-white group min-h-6">
+                            <template x-for="tag in item.tags">
+                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                            </template>
+                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:text-white hover:bg-coolgray-300"
+                                @click.prevent="goto(item)">Add tag</div>
                         </div>
-                        <template x-if="item.status.startsWith('running')">
-                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('exited')">
-                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('restarting')">
-                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                    </a>
+                    </span>
                 </template>
                 <template x-for="item in filteredServices" :key="item.id">
-                    <a class="relative box group" :href="item.hrefLink">
-                        <div class="flex flex-col mx-6">
-                            <div class="font-bold text-white" x-text="item.name"></div>
-                            <div class="description" x-text="item.description"></div>
+                    <span class="relative">
+                        <a class="h-24 box group" :href="item.hrefLink">
+                            <div class="flex flex-col mx-6">
+                                <div class="font-bold text-white" x-text="item.name"></div>
+                                <div class="description" x-text="item.description"></div>
+                            </div>
+                            <template x-if="item.status.startsWith('running')">
+                                <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('exited')">
+                                <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('degraded')">
+                                <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                        </a>
+                        <div class="flex gap-1 pt-1 group-hover:text-white group min-h-6">
+                            <template x-for="tag in item.tags">
+                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                            </template>
+                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:text-white hover:bg-coolgray-300"
+                                @click.prevent="goto(item)">Add tag</div>
                         </div>
-                        <template x-if="item.status.startsWith('running')">
-                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('exited')">
-                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('degraded')">
-                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                    </a>
+                    </span>
                 </template>
             </div>
         </div>
@@ -174,6 +245,10 @@
 </div>
 
 <script>
+    function sortFn(a, b) {
+        return a.name.localeCompare(b.name)
+    }
+
     function searchComponent() {
         return {
             search: '',
@@ -184,76 +259,90 @@
             mysqls: @js($mysqls),
             mariadbs: @js($mariadbs),
             services: @js($services),
+            gotoTag(tag) {
+                window.location.href = '/tags/' + tag;
+            },
+            goto(item) {
+                const hrefLink = item.hrefLink;
+                window.location.href = `${hrefLink}#tags`;
+            },
             get filteredApplications() {
                 if (this.search === '') {
-                    return this.applications;
+                    return Object.values(this.applications).sort(sortFn);
                 }
                 this.applications = Object.values(this.applications);
                 return this.applications.filter(item => {
                     return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.fqdn?.toLowerCase().includes(this.search.toLowerCase()) ||
-                        item.description?.toLowerCase().includes(this.search.toLowerCase());
-                });
+                        item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
+                        item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
+                }).sort(sortFn);
             },
             get filteredPostgresqls() {
                 if (this.search === '') {
-                    return this.postgresqls;
+                    return Object.values(this.postgresqls).sort(sortFn);
                 }
                 this.postgresqls = Object.values(this.postgresqls);
                 return this.postgresqls.filter(item => {
                     return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
-                        item.description?.toLowerCase().includes(this.search.toLowerCase());
-                });
+                        item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
+                        item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
+                }).sort(sortFn);
             },
             get filteredRedis() {
                 if (this.search === '') {
-                    return this.redis;
+                    return Object.values(this.redis).sort(sortFn);
                 }
                 this.redis = Object.values(this.redis);
                 return this.redis.filter(item => {
                     return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
-                        item.description?.toLowerCase().includes(this.search.toLowerCase());
-                });
+                        item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
+                        item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
+                }).sort(sortFn);
             },
             get filteredMongodbs() {
                 if (this.search === '') {
-                    return this.mongodbs;
+                    return Object.values(this.mongodbs).sort(sortFn);
                 }
                 this.mongodbs = Object.values(this.mongodbs);
                 return this.mongodbs.filter(item => {
                     return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
-                        item.description?.toLowerCase().includes(this.search.toLowerCase());
-                });
+                        item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
+                        item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
+                }).sort(sortFn);
             },
             get filteredMysqls() {
                 if (this.search === '') {
-                    return this.mysqls;
+                    return Object.values(this.mysqls).sort(sortFn);
                 }
                 this.mysqls = Object.values(this.mysqls);
                 return this.mysqls.filter(item => {
                     return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
-                        item.description?.toLowerCase().includes(this.search.toLowerCase());
-                });
+                        item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
+                        item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
+                }).sort(sortFn);
             },
             get filteredMariadbs() {
                 if (this.search === '') {
-                    return this.mariadbs;
+                    return Object.values(this.mariadbs).sort(sortFn);
                 }
                 this.mariadbs = Object.values(this.mariadbs);
                 return this.mariadbs.filter(item => {
                     return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
-                        item.description?.toLowerCase().includes(this.search.toLowerCase());
-                });
+                        item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
+                        item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
+                }).sort(sortFn);
             },
             get filteredServices() {
                 if (this.search === '') {
-                    return this.services;
+                    return Object.values(this.services).sort(sortFn);
                 }
                 this.services = Object.values(this.services);
                 return this.services.filter(item => {
                     return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
-                        item.description?.toLowerCase().includes(this.search.toLowerCase());
-                });
+                        item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
+                        item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
+                }).sort(sortFn);
             },
 
         };
diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.php
index ac805b6b3..174519aab 100644
--- a/resources/views/livewire/project/service/configuration.blade.php
+++ b/resources/views/livewire/project/service/configuration.blade.php
@@ -30,6 +30,9 @@
                 @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
                 href="#">Resource Operations
             </a>
+            <a :class="activeTab === 'tags' && 'text-white'"
+                @click.prevent="activeTab = 'tags'; window.location.hash = 'tags'" href="#">Tags
+            </a>
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger';
                 window.location.hash = 'danger'"
@@ -164,6 +167,9 @@
             <div x-cloak x-show="activeTab === 'resource-operations'">
                 <livewire:project.shared.resource-operations :resource="$service" />
             </div>
+            <div x-cloak x-show="activeTab === 'tags'">
+                <livewire:project.shared.tags :resource="$service" />
+            </div>
             <div x-cloak x-show="activeTab === 'danger'">
                 <livewire:project.shared.danger :resource="$service" />
             </div>
diff --git a/resources/views/livewire/project/shared/tags.blade.php b/resources/views/livewire/project/shared/tags.blade.php
new file mode 100644
index 000000000..ec13dbe7f
--- /dev/null
+++ b/resources/views/livewire/project/shared/tags.blade.php
@@ -0,0 +1,32 @@
+<div>
+    <h2>Tags</h2>
+    <div class="flex gap-2 pt-4">
+        @forelse ($this->resource->tags as $tagId => $tag)
+            <div class="px-2 py-1 text-center text-white select-none w-fit bg-coolgray-100 hover:bg-coolgray-200">
+                {{ $tag->name }}
+                <svg wire:click="deleteTag('{{ $tag->id }}','{{ $tag->name }}')"
+                    xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                    class="inline-block w-3 h-3 rounded cursor-pointer stroke-current hover:bg-red-500">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+                </svg>
+            </div>
+        @empty
+            <div>No tags yet</div>
+        @endforelse
+    </div>
+    <form wire:submit='submit' class="flex items-end gap-2 pt-4">
+        <div class="w-64">
+            <x-forms.input label="Create new or assign existing tags"
+                helper="You add more at once with space seperated list: web api something<br><br>If the tag does not exists, it will be created." wire:model="new_tag" />
+        </div>
+        <x-forms.button type="submit">Add</x-forms.button>
+    </form>
+    <h3 class="pt-4">Already defined tags</h3>
+    <div>Click to quickly add</div>
+    <div class="flex gap-2 pt-4">
+        @foreach ($tags as $tag)
+            <x-forms.button wire:click="addTag('{{ $tag->id }}','{{ $tag->name }}')">
+                {{ $tag->name }}</x-forms.button>
+        @endforeach
+    </div>
+</div>
diff --git a/resources/views/livewire/tags/index.blade.php b/resources/views/livewire/tags/index.blade.php
new file mode 100644
index 000000000..b51768e4f
--- /dev/null
+++ b/resources/views/livewire/tags/index.blade.php
@@ -0,0 +1,11 @@
+<div>
+    <h1>Tags</h1>
+    <div>Here you can see all the tags here</div>
+    <div class="flex gap-2 pt-10">
+        @forelse ($tags as $tag)
+            <a class="box" href="{{ route('tags.show', ['tag_name' => $tag->name]) }}">{{ $tag->name }}</a>
+        @empty
+            <div>No tags yet defined yet. Go to a resource and add a tag there.</div>
+        @endforelse
+    </div>
+</div>
diff --git a/resources/views/livewire/tags/show.blade.php b/resources/views/livewire/tags/show.blade.php
new file mode 100644
index 000000000..34427c7ab
--- /dev/null
+++ b/resources/views/livewire/tags/show.blade.php
@@ -0,0 +1,58 @@
+<div>
+    <div class="flex items-start gap-2">
+        <div>
+            <h1>Tag: {{ $tag->name }}</h1>
+            <div class="pt-2">Tag details</div>
+        </div>
+    </div>
+    <div class="pt-4">
+        <div class="flex items-end gap-2 ">
+            <div class="w-[500px]">
+                <x-forms.input readonly label="Deploy Webhook URL" id="webhook" />
+            </div>
+            <x-new-modal buttonTitle="Redeploy All" action="redeploy_all" class="mt-1">
+                All resources will be redeployed.
+            </x-new-modal>
+        </div>
+        <div class="grid gap-2 pt-4 lg:grid-cols-4">
+            @foreach ($resources as $resource)
+                <a href="{{ $resource->link() }}" class="flex flex-col box group">
+                    <span class="font-bold text-white">{{ $resource->name }}</span>
+                    <span class="description">{{ $resource->description }}</span>
+                </a>
+            @endforeach
+        </div>
+        <div class="flex items-center gap-2">
+            <h3 class="py-4">Deployments</h3>
+            @if (count($deployments_per_tag_per_server) > 0)
+                <x-loading />
+            @endif
+        </div>
+        <div wire:poll.1000ms="get_deployments" class="grid grid-cols-1">
+            @forelse ($deployments_per_tag_per_server as $server_name => $deployments)
+                <h4 class="py-4">{{ $server_name }}</h4>
+                <div class="grid grid-cols-1 gap-2 lg:grid-cols-3">
+                    @foreach ($deployments as $deployment)
+                        <a href="{{ data_get($deployment, 'deployment_url') }}" @class([
+                            'gap-2 cursor-pointer box group border-l-2 border-dotted',
+                            'border-coolgray-500' => data_get($deployment, 'status') === 'queued',
+                            'border-yellow-500' => data_get($deployment, 'status') === 'in_progress',
+                        ])>
+                            <div class="flex flex-col mx-6">
+                                <div class="font-bold text-white">
+                                    {{ data_get($deployment, 'application_name') }}
+                                </div>
+                                <div class="description">
+                                    {{ str(data_get($deployment, 'status'))->headline() }}
+                                </div>
+                            </div>
+                            <div class="flex-1"></div>
+                        </a>
+                    @endforeach
+                </div>
+            @empty
+                <div>No deployments running.</div>
+            @endforelse
+        </div>
+    </div>
+</div>
diff --git a/routes/api.php b/routes/api.php
index 41d64bf31..ee44e390e 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -6,7 +6,9 @@ use App\Actions\Database\StartMysql;
 use App\Actions\Database\StartPostgresql;
 use App\Actions\Database\StartRedis;
 use App\Actions\Service\StartService;
+use App\Http\Controllers\Api\Deploy;
 use App\Models\ApplicationDeploymentQueue;
+use App\Models\Tag;
 use App\Models\User;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Http\Request;
@@ -32,105 +34,25 @@ if (isDev()) {
 Route::get('/health', function () {
     return 'OK';
 });
-Route::group([
-    'middleware' => $middlewares,
-    'prefix' => 'v1'
-], function () {
-    Route::get('/deployments', function() {
-        return ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->get([
-            "id",
-            "server_id",
-            "status"
-          ])->groupBy("server_id")->map(function($item) {
-            return $item;
-          })->toArray();
-    });
-});
+// Route::group([
+//     'middleware' => $middlewares,
+//     'prefix' => 'v1'
+// ], function () {
+//     Route::get('/deployments', function () {
+//         return ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->get([
+//             "id",
+//             "server_id",
+//             "status"
+//         ])->groupBy("server_id")->map(function ($item) {
+//             return $item;
+//         })->toArray();
+//     });
+// });
 Route::group([
     'middleware' => ['auth:sanctum'],
     'prefix' => 'v1'
 ], function () {
-    Route::get('/deploy', function (Request $request) {
-        $token = auth()->user()->currentAccessToken();
-        $teamId = data_get($token, 'team_id');
-        $uuid = $request->query->get('uuid');
-        $uuids = explode(',', $uuid);
-        $uuids = collect(array_filter($uuids));
-        $force = $request->query->get('force') ?? false;
-        if (is_null($teamId)) {
-            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
-        }
-        if (count($uuids) === 0) {
-            return response()->json(['error' => 'No UUIDs provided.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
-        }
-        $message = collect([]);
-        foreach ($uuids as $uuid) {
-            $resource = getResourceByUuid($uuid, $teamId);
-            if ($resource) {
-                $type = $resource->getMorphClass();
-                if ($type === 'App\Models\Application') {
-                    queue_application_deployment(
-                        application: $resource,
-                        deployment_uuid: new Cuid2(7),
-                        force_rebuild: $force,
-                    );
-                    $message->push("Application {$resource->name} deployment queued.");
-                } else if ($type === 'App\Models\StandalonePostgresql') {
-                    if (str($resource->status)->startsWith('running')) {
-                        $message->push("Database {$resource->name} already running.");
-                    }
-                    StartPostgresql::run($resource);
-                    $resource->update([
-                        'started_at' => now(),
-                    ]);
-                    $message->push("Database {$resource->name} started.");
-                } else if ($type === 'App\Models\StandaloneRedis') {
-                    if (str($resource->status)->startsWith('running')) {
-                        $message->push("Database {$resource->name} already running.");
-                    }
-                    StartRedis::run($resource);
-                    $resource->update([
-                        'started_at' => now(),
-                    ]);
-                    $message->push("Database {$resource->name} started.");
-                } else if ($type === 'App\Models\StandaloneMongodb') {
-                    if (str($resource->status)->startsWith('running')) {
-                        $message->push("Database {$resource->name} already running.");
-                    }
-                    StartMongodb::run($resource);
-                    $resource->update([
-                        'started_at' => now(),
-                    ]);
-                    $message->push("Database {$resource->name} started.");
-                } else if ($type === 'App\Models\StandaloneMysql') {
-                    if (str($resource->status)->startsWith('running')) {
-                        $message->push("Database {$resource->name} already running.");
-                    }
-                    StartMysql::run($resource);
-                    $resource->update([
-                        'started_at' => now(),
-                    ]);
-                    $message->push("Database {$resource->name} started.");
-                } else if ($type === 'App\Models\StandaloneMariadb') {
-                    if (str($resource->status)->startsWith('running')) {
-                        $message->push("Database {$resource->name} already running.");
-                    }
-                    StartMariadb::run($resource);
-                    $resource->update([
-                        'started_at' => now(),
-                    ]);
-                    $message->push("Database {$resource->name} started.");
-                } else if ($type === 'App\Models\Service') {
-                    StartService::run($resource);
-                    $message->push("Service {$resource->name} started. It could take a while, be patient.");
-                }
-            }
-        }
-        if ($message->count() > 0) {
-            return response()->json(['message' => $message->toArray()], 200);
-        }
-        return response()->json(['error' => "No resources found.", 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 404);
-    });
+    Route::get('/deploy', [Deploy::class, 'deploy']);
 });
 
 Route::middleware(['throttle:5'])->group(function () {
diff --git a/routes/web.php b/routes/web.php
index fdfd5a4e0..f32d88d7a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -67,6 +67,10 @@ use App\Livewire\Server\Proxy\Logs as ProxyLogs;
 
 use App\Livewire\Source\Github\Change as GitHubChange;
 use App\Livewire\Subscription\Index as SubscriptionIndex;
+
+use App\Livewire\Tags\Index as TagsIndex;
+use App\Livewire\Tags\Show as TagsShow;
+
 use App\Livewire\TeamSharedVariablesIndex;
 use App\Livewire\Waitlist\Index as WaitlistIndex;
 
@@ -106,7 +110,10 @@ Route::middleware(['auth', 'verified'])->group(function () {
     Route::get('/settings/license', SettingsLicense::class)->name('settings.license');
 
     Route::get('/profile', ProfileIndex::class)->name('profile');
-
+    Route::prefix('tags')->group(function () {
+        Route::get('/', TagsIndex::class)->name('tags.index');
+        Route::get('/{tag_name}', TagsShow::class)->name('tags.show');
+    });
     Route::prefix('team')->group(function () {
         Route::get('/', TeamIndex::class)->name('team.index');
         Route::get('/new', TeamCreate::class)->name('team.create');
diff --git a/versions.json b/versions.json
index 087e91ba0..35dd8f152 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.204"
+            "version": "4.0.0-beta.205"
         }
     }
 }