diff --git a/assets/config.php b/assets/config.php
index 3bd68b97..3778e107 100644
--- a/assets/config.php
+++ b/assets/config.php
@@ -283,9 +283,6 @@ return [
         // Stancl\Tenancy\Features\TelescopeTags::class,
         // Stancl\Tenancy\Features\UniversalRoutes::class,
         // Stancl\Tenancy\Features\TenantConfig::class, // https://tenancyforlaravel.com/docs/v3/features/tenant-config
-    ],
-
-    'tenant_unaware_features' => [
         // Stancl\Tenancy\Features\CrossDomainRedirect::class, // https://tenancyforlaravel.com/docs/v3/features/cross-domain-redirect
     ],
 
diff --git a/src/Contracts/Feature.php b/src/Contracts/Feature.php
index 74289981..25363cf5 100644
--- a/src/Contracts/Feature.php
+++ b/src/Contracts/Feature.php
@@ -4,10 +4,8 @@ declare(strict_types=1);
 
 namespace Stancl\Tenancy\Contracts;
 
-use Stancl\Tenancy\Tenancy;
-
 /** Additional features, like Telescope tags and tenant redirects. */
 interface Feature
 {
-    public function bootstrap(Tenancy $tenancy): void;
+    public function bootstrap(): void;
 }
diff --git a/src/Contracts/TenantUnwareFeature.php b/src/Contracts/TenantUnwareFeature.php
deleted file mode 100644
index 498774c9..00000000
--- a/src/Contracts/TenantUnwareFeature.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Stancl\Tenancy\Contracts;
-
-interface TenantUnwareFeature
-{
-    public function bootstrap(): void;
-}
diff --git a/src/Features/CrossDomainRedirect.php b/src/Features/CrossDomainRedirect.php
index 24608273..6eb6698f 100644
--- a/src/Features/CrossDomainRedirect.php
+++ b/src/Features/CrossDomainRedirect.php
@@ -5,10 +5,16 @@ declare(strict_types=1);
 namespace Stancl\Tenancy\Features;
 
 use Illuminate\Http\RedirectResponse;
-use Stancl\Tenancy\Contracts\TenantUnwareFeature;
+use Stancl\Tenancy\Contracts\Feature;
+use Stancl\Tenancy\Tenancy;
 
