diff --git a/unbound/tasks/main.yml b/unbound/tasks/main.yml
index f9c8e61142a5e609ded1e78625aa5ca781993726..ccdecfb1630b3a85e57a1bfff6a49c8474419c04 100644
--- a/unbound/tasks/main.yml
+++ b/unbound/tasks/main.yml
@@ -1,13 +1,17 @@
 ---
 
 - name: Install unbound packages
-  apt: name=unbound state=present
+  apt:
+    name: unbound
+    state: present
   tags:
     - packages
     - unbound
 
 - name: Install unbound config
-  template: src=unbound.conf.j2 dest=/etc/unbound/unbound.conf.d/unbound.conf
+  template:
+    src: unbound.conf.j2
+    dest: /etc/unbound/unbound.conf.d/unbound.conf
   tags:
     - config
     - unbound
@@ -22,7 +26,10 @@
     - unbound
 
 - name: Enable unbound service
-  service: name=unbound state=started enabled=yes
+  service:
+    name: unbound
+    state: started
+    enabled: true
   tags:
     - service
     - unbound