diff --git a/support/docker/README.md b/support/docker/README.md
index 6fb4472672..f335d9ead9 100644
--- a/support/docker/README.md
+++ b/support/docker/README.md
@@ -14,7 +14,7 @@ Docker running example
   $ docker-compose \
     -f docker-compose.yml -f docker-compose.test.yml run test
 
-* Test(ubuntu-artful)
+* Test(ubuntu:artful)
   $ TAG=artful docker-compose build
   $ TAG=artful docker-compose \
     -f docker-compose.yml -f docker-compose.test.yml run test
@@ -23,7 +23,7 @@ Docker running example
   $ DIST=fedora docker-compose build
   $ DIST=fedora docker-compose run dev
 
-* TODO - Runtime(debian-jessie)
+* Runtime(debian:jessie)
   $ DIST=debian TAG=jessie docker-compose build
   $ DIST=debian TAG=jessie docker-compose 
     -f docker-compose.yml -f docker-compose.run.yml run run
diff --git a/support/docker/centos/7/base/Dockerfile b/support/docker/centos/7/base/Dockerfile
index 95b36a8bf3..fe84c082ac 100644
--- a/support/docker/centos/7/base/Dockerfile
+++ b/support/docker/centos/7/base/Dockerfile
@@ -4,7 +4,7 @@ FROM ${dist}:${tag}
 
 MAINTAINER Sukchan Lee <acetcom@gmail.com>
 
-RUN	yum -y install \
+RUN yum -y install \
         autoconf \
         libtool \
         gcc \
@@ -20,10 +20,5 @@ RUN	yum -y install \
         libyaml-devel \
         iproute
 
-RUN	yum -y install centos-release-scl && \
-    yum -y install devtoolset-7-gcc devtoolset-7-make
-
-RUN	scl enable devtoolset-7 bash
-
-RUN	yum -y install epel-release && \
+RUN yum -y install epel-release && \
     yum -y install mongo-c-driver-devel
diff --git a/support/docker/centos/7/dev/Dockerfile b/support/docker/centos/7/dev/Dockerfile
index c7e55dfb3e..0cd6123083 100644
--- a/support/docker/centos/7/dev/Dockerfile
+++ b/support/docker/centos/7/dev/Dockerfile
@@ -5,7 +5,7 @@ FROM ${username}/${dist}-${tag}-build
 
 MAINTAINER Sukchan Lee <acetcom@gmail.com>
 
-RUN	yum -y install \
+RUN yum -y install \
         cscope \
         vim \
         sudo \
@@ -13,7 +13,7 @@ RUN	yum -y install \
         net-tools
 
 ARG username=acetcom
-RUN	useradd -m --uid=1000 ${username} && \
+RUN useradd -m --uid=1000 ${username} && \
     echo "${username} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${username} && \
     chmod 0440 /etc/sudoers.d/${username}
 
diff --git a/support/docker/check.sh b/support/docker/check.sh
index f65f63d6b1..f8fcc27866 100755
--- a/support/docker/check.sh
+++ b/support/docker/check.sh
@@ -9,4 +9,10 @@ TAG=artful docker-compose -f docker-compose.yml -f docker-compose.test.yml run -
 DIST=fedora docker-compose build
 DIST=fedora docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
 
+DIST=centos docker-compose build
+DIST=centos docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
+
+DIST=debian TAG=jessie docker-compose build
+DIST=fedora TAG=jessie docker-compose -f docker-compose.yml -f docker-compose.test.yml run --rm test
+
 docker rm $(docker ps -qa --no-trunc --filter "status=exited")
diff --git a/support/docker/fedora/27/base/Dockerfile b/support/docker/fedora/27/base/Dockerfile
index 814b3ba9fa..544639006e 100644
--- a/support/docker/fedora/27/base/Dockerfile
+++ b/support/docker/fedora/27/base/Dockerfile
@@ -4,7 +4,7 @@ FROM ${dist}:${tag}
 
 MAINTAINER Sukchan Lee <acetcom@gmail.com>
 
-RUN	dnf -y install \
+RUN dnf -y install \
         autoconf \
         libtool \
         gcc \
diff --git a/support/docker/fedora/27/dev/Dockerfile b/support/docker/fedora/27/dev/Dockerfile
index 0f382c9503..6aeef7801b 100644
--- a/support/docker/fedora/27/dev/Dockerfile
+++ b/support/docker/fedora/27/dev/Dockerfile
@@ -5,7 +5,7 @@ FROM ${username}/${dist}-${tag}-build
 
 MAINTAINER Sukchan Lee <acetcom@gmail.com>
 
-RUN	dnf -y install \
+RUN dnf -y install \
         cscope \
         vim \
         sudo \
@@ -13,7 +13,7 @@ RUN	dnf -y install \
         net-tools
 
 ARG username=acetcom
-RUN	useradd -m --uid=1000 ${username} && \
+RUN useradd -m --uid=1000 ${username} && \
     echo "${username} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${username} && \
     chmod 0440 /etc/sudoers.d/${username}
 
diff --git a/support/docker/ubuntu/xenial/base/Dockerfile b/support/docker/ubuntu/xenial/base/Dockerfile
index c740641b9b..71c151d122 100644
--- a/support/docker/ubuntu/xenial/base/Dockerfile
+++ b/support/docker/ubuntu/xenial/base/Dockerfile
@@ -4,7 +4,7 @@ FROM ${dist}:${tag}
 
 MAINTAINER Sukchan Lee <acetcom@gmail.com>
 
-RUN	apt-get update && \
+RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y --no-install-recommends \
         autoconf \
diff --git a/support/docker/ubuntu/xenial/dev/Dockerfile b/support/docker/ubuntu/xenial/dev/Dockerfile
index f3e01dd0a2..22b7413bd3 100644
--- a/support/docker/ubuntu/xenial/dev/Dockerfile
+++ b/support/docker/ubuntu/xenial/dev/Dockerfile
@@ -5,7 +5,7 @@ FROM ${username}/${dist}-${tag}-build
 
 MAINTAINER Sukchan Lee <acetcom@gmail.com>
 
-RUN	apt-get update && \
+RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y --no-install-recommends \
         debhelper \
@@ -21,7 +21,7 @@ RUN	apt-get update && \
     apt-get clean
 
 ARG username=acetcom
-RUN	useradd -m --uid=1000 ${username} && \
+RUN useradd -m --uid=1000 ${username} && \
     echo "${username} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${username} && \
     chmod 0440 /etc/sudoers.d/${username}