diff --git a/handlers/main.yml b/handlers/main.yml
index 8308479..2997f77 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
-- name: Restart postfix
+- name: Restart service
   service:
     name: postfix
     state: restarted
diff --git a/tasks/config.yml b/tasks/config.yml
index 4ed501c..0dbd9d7 100644
--- a/tasks/config.yml
+++ b/tasks/config.yml
@@ -1,57 +1,60 @@
 ---
-- name: Configure postfix
-  template:
-    src: etc/postfix/main.cf.j2
-    dest: /etc/postfix/main.cf
-    owner: root
-    group: root
-    mode: 0644
-  notify: postfix_restart
+- name: Setup postfix
+  block:
+  - name: Configure postfix
+    template:
+      src: etc/postfix/main.cf.j2
+      dest: /etc/postfix/main.cf
+      owner: root
+      group: root
+      mode: 0644
+    notify: postfix_restart
 
-- name: Create sasl
-  template:
-    src: etc/postfix/sasl_passwd.j2
-    dest: /etc/postfix/sasl_passwd
-    owner: root
-    group: root
-    mode: 0600
-  register: sasl_result
+  - name: Create sasl
+    template:
+      src: etc/postfix/sasl_passwd.j2
+      dest: /etc/postfix/sasl_passwd
+      owner: root
+      group: root
+      mode: 0600
+    register: sasl_result
 
-- name: Ensure sasl_passwd.db exist
-  stat:
-    path: /etc/postfix/sasl_passwd.db
-  register: sasldb
+  - name: Ensure sasl_passwd.db exist
+    stat:
+      path: /etc/postfix/sasl_passwd.db
+    register: sasldb
 
-- name: Create sasl_passwd.db
-  command: /usr/sbin/postmap hash:/etc/postfix/sasl_passwd
-  when: not sasldb.stat.exists or sasl_result.changed
-  register: sasldb_update
-  notify: postfix_restart
+  - name: Create sasl_passwd.db
+    command: /usr/sbin/postmap hash:/etc/postfix/sasl_passwd
+    when: not sasldb.stat.exists or sasl_result.changed
+    register: sasldb_update
+    notify: postfix_restart
 
-- name: Set permissions for sasl_passwd.db
-  file:
-    path: /etc/postfix/sasl_passwd.db
-    owner: root
-    group: root
-    mode: 0600
-  notify: postfix_restart
+  - name: Set permissions for sasl_passwd.db
+    file:
+      path: /etc/postfix/sasl_passwd.db
+      owner: root
+      group: root
+      mode: 0600
+    notify: postfix_restart
 
-- name: Override outgoing header
-  template:
-    src: etc/postfix/sender_canonical.j2
-    dest: /etc/postfix/sender_canonical
-    owner: root
-    group: root
-    mode: 0600
-  register: sender_result
+  - name: Override outgoing header
+    template:
+      src: etc/postfix/sender_canonical.j2
+      dest: /etc/postfix/sender_canonical
+      owner: root
+      group: root
+      mode: 0600
+    register: sender_result
 
-- name: Ensure sender_canonical.db exist
-  stat:
-    path: /etc/postfix/sender_canonical.db
-  register: senderdb
+  - name: Ensure sender_canonical.db exist
+    stat:
+      path: /etc/postfix/sender_canonical.db
+    register: senderdb
 
-- name: Hash sender_canoncial
-  command: "/usr/sbin/postmap hash:/etc/postfix/sender_canonical"
-  when: not senderdb.stat.exists or sender_result.changed
-  register: senderdb_update
-  notify: postfix_restart
+  - name: Hash sender_canoncial
+    command: "/usr/sbin/postmap hash:/etc/postfix/sender_canonical"
+    when: not senderdb.stat.exists or sender_result.changed
+    register: senderdb_update
+    notify: postfix_restart
+  become: True
diff --git a/tasks/install.yml b/tasks/install.yml
index 59d8c41..08aba89 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -1,9 +1,12 @@
 ---
 - name: Install postfix mta
-  package:
-    name: '{{ item }}'
-    state: latest
-  with_items:
-    - postfix
-    - cyrus-sasl-plain
-    - mailx
+  block:
+  - name: Install required packages
+    package:
+      name: '{{ item }}'
+      state: latest
+    with_items:
+      - postfix
+      - cyrus-sasl-plain
+      - mailx
+  become: True