diff --git a/src/DatabaseManager.php b/src/DatabaseManager.php
index 727e353d..44451fd6 100644
--- a/src/DatabaseManager.php
+++ b/src/DatabaseManager.php
@@ -54,7 +54,7 @@ class DatabaseManager
      */
     public function connect(Tenant $tenant)
     {
-        $this->createTenantConnection($tenant, $tenant->database()->getTemplateConnectionName());
+        $this->createTenantConnection($tenant);
         $this->setDefaultConnection($tenant->database()->getTemplateConnectionName());
         $this->switchConnection($tenant->database()->getTemplateConnectionName());
     }
@@ -66,8 +66,8 @@ class DatabaseManager
     {
         // Opposite order to connect() because we don't
         // want to ever purge the central connection
-        $this->switchConnection($this->originalDefaultConnectionName);
-        $this->setDefaultConnection($this->originalDefaultConnectionName);
+        $this->switchConnection(static::$originalDefaultConnectionName);
+        $this->setDefaultConnection(static::$originalDefaultConnectionName);
     }
 
     /**
@@ -81,9 +81,9 @@ class DatabaseManager
     /**
      * Create the tenant database connection.
      */
-    public function createTenantConnection(Tenant $tenant, $connectionName)
+    public function createTenantConnection(Tenant $tenant)
     {
-        $this->app['config']["database.connections.$connectionName"] = $tenant->database()->connection();
+        $this->app['config']["database.connections.{$tenant->database()->getTemplateConnectionName()}"] = $tenant->database()->connection();
     }
 
     /**
diff --git a/src/StorageDrivers/Database/DatabaseStorageDriver.php b/src/StorageDrivers/Database/DatabaseStorageDriver.php
index 1303ba38..77a3ffdf 100644
--- a/src/StorageDrivers/Database/DatabaseStorageDriver.php
+++ b/src/StorageDrivers/Database/DatabaseStorageDriver.php
@@ -59,7 +59,7 @@ class DatabaseStorageDriver implements StorageDriver, CanDeleteKeys, CanFindByAn
 
     public static function getCentralConnectionName(): string
     {
-        return config('tenancy.storage_drivers.db.connection') ?? app(DatabaseManager::class)->originalDefaultConnectionName;
+        return config('tenancy.storage_drivers.db.connection') ?? DatabaseManager::$originalDefaultConnectionName;
     }
 
     public function findByDomain(string $domain): Tenant