diff --git a/install/usr/share/swarmlab.io/sec/sec_bootstrap b/install/usr/share/swarmlab.io/sec/sec_bootstrap
index da3d30b..5203a8f 100755
--- a/install/usr/share/swarmlab.io/sec/sec_bootstrap
+++ b/install/usr/share/swarmlab.io/sec/sec_bootstrap
@@ -47,7 +47,7 @@ case $ROLE in
         auto_update_hosts "${HOSTNAMES}" > /dev/null 2>&1 &
 
 	   
-	ttyd -p 3787 bash &
+	ttyd -p 3787 sh &
 	/usr/local/bin/entrypoint.sh
 	/usr/local/bin/docker-php-entrypoint
 	php -S [::]:8080 -t /var/www/html
diff --git a/install/usr/share/swarmlab.io/sec/swarmlab-sec b/install/usr/share/swarmlab.io/sec/swarmlab-sec
index e06140a..c0a0da3 100755
--- a/install/usr/share/swarmlab.io/sec/swarmlab-sec
+++ b/install/usr/share/swarmlab.io/sec/swarmlab-sec
@@ -155,13 +155,13 @@ if [ -d "$Wdir/project" ]; then
 		COPY ssh/ \${SSHDIR}/
 
 		RUN export DEBIAN_FRONTEND=noninteractive  \
+                 && addgroup -S docker && adduser -S docker -G docker \
 		 && rm -rf /usr/share/doc \
 		 && rm -rf /usr/share/man \
 		 && rm -rf /usr/share/locale \ 
 		 && mkdir -p /var/run/sshd \
 		 && echo 'root:$ROOT_PASSWORD' | chpasswd \
 		 && echo "export VISIBLE=now" >> /etc/profile \
-                 && useradd -ms /bin/bash docker \
 		 && mkdir -p /home/docker/project \
 		 && mkdir -p /etc/opt \
 		&& echo "docker:docker" | chpasswd \
@@ -241,13 +241,13 @@ if [ "$Wdir" ==  "$HOME" ]; then
 		COPY ssh/ \${SSHDIR}/
 
 		RUN export DEBIAN_FRONTEND=noninteractive  \
+                 && addgroup -S docker && adduser -S docker -G docker \
 		 && rm -rf /usr/share/doc \
 		 && rm -rf /usr/share/man \
 		 && rm -rf /usr/share/locale \ 
 		 && mkdir -p /var/run/sshd \
 		 && echo 'root:$ROOT_PASSWORD' | chpasswd \
 		 && echo "export VISIBLE=now" >> /etc/profile \
-                 && useradd -ms /bin/bash docker \
 		 && mkdir -p /home/docker/project \
 		 && mkdir -p /etc/opt \
 		&& echo "docker:docker" | chpasswd \