diff --git a/src/Models/Tenant.php b/src/Models/Tenant.php
index <HASH>..<HASH> 100644
--- a/src/Models/Tenant.php
+++ b/src/Models/Tenant.php
@@ -4,8 +4,8 @@ declare(strict_types=1);
 
 namespace Rinvex\Tenants\Models;
 
-use Spatie\Sluggable\HasSlug;
 use Spatie\Sluggable\SlugOptions;
+use Rinvex\Support\Traits\HasSlug;
 use Illuminate\Database\Eloquent\Model;
 use Rinvex\Cacheable\CacheableEloquent;
 use Illuminate\Database\Eloquent\Builder;
@@ -176,23 +176,6 @@ class Tenant extends Model implements TenantContract
     }
 
     /**
-     * {@inheritdoc}
-     */
-    protected static function boot()
-    {
-        parent::boot();
-
-        // Auto generate slugs early before validation
-        static::validating(function (self $tenant) {
-            if ($tenant->exists && $tenant->getSlugOptions()->generateSlugsOnUpdate) {
-                $tenant->generateSlugOnUpdate();
-            } elseif (! $tenant->exists && $tenant->getSlugOptions()->generateSlugsOnCreate) {
-                $tenant->generateSlugOnCreate();
-            }
-        });
-    }
-
-    /**
      * Get all attached models of the given class to the tenant.
      *
      * @param string $class
Move slug auto generation to the custom HasSlug trait