diff --git a/app/Http/Requests/MailEnvironmentRequest.php b/app/Http/Requests/MailEnvironmentRequest.php
index 6ee72a20..a8f7085e 100644
--- a/app/Http/Requests/MailEnvironmentRequest.php
+++ b/app/Http/Requests/MailEnvironmentRequest.php
@@ -40,12 +40,9 @@ class MailEnvironmentRequest extends FormRequest
             case 'mailgun':
                 return [
                     'mail_driver'           => 'required|string',
-                    'mail_host'             => 'required|string',
-                    'mail_port'             => 'required',
                     'mail_mailgun_domain'   => 'required|string',
                     'mail_mailgun_secret'   => 'required|string',
                     'mail_mailgun_endpoint' => 'required|string',
-                    'mail_encryption'       => 'required|string',
                     'from_name'             => 'required|string',
                     'from_mail'             => 'required|string',
                 ];
diff --git a/resources/assets/js/views/settings/mailDriver/Mailgun.vue b/resources/assets/js/views/settings/mailDriver/Mailgun.vue
index 3da9d419..1deec3cd 100644
--- a/resources/assets/js/views/settings/mailDriver/Mailgun.vue
+++ b/resources/assets/js/views/settings/mailDriver/Mailgun.vue
@@ -20,17 +20,17 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('settings.mail.host') }}</label>
+        <label class="form-label">{{ $t('settings.mail.mailgun_domain') }}</label>
         <span class="text-danger"> *</span>
         <base-input
-          :invalid="$v.mailConfigData.mail_host.$error"
-          v-model.trim="mailConfigData.mail_host"
+          :invalid="$v.mailConfigData.mail_mailgun_domain.$error"
+          v-model.trim="mailConfigData.mail_mailgun_domain"
           type="text"
-          name="mail_host"
-          @input="$v.mailConfigData.mail_host.$touch()"
+          name="mailgun_domain"
+          @input="$v.mailConfigData.mail_mailgun_domain.$touch()"
         />
-        <div v-if="$v.mailConfigData.mail_host.$error">
-          <span v-if="!$v.mailConfigData.mail_host.required" class="text-danger">
+        <div v-if="$v.mailConfigData.mail_mailgun_domain.$error">
+          <span v-if="!$v.mailConfigData.mail_mailgun_domain.required" class="text-danger">
             {{ $tc('validation.required') }}
           </span>
         </div>
@@ -38,39 +38,39 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('settings.mail.port') }}</label>
+        <label class="form-label">{{ $t('settings.mail.mailgun_secret') }}</label>
         <span class="text-danger"> *</span>
         <base-input
-          :invalid="$v.mailConfigData.mail_port.$error"
-          v-model.trim="mailConfigData.mail_port"
-          type="text"
-          name="mail_port"
-          @input="$v.mailConfigData.mail_port.$touch()"
+          :invalid="$v.mailConfigData.mail_mailgun_secret.$error"
+          v-model.trim="mailConfigData.mail_mailgun_secret"
+          type="password"
+          name="mailgun_secret"
+          show-password
+          @input="$v.mailConfigData.mail_mailgun_secret.$touch()"
         />
-        <div v-if="$v.mailConfigData.mail_port.$error">
-          <span v-if="!$v.mailConfigData.mail_port.required" class="text-danger">
+        <div v-if="$v.mailConfigData.mail_mailgun_secret.$error">
+          <span v-if="!$v.mailConfigData.mail_mailgun_secret.required" class="text-danger">
             {{ $tc('validation.required') }}
           </span>
-          <span v-if="!$v.mailConfigData.mail_port.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
-          </span>
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('settings.mail.encryption') }}</label>
+        <label class="form-label">{{ $t('settings.mail.mailgun_endpoint') }}</label>
         <span class="text-danger"> *</span>
-        <base-select
-          v-model.trim="mailConfigData.mail_encryption"
-          :invalid="$v.mailConfigData.mail_encryption.$error"
-          :options="encryptions"
-          :searchable="true"
-          :show-labels="false"
-          @input="$v.mailConfigData.mail_encryption.$touch()"
+        <base-input
+          :invalid="$v.mailConfigData.mail_mailgun_endpoint.$error"
+          v-model.trim="mailConfigData.mail_mailgun_endpoint"
+          type="text"
+          name="mailgun_endpoint"
+          @input="$v.mailConfigData.mail_mailgun_endpoint.$touch()"
         />
-        <div v-if="$v.mailConfigData.mail_encryption.$error">
-          <span v-if="!$v.mailConfigData.mail_encryption.required" class="text-danger">
+        <div v-if="$v.mailConfigData.mail_mailgun_endpoint.$error">
+          <span v-if="!$v.mailConfigData.mail_mailgun_endpoint.required" class="text-danger">
             {{ $tc('validation.required') }}
           </span>
