diff --git a/Dockerfile b/Dockerfile
index 239474c..b53a8a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ ADD https://commondatastorage.googleapis.com/git-repo-downloads/repo /usr/local/
 RUN chmod 755 /usr/local/bin/*
 
 # All builds will be done by user aosp
-RUN useradd --create-home aosp && echo "aosp:aosp" | chpasswd && adduser aosp sudo
+RUN useradd --create-home aosp -s /bin/bash && echo "aosp:aosp" | chpasswd && adduser aosp sudo
 ADD gitconfig /home/aosp/.gitconfig
 ADD ssh_config /home/aosp/.ssh/config
 RUN chown aosp:aosp /home/aosp/.gitconfig
diff --git a/Dockerfile_kitkat b/Dockerfile_kitkat
index 6f7801f..7fb0f7e 100644
--- a/Dockerfile_kitkat
+++ b/Dockerfile_kitkat
@@ -31,7 +31,7 @@ ADD https://commondatastorage.googleapis.com/git-repo-downloads/repo /usr/local/
 RUN chmod 755 /usr/local/bin/*
 
 # All builds will be done by user aosp
-RUN useradd --create-home aosp && echo "aosp:aosp" | chpasswd && adduser aosp sudo
+RUN useradd --create-home aosp -s /bin/bash && echo "aosp:aosp" | chpasswd && adduser aosp sudo
 ADD gitconfig /home/aosp/.gitconfig
 ADD ssh_config /home/aosp/.ssh/config
 RUN chown aosp:aosp /home/aosp/.gitconfig