diff --git a/share/composer/ami.ks b/share/composer/ami.ks
index 39567348..86d8f26a 100644
--- a/share/composer/ami.ks
+++ b/share/composer/ami.ks
@@ -6,12 +6,9 @@ part /boot --size=1024
 # Firewall configuration
 firewall --enabled
 
-# Root password
-rootpw --plaintext removethispw
+# NOTE: The root account is locked by default
 # Network information
 network  --bootproto=dhcp --onboot=on --activate
-# System authorization information
-auth --useshadow --enablemd5
 # System keyboard
 keyboard --xlayouts=us --vckeymap=us
 # System language
diff --git a/share/composer/vhd.ks b/share/composer/vhd.ks
index fd7e920d..83622db8 100644
--- a/share/composer/vhd.ks
+++ b/share/composer/vhd.ks
@@ -6,12 +6,9 @@ part /boot --size=1024
 # Firewall configuration
 firewall --enabled
 
-# Root password
-rootpw --plaintext removethispw
+# NOTE: The root account is locked by default
 # Network information
 network  --bootproto=dhcp --onboot=on --activate
-# System authorization information
-auth --useshadow --enablemd5
 # System keyboard
 keyboard --xlayouts=us --vckeymap=us
 # System language
diff --git a/share/composer/vmdk.ks b/share/composer/vmdk.ks
index 3cab6d50..6dab5277 100644
--- a/share/composer/vmdk.ks
+++ b/share/composer/vmdk.ks
@@ -3,12 +3,9 @@
 # Firewall configuration
 firewall --enabled
 
-# Root password
-rootpw --plaintext removethispw
+# NOTE: The root account is locked by default
 # Network information
 network  --bootproto=dhcp --onboot=on --activate
-# System authorization information
-auth --useshadow --enablemd5
 # System keyboard
 keyboard --xlayouts=us --vckeymap=us
 # System language