diff --git a/tasks/main.yml b/tasks/main.yml
index 0abb6c5..d81fbe7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,10 +3,18 @@
   include_vars: "{{ ansible_os_family }}.yml"
 
 - name: Install packages for dovecot
-  package: name="{{ dovecot_packages }}" state=latest update_cache=yes
+  package:
+    name: "{{ dovecot_packages }}"
+    state: present
+    update_cache: yes
 
 - name: Deploy configuration
-  template: src=etc/dovecot/{{ item }}.j2 dest=/etc/dovecot/{{ item }} owner=root group=root mode=0644
+  template:
+    src: etc/dovecot/{{ item }}.j2
+    dest: /etc/dovecot/{{ item }}
+    owner: root
+    group: root
+    mode: 0644
   with_items:
 #    - dovecot.conf
     - conf.d/10-auth.conf
@@ -24,5 +32,8 @@
     immediate: true
 
 - name: Enable dovecot at boot time
-  service: name=dovecot enabled=yes state=started
+  service:
+    name: dovecot
+    enabled: yes
+    state: started