+          <span v-if="!$v.mailConfigData.mail_mailgun_endpoint.numeric" class="text-danger">
+            {{ $tc('validation.numbers_only') }}
+          </span>
         </div>
       </div>
     </div>
@@ -111,62 +111,6 @@
         </div>
       </div>
     </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('settings.mail.mailgun_domain') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_mailgun_domain.$error"
-          v-model.trim="mailConfigData.mail_mailgun_domain"
-          type="text"
-          name="mailgun_domain"
-          @input="$v.mailConfigData.mail_mailgun_domain.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_mailgun_domain.$error">
-          <span v-if="!$v.mailConfigData.mail_mailgun_domain.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('settings.mail.mailgun_secret') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_mailgun_secret.$error"
-          v-model.trim="mailConfigData.mail_mailgun_secret"
-          type="password"
-          name="mailgun_secret"
-          show-password
-          @input="$v.mailConfigData.mail_mailgun_secret.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_mailgun_secret.$error">
-          <span v-if="!$v.mailConfigData.mail_mailgun_secret.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('settings.mail.mailgun_endpoint') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_mailgun_endpoint.$error"
-          v-model.trim="mailConfigData.mail_mailgun_endpoint"
-          type="text"
-          name="mailgun_endpoint"
-          @input="$v.mailConfigData.mail_mailgun_endpoint.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_mailgun_endpoint.$error">
-          <span v-if="!$v.mailConfigData.mail_mailgun_endpoint.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-          <span v-if="!$v.mailConfigData.mail_mailgun_endpoint.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
-          </span>
-        </div>
-      </div>
-    </div>
     <div class="d-flex">
       <base-button
         :loading="loading"
