diff --git a/.env.example b/.env.example
index 8963ea89..66c95854 100644
--- a/.env.example
+++ b/.env.example
@@ -126,7 +126,7 @@ MYSQL_ATTR_SSL_CA=
 # Refer your email provider documentation to configure your mail settings
 # Set a value for every available setting to avoid issue
 
-MAIL_DRIVER=log
+MAIL_MAILER=log
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
diff --git a/.env.testing b/.env.testing
index 2c8c69db..65dcbf07 100644
--- a/.env.testing
+++ b/.env.testing
@@ -39,7 +39,7 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_DRIVER=array
+MAIL_MAILER=array
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
diff --git a/Dockerfile b/Dockerfile
index 224148a6..da654bce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -153,7 +153,7 @@ ENV \
     # Mail settings
     # Refer your email provider documentation to configure your mail settings
     # Set a value for every available setting to avoid issue
-    MAIL_DRIVER=log \
+    MAIL_MAILER=log \
     MAIL_HOST=smtp.mailtrap.io \
     MAIL_PORT=2525 \
     MAIL_USERNAME=null \
diff --git a/config/mail.php b/config/mail.php
index 52f28499..cae41b52 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -13,7 +13,7 @@
     |
     */
 
-    'default' => env('MAIL_MAILER', 'smtp'),
+    'default' => env('MAIL_MAILER', env('MAIL_DRIVER', 'smtp')),
 
     /*
     |--------------------------------------------------------------------------
@@ -86,6 +86,14 @@
                 'log',
             ],
         ],
+
+        'roundrobin' => [
+            'transport' => 'roundrobin',
+            'mailers' => [
+                'ses',
+                'postmark',
+            ],
+        ],
     ],
 
     /*
diff --git a/docker/README.md b/docker/README.md
index 66fb8223..d14b97a0 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -117,7 +117,7 @@ #### Mail settings
 
 | Build argument | Recommendation | Description |
 | --- | --- | --- |
-| MAIL_DRIVER | SMTP | The driver type |
+| MAIL_MAILER | SMTP | The driver type |
 | MAIL_HOST | smtp.yourdomain.com | The SMTP hostname |
 | MAIL_PORT | 587 | The corresponding SMTP port (587 with STARTTLS) or (465 with SSL recommended) |
 | MAIL_USERNAME | 2fauth@yourdomain.com | The SMTP username |
@@ -129,7 +129,7 @@ #### Mail settings
 Example:
 
 ```text
--e MAIL_DRIVER=SMTP
+-e MAIL_MAILER=SMTP
 -e MAIL_HOST=smtp.example.com
 -e MAIL_PORT=587 # STARTTLS
 -e MAIL_USERNAME=2fauth@example.com
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 5f58394d..69861387 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -50,7 +50,7 @@ services:
       # Mail settings
       # Refer your email provider documentation to configure your mail settings
       # Set a value for every available setting to avoid issue
-      - MAIL_DRIVER=log
+      - MAIL_MAILER=log
       - MAIL_HOST=smtp.mailtrap.io
       - MAIL_PORT=2525
       - MAIL_USERNAME=null