diff --git a/roles/pi/tasks/main.yaml b/roles/pi/tasks/main.yaml
index 4e4126d..a0759b9 100644
--- a/roles/pi/tasks/main.yaml
+++ b/roles/pi/tasks/main.yaml
@@ -34,19 +34,16 @@
           state: link
 - name: autologin systemd
   become: true
-  lineinfile:
+  blockinfile:
           path: /etc/systemd/system/getty@tty1.service.d/autologin.conf
-          line: {{ item.line }}
-  with_items:
-          - { '[Service]' }
-          - { 'ExecStart=' }
-          - { 'ExecStart=-/sbin/agetty --autologin pi --noclear %I \$TERM' }
+          create: yes
+          block: |
+            [Service]
+            ExecStart=
+            ExecStart=-/sbin/agetty --autologin pi --noclear %I \$TERM
 - name: autologin replacement
   become: true
-  lineinfile:
-          path: /etc/lightdm/lightdm.conf
-          regexp: '^\(#\|\)autologin-user=.*'
-          line: 'autologin-user=pi'
+  command: '/bin/sed /etc/lightdm/lightdm.conf -i -e "s/^\(#\|\)autologin-user=.*/autologin-user=pi/"'
 - name: force systemd reload
   become: true
   systemd: