diff --git a/defaults/main.yml b/defaults/main.yml
index 98dab02..06977f1 100755
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -23,6 +23,6 @@ msmtp_log           : "syslog"
 #msmtp_logfile       : /var/log/msmtp.log
 
 ## Aliases mail account ( only msmtp_alias_default is required the rest is optional )
-msmtp_alias_default : ops@example.
+msmtp_alias_default : ops@example.com
 msmtp_alias_root    : root@example.com
 msmtp_alias_cron    : cron@example.com
diff --git a/tasks/msmtp.yml b/tasks/msmtp.yml
index e1884f4..d1ba495 100644
--- a/tasks/msmtp.yml
+++ b/tasks/msmtp.yml
@@ -4,41 +4,30 @@
 #
 # Objective: Deploy msmtp 
 
-- name: Update apt cache
-  apt: update_cache=yes cache_valid_time=3600
-  tags: mail
-  when: ansible_os_family == "Debian"
 
 - name: Install  msmtp and mailx
-  apt:  pkg={{item}} state=present
+  apt:  
+    name: "{{ item }}" 
+    state: present
+    update_cache: yes
+    cache_valid_time: 3600
   with_items:
-    - msmtp
     - msmtp-mta
     - bsd-mailx
-  tags: mail    
-  notify: test mail
-  when: ansible_os_family == "Debian"
-
-- name: Install msmtp and mailx
-  pacman: name={{item}} state=present
-  with_items:
-    - msmtp
-    - msmtp-mta
-    - mailutils
-  when: ansible_os_family == "Archlinux"
 
 - name: Copy mstprc conf file
   template: 
-     src=msmtprc.j2
-     dest=/etc/msmtprc
-     owner=root
-     group=root
-     mode=0644
-  tags: mail
-  notify: test mail
+    src: msmtprc.j2
+    dest: /etc/msmtprc
+    owner: root
+    group: root
+    mode: 0644
 
 - name: Copy aliases conf file
-  template: src=aliases.j2 dest=/etc/aliases 
-            owner=root group=root mode=0644
-  tags: mail
-  notify: test mail
+  template: 
+    src: aliases.j2 
+    dest: /etc/aliases 
+    owner: root 
+    group: root 
+    mode: 0644
+