diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index d93c97c..4d2bdeb 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -1,19 +1,24 @@
 ---
 - name: Copy pacman configuration file
-  copy: src=pacman.conf dest=/etc/pacman.conf
+  copy:
+    src: pacman.conf
+    dest: /etc/pacman.conf
 
 - name: Refresh pacman mirrors
-  pacman: update_cache=yes
+  pacman:
+    update_cache: yes
 
 - name: Set the hostname
-  hostname: name={{ hostname }}
+  hostname:
+    name: "{{ hostname }}"
   when: hostname is defined
 
 - name: Set kernel parameters
-  lineinfile: "dest=/etc/default/grub
-              regexp=^GRUB_CMDLINE_LINUX_DEFAULT
-              state=present
-              line='GRUB_CMDLINE_LINUX_DEFAULT=\"{{ kernel_parameters }}\"'"
+  lineinfile:
+    dest: /etc/default/grub
+    regexp: '^GRUB_CMDLINE_LINUX_DEFAULT'
+    state: present
+    line: 'GRUB_CMDLINE_LINUX_DEFAULT=\"{{ kernel_parameters }}\"'
   when: kernel_parameters is defined and bootloader == 'grub'
   notify:
     - rebuild grub