diff --git a/release/tools/arm.subr b/release/tools/arm.subr
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -98,7 +98,7 @@
 	chroot ${CHROOTDIR} /usr/sbin/pw -R ${DESTDIR} \
 		useradd freebsd \
 		-m -M 0755 -w yes -n freebsd -u 1001 -g 1001 -G 0 \
-		-c 'FreeBSD User' -d '/home/freebsd' -s '/bin/csh'
+		-c 'FreeBSD User' -d '/home/freebsd' -s '/bin/sh'
 	chroot ${CHROOTDIR} /usr/sbin/pw -R ${DESTDIR} \
 		usermod root -w yes
 
diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf
--- a/release/tools/vagrant.conf
+++ b/release/tools/vagrant.conf
@@ -39,7 +39,7 @@
 	/usr/sbin/pw -R ${DESTDIR} -M ${DESTDIR}/METALOG \
 		useradd vagrant \
 		-m -M 0755 -w yes -n vagrant -u 1001 -g 1001 -G 0 \
-		-c 'Vagrant User' -d '/home/vagrant' -s '/bin/csh'
+		-c 'Vagrant User' -d '/home/vagrant' -s '/bin/sh'
 
 	# Change root's password to vagrant
 	echo 'vagrant' | /usr/sbin/pw -R ${DESTDIR} usermod root -h 0