diff --git a/goss/goss_system.yaml b/goss/goss_system.yaml
index 5df38d3..c406786 100644
--- a/goss/goss_system.yaml
+++ b/goss/goss_system.yaml
@@ -27,6 +27,12 @@ file:
     contents: [
       'root=/dev/mmcblk0p2'
     ]
+  /boot/userconf.txt:
+    exists: true
+    owner: root
+    group: root
+    filetype: file
+    contents: 'pi:*'
 command:
   'rootfs label':
     exit-status: 0
diff --git a/tasks/system.yaml b/tasks/system.yaml
index 9d7027d..304be03 100755
--- a/tasks/system.yaml
+++ b/tasks/system.yaml
@@ -15,9 +15,11 @@
     line: PermitRootLogin yes
 
 - name: Disable pi user
-  user:
-    name: pi
-    password: '*'
+  copy:
+    content: 'pi:*'
+    dest: /boot/userconf.txt
+    owner: root
+    group: root
 
 - name: Make sure disk resize is not automatically set for first boot
   file: