diff --git a/defaults/main.yml b/defaults/main.yml
index 3f94bdc..7a6b650 100755
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,36 +2,28 @@
 msmtp_accounts:
     # Account 1 - a real account for testing (feel free to use it for this role)
     # Uses Yandex app password limited to POP3, SMTP and IMAP
-    - account:   yandex
-      host:      smtp.yandex.com
+    - account:   gmail
+      host:      smtp.gmail.com
       port:      587
       auth:      "on"
-      from:      emailer-tests@yandex.com
-      user:      emailer-tests@yandex.com
-      password:  jhlrizltgkmnkkgm
-      #Account 2
-    - account:   mysmtp
-      host:      smtp.example
-      port:      587
-      auth:      "on"
-      from:      admin@example.org
-      user:      myuser@example.org
-      password:  plain-text-password2
+      from:      example@gmail.example
+      user:      example@gmail.example
+      password:  "some password"
 
-msmtp_default_account: yandex
-msmtp_domain:          yandex.com
+msmtp_default_account: gmail
+msmtp_domain:          gmail.com
 
 ## Logging (Select A) "syslog" or B) "file" logging or C) "no" log
 msmtp_log:       file
 msmtp_logfile:   /var/log/msmtp.log
 
 ## Aliases mail account ( only msmtp_alias_default is required the rest is optional )
-msmtp_alias_default: emailer.tests@yandex.com
-msmtp_alias_root:    emailer.tests@yandex.com
-msmtp_alias_cron:    emailer.tests@yandex.com
+msmtp_alias_default: example@gmail.example
+msmtp_alias_root:    example@gmail.example
+msmtp_alias_cron:    example@gmail.example
 
 ## Enable, if the the default smtp account is working
-msmtp_send_test_mail: yes
+msmtp_send_test_mail: no
 
 ## This will remove most other mail transfer agents such as postfix, exim,...!
 msmtp_remove_mtas: no
diff --git a/vars/main.yml b/vars/main.yml
index e139a11..9008f86 100755
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,3 +1,39 @@
 ---
 # You can override default vars defined in defaults/main.yml here
-# But i would advice to use host or group vars instead 
\ No newline at end of file
+
+msmtp_accounts:
+    # Account 1 - a real account for testing (feel free to use it for this role)
+    # Uses Yandex app password limited to POP3, SMTP and IMAP
+    - account:   yandex
+      host:      smtp.yandex.com
+      port:      587
+      auth:      "on"
+      from:      emailer-tests@yandex.com
+      user:      emailer-tests@yandex.com
+      password:  jhlrizltgkmnkkgm
+      #Account 2
+    - account:   mysmtp
+      host:      smtp.example
+      port:      587
+      auth:      "on"
+      from:      admin@example.org
+      user:      myuser@example.org
+      password:  plain-text-password2
+
+msmtp_default_account: yandex
+msmtp_domain:          yandex.com
+
+## Logging (Select A) "syslog" or B) "file" logging or C) "no" log
+msmtp_log:       file
+msmtp_logfile:   /var/log/msmtp.log
+
+## Aliases mail account ( only msmtp_alias_default is required the rest is optional )
+msmtp_alias_default: emailer.tests@yandex.com
+msmtp_alias_root:    emailer.tests@yandex.com
+msmtp_alias_cron:    emailer.tests@yandex.com
+
+## Enable, if the the default smtp account is working
+msmtp_send_test_mail: yes
+
+## This will remove most other mail transfer agents such as postfix, exim,...!
+msmtp_remove_mtas: no