diff --git a/roles/1-prep/tasks/raspberry_pi_2.yml b/roles/1-prep/tasks/raspberry_pi_2.yml
index f93f734ee..ccaafff24 100644
--- a/roles/1-prep/tasks/raspberry_pi_2.yml
+++ b/roles/1-prep/tasks/raspberry_pi_2.yml
@@ -1,57 +1,62 @@
 # Setup specific to the Raspberry Pi
-#
+
 - name: Add a udev rule to transfer hwclock to system clock at dev creation
-  template: src=92-rtc-i2c.rules
-            dest=/etc/udev/rules.d/92-rtc-i2c.rules
-            owner=root
-            group=root
-            mode=0644
+  template:
+    src: 92-rtc-i2c.rules
+    dest: /etc/udev/rules.d/92-rtc-i2c.rules
+    owner: root
+    group: root
+    mode: 0644
   when: rtc_id is defined and rtc_id != "none"
 
-#
 # RTC requires a change to the device tree (and reboot)
 - name: Check for needing to enable i2c rtc device in config.txt
-  lineinfile: dest=/boot/config.txt
-              line="dtoverlay=i2c-rtc,{{ rtc_id }}=on"
-              state=present
+  lineinfile:
+    dest: /boot/config.txt
+    line: "dtoverlay=i2c-rtc,{{ rtc_id }}=on"
+    state: present
   register: rpiconfig
   when: rtc_id != "none"
 
-
 - name: Add a udev rule to transfer hwclock to system clock at dev creation
-  template: src=92-rtc-i2c.rules
-            dest=/etc/udev/rules.d/92-rtc-i2c.rules
-            owner=root
-            group=root
-            mode=0644
+  template:
+    src: 92-rtc-i2c.rules
+    dest: /etc/udev/rules.d/92-rtc-i2c.rules
+    owner: root
+    group: root
+    mode: 0644
   when: rtc_id != "none"
 
 - name: Pre-install packages
-  package: name={{ item }}
-           state=latest
+  package:
+    name: "{{ item }}"
+    state: latest
   with_items:
     - ntp
 
-- name: Increase the swap file size (kalite pip download fails)
-  lineinfile: regexp="^CONF_SWAPSIZE"
-              line=CONF_SWAPSIZE=500
-              dest=/etc/dphys-swapfile
+- name: Increase the swap file size, as kalite pip download fails (debuntu)
+  lineinfile:
+    regexp: "^CONF_SWAPSIZE"
+    line: CONF_SWAPSIZE=500
+    dest: /etc/dphys-swapfile
   when: is_debuntu
 
-- name: Restart the swap service
+- name: Restart the swap service (debuntu)
   command: /etc/init.d/dphys-swapfile restart
   when: is_debuntu
 
 - name: Add RPi rootfs resizing service
-  template: src={{ item.src }}
-            dest={{ item.dest }}
-            owner=root
-            group=root
-            mode={{ item.mode }}
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    owner: root
+    group: root
+    mode: "{{ item.mode }}"
   with_items:
     - { src: 'iiab-rpi-max-rootfs.sh', dest: '/usr/sbin/iiab-rpi-max-rootfs.sh', mode: '0755'}
     - { src: 'iiab-rpi-root-resize.service', dest: '/etc/systemd/system/iiab-rpi-root-resize.service', mode: '0644'}
 
 - name: Enable rootfs resizing service
-  service: name=iiab-rpi-root-resize
-           enabled=yes
+  service:
+    name: iiab-rpi-root-resize
+    enabled: yes