diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2d6aa1d7..720925c7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,9 +5,9 @@ env:
 
 on:
   push:
-    branches: [ 2.x, master ]
+    branches: [ 3.x, 2.x, master ]
   pull_request:
-    branches: [ 2.x, master ]
+    branches: [ 3.x, 2.x, master ]
 
 jobs:
   tests:
diff --git a/README.md b/README.md
index a91ce3a4..dd8e65cb 100644
--- a/README.md
+++ b/README.md
@@ -3,11 +3,11 @@
 </p>
 
 <p align="center">
-    <a href="https://laravel.com"><img alt="Laravel 6.x" src="https://img.shields.io/badge/laravel-6.x-red.svg"></a>
+    <a href="https://laravel.com"><img alt="Laravel 6.x/7.x" src="https://img.shields.io/badge/laravel-6.x/7.x-red.svg"></a>
     <a href="https://packagist.org/packages/stancl/tenancy"><img alt="Latest Stable Version" src="https://poser.pugx.org/stancl/tenancy/version"></a>
     <a href="https://github.com/stancl/tenancy/actions"><img alt="GitHub Actions CI status" src="https://github.com/stancl/tenancy/workflows/CI/badge.svg"></a>
-    <a href="https://codecov.io/gh/stancl/tenancy"><img alt="codecov" src="https://codecov.io/gh/stancl/tenancy/branch/2.x/graph/badge.svg"></a>
-    <a href="https://github.com/stancl/tenancy/blob/2.x/DONATIONS.md"><img alt="Donate" src="https://img.shields.io/badge/Donate-%3C3-red"></a>
+    <a href="https://codecov.io/gh/stancl/tenancy"><img alt="codecov" src="https://codecov.io/gh/stancl/tenancy/branch/3.x/graph/badge.svg"></a>
+    <a href="https://github.com/stancl/tenancy/blob/3.x/DONATIONS.md"><img alt="Donate" src="https://img.shields.io/badge/Donate-%3C3-red"></a>
 </p>
 
 <h1><a href="https://tenancyforlaravel.com">Tenancy for Laravel &mdash; stancl/tenancy</a></h1>
@@ -26,7 +26,7 @@ Documentation can be found here: https://tenancyforlaravel.com/docs/v2/
 
 The repository with the documentation source code can be found here: [stancl/tenancy-docs](https://github.com/stancl/tenancy-docs).
 
-### [Need help?](https://github.com/stancl/tenancy/blob/2.x/SUPPORT.md)
+### [Need help?](https://github.com/stancl/tenancy/blob/3.x/SUPPORT.md)
 
 ### Credits
 
diff --git a/src/Features/TenantConfig.php b/src/Features/TenantConfig.php
index db4eebc8..fb09a871 100644
--- a/src/Features/TenantConfig.php
+++ b/src/Features/TenantConfig.php
@@ -44,7 +44,6 @@ class TenantConfig implements Feature
     public function setTenantConfig(Tenant $tenant): void
     {
         /** @var Tenant|Model $tenant */
-
         foreach (static::$storageToConfigMap as $storageKey => $configKey) {
             $override = $tenant->getAttribute($storageKey);
 
@@ -53,7 +52,7 @@ class TenantConfig implements Feature
                     foreach ($configKey as $key) {
                         $this->originalConfig[$key] = $this->originalConfig[$key] ?? $this->config[$key];
 
-                        $this->config[$key] = $override;    
+                        $this->config[$key] = $override;
                     }
                 } else {
                     $this->originalConfig[$configKey] = $this->originalConfig[$configKey] ?? $this->config[$configKey];