diff --git a/release/tools/ec2-cloud-init.conf b/release/tools/ec2-cloud-init.conf
index 2dd4df390fa..7682d635b1d 100644
--- a/release/tools/ec2-cloud-init.conf
+++ b/release/tools/ec2-cloud-init.conf
@@ -23,8 +23,9 @@ vm_extra_pre_umount() {
 		    lock_passwd: True
 		    groups: [wheel]
 		    shell: /bin/sh
-		    # Currently broken, cloud-init hard-codes to /usr/home/*
 		    homedir: /home/ec2-user
+		    doas:
+		    - permit nopass ec2-user
 	EOF
 
 	return 0