diff --git a/scripts/dockerimages/00-base b/scripts/dockerimages/00-base
index c027c294..470308a2 100644
--- a/scripts/dockerimages/00-base
+++ b/scripts/dockerimages/00-base
@@ -21,5 +21,6 @@ RUN rm /sbin/poweroff /sbin/reboot /sbin/halt && \
        /var/run \
        /var/spool && \
     passwd -l root && \
+    addgroup docker && \
     addgroup sudo && \
     echo '%sudo ALL=(ALL) ALL' > /etc/sudoers.d/sudo-group
diff --git a/scripts/dockerimages/06-console b/scripts/dockerimages/06-console
index d17c2f83..294f744d 100644
--- a/scripts/dockerimages/06-console
+++ b/scripts/dockerimages/06-console
@@ -1,6 +1,7 @@
 FROM base
 COPY scripts/dockerimages/scripts/console.sh /usr/sbin/
-RUN adduser -G sudo -D -h /home/rancher -s /bin/bash rancher && \
+RUN adduser -g rancher -G sudo -D -h /home/rancher -s /bin/bash rancher && \
+    sed -i 's/\(docker.*\)/\1rancher/g' /etc/group && \
     sed -i 's/rancher.*/rancher:rixbL64o6zGmY:16486:0:99999:7:::/g' /etc/shadow && \
     mkdir -p /home/rancher && \
     chmod 2755 /home/rancher
diff --git a/scripts/dockerimages/scripts/console.sh b/scripts/dockerimages/scripts/console.sh
index e73c32ba..5ac7fc69 100755
--- a/scripts/dockerimages/scripts/console.sh
+++ b/scripts/dockerimages/scripts/console.sh
@@ -21,7 +21,7 @@ if [ ! -d ${RANCER_HOME} ]; then
     chmod 2755 ${RANCER_HOME}
 fi
 
-chown root:rancher /var/run/docker.sock:/var/run/system-docker.sock
+chown root:docker /var/run/docker.sock /var/run/system-docker.sock
 
 cat > /etc/respawn.conf << EOF
 /sbin/getty 115200 tty1