@@ -212,16 +156,12 @@ export default {
     return {
       mailConfigData: {
         mail_driver: '',
-        mail_host: '',
-        mail_port: null,
         mail_mailgun_domain: '',
         mail_mailgun_secret: '',
         mail_mailgun_endpoint: '',
-        mail_encryption: 'tls',
         from_mail: '',
         from_name: ''
-      },
-      encryptions: ['tls', 'ssl', 'starttls']
+      }
     }
   },
   validations: {
@@ -229,13 +169,6 @@ export default {
       mail_driver: {
         required
       },
-      mail_host: {
-        required
-      },
-      mail_port: {
-        required,
-        numeric
-      },
       mail_mailgun_domain: {
         required
       },
@@ -245,9 +178,6 @@ export default {
       mail_mailgun_secret: {
         required
       },
-      mail_encryption: {
-        required
-      },
       from_mail: {
         required,
         email
diff --git a/resources/assets/js/views/wizard/mailDriver/Mailgun.vue b/resources/assets/js/views/wizard/mailDriver/Mailgun.vue
index 75329d14..bf3a348c 100644
--- a/resources/assets/js/views/wizard/mailDriver/Mailgun.vue
+++ b/resources/assets/js/views/wizard/mailDriver/Mailgun.vue
@@ -20,17 +20,17 @@
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.host') }}</label>
+        <label class="form-label">{{ $t('wizard.mail.mailgun_domain') }}</label>
         <span class="text-danger"> *</span>
         <base-input
-          :invalid="$v.mailConfigData.mail_host.$error"
-          v-model.trim="mailConfigData.mail_host"
+          :invalid="$v.mailConfigData.mail_mailgun_domain.$error"
+          v-model.trim="mailConfigData.mail_mailgun_domain"
           type="text"
-          name="mail_host"
-          @input="$v.mailConfigData.mail_host.$touch()"
+          name="mailgun_domain"
+          @input="$v.mailConfigData.mail_mailgun_domain.$touch()"
         />
-        <div v-if="$v.mailConfigData.mail_host.$error">
-          <span v-if="!$v.mailConfigData.mail_host.required" class="text-danger">
+        <div v-if="$v.mailConfigData.mail_mailgun_domain.$error">
+          <span v-if="!$v.mailConfigData.mail_mailgun_domain.required" class="text-danger">
             {{ $tc('validation.required') }}
           </span>
         </div>
@@ -38,39 +38,39 @@
     </div>
     <div class="row my-2">
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.port') }}</label>
+        <label class="form-label">{{ $t('wizard.mail.mailgun_secret') }}</label>
         <span class="text-danger"> *</span>
         <base-input
-          :invalid="$v.mailConfigData.mail_port.$error"
-          v-model.trim="mailConfigData.mail_port"
-          type="text"
-          name="mail_port"
-          @input="$v.mailConfigData.mail_port.$touch()"
+          :invalid="$v.mailConfigData.mail_mailgun_secret.$error"
+          v-model.trim="mailConfigData.mail_mailgun_secret"
+          type="password"
+          name="mailgun_secret"
+          show-password
+          @input="$v.mailConfigData.mail_mailgun_secret.$touch()"
         />
-        <div v-if="$v.mailConfigData.mail_port.$error">
-          <span v-if="!$v.mailConfigData.mail_port.required" class="text-danger">
+        <div v-if="$v.mailConfigData.mail_mailgun_secret.$error">
+          <span v-if="!$v.mailConfigData.mail_mailgun_secret.required" class="text-danger">
             {{ $tc('validation.required') }}
           </span>
-          <span v-if="!$v.mailConfigData.mail_port.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
-          </span>
         </div>
       </div>
       <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.encryption') }}</label>
+        <label class="form-label">{{ $t('wizard.mail.mailgun_endpoint') }}</label>
         <span class="text-danger"> *</span>
-        <base-select
-          v-model.trim="mailConfigData.mail_encryption"
-          :invalid="$v.mailConfigData.mail_encryption.$error"
-          :options="encryptions"
-          :searchable="true"
-          :show-labels="false"
-          @input="$v.mailConfigData.mail_encryption.$touch()"
+        <base-input
+          :invalid="$v.mailConfigData.mail_mailgun_endpoint.$error"
+          v-model.trim="mailConfigData.mail_mailgun_endpoint"
+          type="text"
+          name="mailgun_endpoint"
+          @input="$v.mailConfigData.mail_mailgun_endpoint.$touch()"
         />
-        <div v-if="$v.mailConfigData.mail_encryption.$error">
-          <span v-if="!$v.mailConfigData.mail_encryption.required" class="text-danger">
+        <div v-if="$v.mailConfigData.mail_mailgun_endpoint.$error">
+          <span v-if="!$v.mailConfigData.mail_mailgun_endpoint.required" class="text-danger">
             {{ $tc('validation.required') }}
           </span>
+          <span v-if="!$v.mailConfigData.mail_mailgun_endpoint.numeric" class="text-danger">
+            {{ $tc('validation.numbers_only') }}
+          </span>
         </div>
       </div>
     </div>
@@ -111,62 +111,6 @@
         </div>
       </div>
     </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.mailgun_domain') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_mailgun_domain.$error"
-          v-model.trim="mailConfigData.mail_mailgun_domain"
-          type="text"
-          name="mailgun_domain"
-          @input="$v.mailConfigData.mail_mailgun_domain.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_mailgun_domain.$error">
-          <span v-if="!$v.mailConfigData.mail_mailgun_domain.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.mailgun_secret') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_mailgun_secret.$error"
-          v-model.trim="mailConfigData.mail_mailgun_secret"
-          type="password"
-          name="mailgun_secret"
-          show-password
-          @input="$v.mailConfigData.mail_mailgun_secret.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_mailgun_secret.$error">
-          <span v-if="!$v.mailConfigData.mail_mailgun_secret.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-        </div>
-      </div>
-    </div>
-    <div class="row my-2">
-      <div class="col-md-6 my-2">
-        <label class="form-label">{{ $t('wizard.mail.mailgun_endpoint') }}</label>
-        <span class="text-danger"> *</span>
-        <base-input
-          :invalid="$v.mailConfigData.mail_mailgun_endpoint.$error"
-          v-model.trim="mailConfigData.mail_mailgun_endpoint"
-          type="text"
-          name="mailgun_endpoint"
-          @input="$v.mailConfigData.mail_mailgun_endpoint.$touch()"
-        />
-        <div v-if="$v.mailConfigData.mail_mailgun_endpoint.$error">
-          <span v-if="!$v.mailConfigData.mail_mailgun_endpoint.required" class="text-danger">
-            {{ $tc('validation.required') }}
-          </span>
-          <span v-if="!$v.mailConfigData.mail_mailgun_endpoint.numeric" class="text-danger">
-            {{ $tc('validation.numbers_only') }}
-          </span>
-        </div>
-      </div>
-    </div>
     <base-button
       :loading="loading"
       class="pull-right mt-4"
@@ -209,16 +153,12 @@ export default {
     return {
       mailConfigData: {
         mail_driver: '',
-        mail_host: '',
-        mail_port: null,
         mail_mailgun_domain: '',
         mail_mailgun_secret: '',
         mail_mailgun_endpoint: '',
-        mail_encryption: 'tls',
         from_mail: '',
         from_name: ''
-      },
-      encryptions: ['tls', 'ssl', 'starttls']
+      }
     }
   },
   validations: {
@@ -226,13 +166,6 @@ export default {
       mail_driver: {
         required
       },
-      mail_host: {
-        required
-      },
-      mail_port: {
-        required,
-        numeric
-      },
       mail_mailgun_domain: {
         required
       },
@@ -242,9 +175,6 @@ export default {
       mail_mailgun_secret: {
         required
       },
-      mail_encryption: {
-        required
-      },
       from_mail: {
         required,
         email