-class CrossDomainRedirect implements TenantUnwareFeature
+class CrossDomainRedirect implements Feature
 {
+    public function __construct(
+        protected Tenancy $tenancy
+    ) {
+    }
+
     public function bootstrap(): void
     {
         RedirectResponse::macro('domain', function (string $domain) {
diff --git a/src/Features/TelescopeTags.php b/src/Features/TelescopeTags.php
index 0a580d23..225049df 100644
--- a/src/Features/TelescopeTags.php
+++ b/src/Features/TelescopeTags.php
@@ -7,11 +7,10 @@ namespace Stancl\Tenancy\Features;
 use Laravel\Telescope\IncomingEntry;
 use Laravel\Telescope\Telescope;
 use Stancl\Tenancy\Contracts\Feature;
-use Stancl\Tenancy\Tenancy;
 
 class TelescopeTags implements Feature
 {
-    public function bootstrap(Tenancy $tenancy): void
+    public function bootstrap(): void
     {
         if (! class_exists(Telescope::class)) {
             return;
diff --git a/src/Features/TenantConfig.php b/src/Features/TenantConfig.php
index 7b82a7cd..d268680b 100644
--- a/src/Features/TenantConfig.php
+++ b/src/Features/TenantConfig.php
@@ -12,7 +12,6 @@ use Stancl\Tenancy\Contracts\Feature;
 use Stancl\Tenancy\Contracts\Tenant;
 use Stancl\Tenancy\Events\RevertedToCentralContext;
 use Stancl\Tenancy\Events\TenancyBootstrapped;
-use Stancl\Tenancy\Tenancy;
 
 class TenantConfig implements Feature
 {
@@ -28,7 +27,7 @@ class TenantConfig implements Feature
     ) {
     }
 
-    public function bootstrap(Tenancy $tenancy): void
+    public function bootstrap(): void
     {
         Event::listen(TenancyBootstrapped::class, function (TenancyBootstrapped $event) {
             /** @var Tenant $tenant */
diff --git a/src/Features/UniversalRoutes.php b/src/Features/UniversalRoutes.php
index ad0433fc..b0f8c757 100644
--- a/src/Features/UniversalRoutes.php
+++ b/src/Features/UniversalRoutes.php
@@ -9,7 +9,6 @@ use Illuminate\Routing\Route;
 use Illuminate\Support\Facades\Route as Router;
 use Stancl\Tenancy\Contracts\Feature;
 use Stancl\Tenancy\Middleware;
-use Stancl\Tenancy\Tenancy;
 
 class UniversalRoutes implements Feature
 {
@@ -22,7 +21,7 @@ class UniversalRoutes implements Feature
         Middleware\InitializeTenancyBySubdomain::class,
     ];
 
-    public function bootstrap(Tenancy $tenancy): void
+    public function bootstrap(): void
     {
         foreach (static::$identificationMiddlewares as $middleware) {
             $originalOnFail = $middleware::$onFail;
diff --git a/src/Features/UserImpersonation.php b/src/Features/UserImpersonation.php
index 4c9bb104..5a6bf0d9 100644
--- a/src/Features/UserImpersonation.php
+++ b/src/Features/UserImpersonation.php
@@ -16,9 +16,9 @@ class UserImpersonation implements Feature
     /** The lifespan of impersonation tokens (in seconds). */
     public static int $ttl = 60;
 
-    public function bootstrap(Tenancy $tenancy): void
+    public function bootstrap(): void
     {
-        $tenancy->macro('impersonate', function (Tenant $tenant, string $userId, string $redirectUrl, string $authGuard = null): ImpersonationToken {
+        Tenancy::macro('impersonate', function (Tenant $tenant, string $userId, string $redirectUrl, string $authGuard = null): ImpersonationToken {
             return ImpersonationToken::create([
                 Tenancy::tenantKeyColumn() => $tenant->getTenantKey(),
                 'user_id' => $userId,
diff --git a/src/Listeners/BootstrapFeatures.php b/src/Listeners/BootstrapFeatures.php
new file mode 100644
index 00000000..8ebbd6ec
--- /dev/null
+++ b/src/Listeners/BootstrapFeatures.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Listeners;
+
+use Illuminate\Contracts\Foundation\Application;
+use Stancl\Tenancy\Events\TenancyInitialized;
+
+class BootstrapFeatures
+{
+    public function __construct(
+        protected Application $app
+    ) {
+    }
+
+    public function handle(TenancyInitialized $event): void
+    {
+        foreach ($this->app['config']['tenancy.features'] ?? [] as $feature) {
+            $this->app[$feature]->bootstrap($event->tenancy);
+        }
+    }
+}
diff --git a/src/TenancyServiceProvider.php b/src/TenancyServiceProvider.php
index f4e18dba..3a27c5da 100644
--- a/src/TenancyServiceProvider.php
+++ b/src/TenancyServiceProvider.php
@@ -27,16 +27,7 @@ class TenancyServiceProvider extends ServiceProvider
         // Make sure Tenancy is stateful.
         $this->app->singleton(Tenancy::class);
 
-        // Make sure features are bootstrapped as soon as Tenancy is instantiated.
-        $this->app->extend(Tenancy::class, function (Tenancy $tenancy) {
-            foreach ($this->app['config']['tenancy.features'] ?? [] as $feature) {
-                $this->app[$feature]->bootstrap($tenancy);
-            }
-
-            return $tenancy;
-        });
-
-        foreach ($this->app['config']['tenancy.tenant_unaware_features'] ?? [] as $feature) {
+        foreach ($this->app['config']['tenancy.features'] ?? [] as $feature) {
             $this->app[$feature]->bootstrap();
         }