diff --git a/roles/laptop/tasks/main.yml b/roles/laptop/tasks/main.yml
index 2179894..0a687ac 100644
--- a/roles/laptop/tasks/main.yml
+++ b/roles/laptop/tasks/main.yml
@@ -2,43 +2,65 @@
 - include_tasks: tlp.yml
 
 - name: Copy touchpad configuration file
-  copy: src=30-touchpad.conf dest=/etc/X11/xorg.conf.d/30-touchpad.conf
+  copy:
+    src: 30-touchpad.conf
+    dest: /etc/X11/xorg.conf.d/30-touchpad.conf
   tags:
     - libinput
 
 - name: Copy logind configuration file
-  copy: src=logind.conf dest=/etc/systemd/logind.conf
+  copy:
+    src: logind.conf
+    dest: /etc/systemd/logind.conf
 
 - name: Push low battery warning script
-  copy: src=lowbatt.sh dest=/usr/local/bin/lowbatt mode=0755
+  copy:
+    src: lowbatt.sh
+    dest: /usr/local/bin/lowbatt
+    mode: 0755
 
 - name: Push low battery warning service file
-  template: src=lowbatt.service.j2 dest=/etc/systemd/system/lowbatt.service
+  template:
+    src: lowbatt.service.j2
+    dest: /etc/systemd/system/lowbatt.service
   notify:
     - reload systemd config
 
 - name: Push low battery timer file
-  template: src=lowbatt.timer.j2 dest=/etc/systemd/system/lowbatt.timer
+  template:
+    src: lowbatt.timer.j2
+    dest: /etc/systemd/system/lowbatt.timer
   notify:
     - reload systemd config
     - restart lowbatt
 
 - name: Enable and start lowbatt timer
-  service: name=lowbatt.timer enabled=yes state=started
+  service:
+    name: lowbatt.timer
+    enabled: yes
+    state: started
 
 - name: Install brightnessctl
-  pacman: name=brightnessctl state=present
+  pacman:
+    name: brightnessctl
+    state: present
 
 - name: Install powertop
-  pacman: name=powertop state=present
+  pacman:
+    name: powertop
+    state: present
 
 - name: Install powerstat
-  aur: name=powerstat user={{ user.name }}
+  aur:
+    name: powerstat
+    user: "{{ user.name }}"
   tags:
     - aur
 
 - name: Install cmake for battery-stats
-  pacman: name=cmake state=present
+  pacman:
+    name: cmake
+    state: present
 
 - name: Install battery-stats
   aur: